Refactoring packages related to VersionedMapDeltaImpl + VersionedMapStoreStateImpl, update builder.

- details of the maps goes to internal packages
- ModelStoreBuilderImpl uses VersionedMapStoreFactoryBuilder

6 files changed, 32 insertions, 35 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
index 4ada4ea4..98756460 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
@@ -8,8 +8,8 @@ package tools.refinery.store.map.tests;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
-import tools.refinery.store.map.internal.InOrderMapCursor;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.InOrderMapCursor;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -26,7 +26,7 @@ class InOrderCursorTest {
                                 .build()
                                 .createOne();
 
-                VersionedMapImpl<Integer,String> map = (VersionedMapImpl<Integer,String>) store.createMap();
+                VersionedMapStateImpl<Integer,String> map = (VersionedMapStateImpl<Integer,String>) store.createMap();
                 checkMove(map,0);
 
                 map.put(1,"A");
@@ -44,7 +44,7 @@ class InOrderCursorTest {
 
         }
 
-        private void checkMove(VersionedMapImpl<Integer,String> map, int num) {
+        private void checkMove(VersionedMapStateImpl<Integer,String> map, int num) {
                 InOrderMapCursor<Integer,String> cursor = new InOrderMapCursor<>(map);
                 for(int i=0; i<num; i++) {
                         assertTrue(cursor.move());
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 2be49bd9..cc2e425c 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
@@ -7,7 +7,7 @@ package tools.refinery.store.map.tests;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
 import tools.refinery.store.model.TupleHashProvider;
 import tools.refinery.store.tuple.Tuple;
 
@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 class MapUnitTests {
         @Test
         void defaultTest() {
-                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreImpl<>(TupleHashProvider.INSTANCE, false);
+                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreStateImpl<>(TupleHashProvider.INSTANCE, false);
                 var map = store.createMap();
                 var out1 = map.put(Tuple.of(0), true);
                 assertEquals(false, out1);
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
index 420dade6..abfb4791 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
@@ -17,10 +17,10 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
@@ -28,11 +28,11 @@ class MutableImmutableCompareFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue,
                                                          boolean nullDefault, int commitFrequency, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue, nullDefault);
-                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+                ContinuousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
 
-                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<>(chp, values[0]);
-                VersionedMapImpl<Integer, String> immutable = (VersionedMapImpl<Integer, String>) store.createMap();
-                VersionedMapImpl<Integer, String> mutable = (VersionedMapImpl<Integer, String>) store.createMap();
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreStateImpl<>(chp, values[0]);
+                VersionedMapStateImpl<Integer, String> immutable = (VersionedMapStateImpl<Integer, String>) store.createMap();
+                VersionedMapStateImpl<Integer, String> mutable = (VersionedMapStateImpl<Integer, String>) store.createMap();
 
                 Random r = new Random(seed);
 
@@ -40,8 +40,8 @@ class MutableImmutableCompareFuzzTest {
                                 commitFrequency);
         }
 
-        private void iterativeRandomPutsAndCommitsAndCompare(String scenario, VersionedMapImpl<Integer, String> immutable,
-                                                                                                                 VersionedMapImpl<Integer, String> mutable, int steps, int maxKey, String[] values, Random r,
+        private void iterativeRandomPutsAndCommitsAndCompare(String scenario, VersionedMapStateImpl<Integer, String> immutable,
+                                                                                                                 VersionedMapStateImpl<Integer, String> mutable, int steps, int maxKey, String[] values, Random r,
                                                                                                                  int commitFrequency) {
                 for (int i = 0; i < steps; i++) {
                         int index = i + 1;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
index 680d962d..b17766b7 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
@@ -18,10 +18,10 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
@@ -31,9 +31,9 @@ class SharedStoreFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue,
                                                          boolean nullDefault, int commitFrequency, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue, nullDefault);
-                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+                ContinuousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
 
-                List<VersionedMapStore<Integer, String>> stores = VersionedMapStoreImpl.createSharedVersionedMapStores(5, chp, values[0]);
+                List<VersionedMapStore<Integer, String>> stores = VersionedMapStoreStateImpl.createSharedVersionedMapStores(5, chp, values[0]);
 
                 iterativeRandomPutsAndCommitsThenRestore(scenario, stores, steps, maxKey, values, seed, commitFrequency);
         }
@@ -42,9 +42,9 @@ class SharedStoreFuzzTest {
                                                                                                                   int steps, int maxKey, String[] values, int seed, int commitFrequency) {
                 // 1. maps with versions
                 Random r = new Random(seed);
-                List<VersionedMapImpl<Integer, String>> versioneds = new LinkedList<>();
+                List<VersionedMapStateImpl<Integer, String>> versioneds = new LinkedList<>();
                 for (VersionedMapStore<Integer, String> store : stores) {
-                        versioneds.add((VersionedMapImpl<Integer, String>) store.createMap());
+                        versioneds.add((VersionedMapStateImpl<Integer, String>) store.createMap());
                 }
 
                 List<Map<Integer, Long>> index2Version = new LinkedList<>();
@@ -66,9 +66,9 @@ class SharedStoreFuzzTest {
                         }
                 }
                 // 2. create a non-versioned and
-                List<VersionedMapImpl<Integer, String>> reference = new LinkedList<>();
+                List<VersionedMapStateImpl<Integer, String>> reference = new LinkedList<>();
                 for (VersionedMapStore<Integer, String> store : stores) {
-                        reference.add((VersionedMapImpl<Integer, String>) store.createMap());
+                        reference.add((VersionedMapStateImpl<Integer, String>) store.createMap());
                 }
                 r = new Random(seed);
 
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
index e7348370..401f2866 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.map.tests.utils;
 
 import tools.refinery.store.map.*;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -28,7 +28,7 @@ public class MapTestEnvironment<K, V> {
                 return values;
         }
 
-        public static ContinousHashProvider<Integer> prepareHashProvider(final boolean evil) {
+        public static ContinuousHashProvider<Integer> prepareHashProvider(final boolean evil) {
                 // Use maxPrime = 2147483629
 
                 return (key, index) -> {
@@ -187,7 +187,7 @@ public class MapTestEnvironment<K, V> {
                         //System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider()
                         // .getHash(cursor.getKey(), 0));
                         if (previous != null) {
-                                int comparisonResult = ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().compare(previous,
+                                int comparisonResult = ((VersionedMapStateImpl<K, V>) versionedMap).getHashProvider().compare(previous,
                                                 cursor.getKey());
                                 assertTrue(comparisonResult < 0, scenario + " Cursor order is not incremental!");
                         }
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 4d4f5e26..5b595da7 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
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.model.hashtests;
+package tools.refinery.store.model.hashTests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -14,10 +14,9 @@ import java.util.Random;
 
 import org.junit.jupiter.api.Test;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.model.TupleHashProvider;
-import tools.refinery.store.model.TupleHashProviderBitMagic;
 
 class HashEfficiencyTest {
 
@@ -95,7 +94,7 @@ class HashEfficiencyTest {
                 List<Tuple> p = nRandoms(2, amount, 1);;
                 assertEquals(amount,p.size());
         }
-        private static double calculateHashClashes(List<Tuple> tuples, ContinousHashProvider<Tuple> chp) {
+        private static double calculateHashClashes(List<Tuple> tuples, ContinuousHashProvider<Tuple> chp) {
                 int sumClashes = 0;
 
                 for(int i = 0; i<tuples.size(); i++) {
@@ -108,7 +107,7 @@ class HashEfficiencyTest {
                 }
                 return (sumClashes+0.0) / tuples.size();
         }
-        private static int calculateHashClash(ContinousHashProvider<Tuple> chp, Tuple a, Tuple b) {
+        private static int calculateHashClash(ContinuousHashProvider<Tuple> chp, Tuple a, Tuple b) {
                 if(a.equals(b)) return 0;
                 final int bits = 5;
                 final int segments = Integer.SIZE/bits;
@@ -131,11 +130,9 @@ class HashEfficiencyTest {
         }
         public static void main(String[] args) {
                 List<String> hashNames = new LinkedList<>();
-                List<ContinousHashProvider<Tuple>> hashes = new LinkedList<>();
+                List<ContinuousHashProvider<Tuple>> hashes = new LinkedList<>();
                 hashNames.add("PrimeGroup");
                 hashes.add(new TupleHashProvider());
-                hashNames.add("BitMagic");
-                hashes.add(new TupleHashProviderBitMagic());
 
                 int[] arities = new int[] {2,3,4,5};
                 int[] sizes = new int[] {32*32,32*32*8};