diff options
Diffstat (limited to 'subprojects/store/src/test')
3 files changed, 11 insertions, 11 deletions
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java index f0d5d927..081112cc 100644 --- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java +++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java | |||
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; | |||
6 | 6 | ||
7 | import tools.refinery.store.map.VersionedMapStore; | 7 | import tools.refinery.store.map.VersionedMapStore; |
8 | import tools.refinery.store.map.VersionedMapStoreImpl; | 8 | import tools.refinery.store.map.VersionedMapStoreImpl; |
9 | import tools.refinery.store.model.Tuple; | 9 | import tools.refinery.store.tuple.Tuple; |
10 | import tools.refinery.store.model.TupleHashProvider; | 10 | import tools.refinery.store.model.TupleHashProvider; |
11 | 11 | ||
12 | class MapUnitTests { | 12 | class MapUnitTests { |
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java index 7d070380..ceec40f5 100644 --- a/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java +++ b/subprojects/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java | |||
@@ -10,7 +10,7 @@ import java.util.Random; | |||
10 | import org.junit.jupiter.api.Test; | 10 | import org.junit.jupiter.api.Test; |
11 | 11 | ||
12 | import tools.refinery.store.map.ContinousHashProvider; | 12 | import tools.refinery.store.map.ContinousHashProvider; |
13 | import tools.refinery.store.model.Tuple; | 13 | import tools.refinery.store.tuple.Tuple; |
14 | import tools.refinery.store.model.TupleHashProvider; | 14 | import tools.refinery.store.model.TupleHashProvider; |
15 | import tools.refinery.store.model.TupleHashProviderBitMagic; | 15 | import tools.refinery.store.model.TupleHashProviderBitMagic; |
16 | 16 | ||
@@ -39,7 +39,7 @@ class HashEfficiencyTest { | |||
39 | return result; | 39 | return result; |
40 | } else throw new IllegalArgumentException(); | 40 | } else throw new IllegalArgumentException(); |
41 | } | 41 | } |
42 | 42 | ||
43 | private static int amountToRange(int arity, int n) { | 43 | private static int amountToRange(int arity, int n) { |
44 | int range = 1; | 44 | int range = 1; |
45 | while(Math.pow(range,arity)<n+0.1) { | 45 | while(Math.pow(range,arity)<n+0.1) { |
@@ -47,7 +47,7 @@ class HashEfficiencyTest { | |||
47 | } | 47 | } |
48 | return 1024; | 48 | return 1024; |
49 | } | 49 | } |
50 | 50 | ||
51 | public static List<Tuple> nPermutations(int arity, int n) { | 51 | public static List<Tuple> nPermutations(int arity, int n) { |
52 | int range = amountToRange(arity, n); | 52 | int range = amountToRange(arity, n); |
53 | List<Tuple> permutations = permutations(range, arity); | 53 | List<Tuple> permutations = permutations(range, arity); |
@@ -67,7 +67,7 @@ class HashEfficiencyTest { | |||
67 | } | 67 | } |
68 | return permutations; | 68 | return permutations; |
69 | } | 69 | } |
70 | 70 | ||
71 | @Test | 71 | @Test |
72 | void permutationTest() { | 72 | void permutationTest() { |
73 | List<Tuple> p = permutations(10, 2); | 73 | List<Tuple> p = permutations(10, 2); |
@@ -92,7 +92,7 @@ class HashEfficiencyTest { | |||
92 | } | 92 | } |
93 | private static double calculateHashClashes(List<Tuple> tuples, ContinousHashProvider<Tuple> chp) { | 93 | private static double calculateHashClashes(List<Tuple> tuples, ContinousHashProvider<Tuple> chp) { |
94 | int sumClashes = 0; | 94 | int sumClashes = 0; |
95 | 95 | ||
96 | for(int i = 0; i<tuples.size(); i++) { | 96 | for(int i = 0; i<tuples.size(); i++) { |
97 | int height = 0; | 97 | int height = 0; |
98 | for(int j=0; j<tuples.size(); j++) { | 98 | for(int j=0; j<tuples.size(); j++) { |
@@ -131,22 +131,22 @@ class HashEfficiencyTest { | |||
131 | hashes.add(new TupleHashProvider()); | 131 | hashes.add(new TupleHashProvider()); |
132 | hashNames.add("BitMagic"); | 132 | hashNames.add("BitMagic"); |
133 | hashes.add(new TupleHashProviderBitMagic()); | 133 | hashes.add(new TupleHashProviderBitMagic()); |
134 | 134 | ||
135 | int[] arities = new int[] {2,3,4,5}; | 135 | int[] arities = new int[] {2,3,4,5}; |
136 | int[] sizes = new int[] {32*32,32*32*8}; | 136 | int[] sizes = new int[] {32*32,32*32*8}; |
137 | 137 | ||
138 | System.out.println("Size,Arity,DataSource,Hash,Chashes,Optimal,Badness"); | 138 | System.out.println("Size,Arity,DataSource,Hash,Chashes,Optimal,Badness"); |
139 | for(int size : sizes) { | 139 | for(int size : sizes) { |
140 | double optimalClashes = caclulateOptimalHashClash(size); | 140 | double optimalClashes = caclulateOptimalHashClash(size); |
141 | for(int arity : arities) { | 141 | for(int arity : arities) { |
142 | List<String> dataSourceNames = new LinkedList<>(); | 142 | List<String> dataSourceNames = new LinkedList<>(); |
143 | List<List<Tuple>> dataSources = new LinkedList<>(); | 143 | List<List<Tuple>> dataSources = new LinkedList<>(); |
144 | 144 | ||
145 | // dataSourceNames.add("Permutation"); | 145 | // dataSourceNames.add("Permutation"); |
146 | // dataSources.add(nPermutations(arity, size)); | 146 | // dataSources.add(nPermutations(arity, size)); |
147 | dataSourceNames.add("Random"); | 147 | dataSourceNames.add("Random"); |
148 | dataSources.add(nRandoms(arity, size, 0)); | 148 | dataSources.add(nRandoms(arity, size, 0)); |
149 | 149 | ||
150 | for(int dataSourceIndex = 0; dataSourceIndex<dataSourceNames.size(); dataSourceIndex++) { | 150 | for(int dataSourceIndex = 0; dataSourceIndex<dataSourceNames.size(); dataSourceIndex++) { |
151 | for(int hashIndex = 0; hashIndex<hashNames.size(); hashIndex++) { | 151 | for(int hashIndex = 0; hashIndex<hashNames.size(); hashIndex++) { |
152 | double clashes = calculateHashClashes(dataSources.get(dataSourceIndex),hashes.get(hashIndex)); | 152 | double clashes = calculateHashClashes(dataSources.get(dataSourceIndex),hashes.get(hashIndex)); |
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java index 9d90b1e1..61dd7c74 100644 --- a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java +++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java | |||
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; | |||
12 | import tools.refinery.store.model.Model; | 12 | import tools.refinery.store.model.Model; |
13 | import tools.refinery.store.model.ModelStore; | 13 | import tools.refinery.store.model.ModelStore; |
14 | import tools.refinery.store.model.ModelStoreImpl; | 14 | import tools.refinery.store.model.ModelStoreImpl; |
15 | import tools.refinery.store.model.Tuple; | 15 | import tools.refinery.store.tuple.Tuple; |
16 | import tools.refinery.store.model.representation.Relation; | 16 | import tools.refinery.store.model.representation.Relation; |
17 | 17 | ||
18 | class ModelTest { | 18 | class ModelTest { |