diff options
-rw-r--r-- | language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java | 2 | ||||
-rw-r--r-- | store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java (renamed from store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java) | 2 | ||||
-rw-r--r-- | store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java (renamed from store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java) | 13 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java (renamed from store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/Cursor.java (renamed from store/src/main/java/tools/refinery/data/map/Cursor.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/CursorAsIterator.java (renamed from store/src/main/java/tools/refinery/data/map/CursorAsIterator.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/DiffCursor.java (renamed from store/src/main/java/tools/refinery/data/map/DiffCursor.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/MapAsIterable.java (renamed from store/src/main/java/tools/refinery/data/map/MapAsIterable.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/Versioned.java (renamed from store/src/main/java/tools/refinery/data/map/Versioned.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/VersionedMap.java (renamed from store/src/main/java/tools/refinery/data/map/VersionedMap.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/VersionedMapStore.java (renamed from store/src/main/java/tools/refinery/data/map/VersionedMapStore.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java (renamed from store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java (renamed from store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/HashClash.java (renamed from store/src/main/java/tools/refinery/data/map/internal/HashClash.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java (renamed from store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/MapCursor.java (renamed from store/src/main/java/tools/refinery/data/map/internal/MapCursor.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java (renamed from store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/MutableNode.java (renamed from store/src/main/java/tools/refinery/data/map/internal/MutableNode.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/Node.java (renamed from store/src/main/java/tools/refinery/data/map/internal/Node.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java (renamed from store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java (renamed from store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java) | 12 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/Model.java (renamed from store/src/main/java/tools/refinery/data/model/Model.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/ModelCursor.java (renamed from store/src/main/java/tools/refinery/data/model/ModelCursor.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java (renamed from store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/ModelStore.java (renamed from store/src/main/java/tools/refinery/data/model/ModelStore.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java (renamed from store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java) | 25 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/Tuple.java (renamed from store/src/main/java/tools/refinery/data/model/Tuple.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/TupleHashProvider.java (renamed from store/src/main/java/tools/refinery/data/model/TupleHashProvider.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java (renamed from store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java (renamed from store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java) | 20 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java (renamed from store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java (renamed from store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java (renamed from store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/representation/Relation.java (renamed from store/src/main/java/tools/refinery/data/model/representation/Relation.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/model/representation/TruthValue.java (renamed from store/src/main/java/tools/refinery/data/model/representation/TruthValue.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/RelationalScope.java (renamed from store/src/main/java/tools/refinery/data/query/RelationalScope.java) | 12 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/DNFAnd.java (renamed from store/src/main/java/tools/refinery/data/query/building/DNFAnd.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/DNFAtom.java (renamed from store/src/main/java/tools/refinery/data/query/building/DNFAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java (renamed from store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java (renamed from store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java (renamed from store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/PredicateBuilder_string.java (renamed from store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/RelationAtom.java (renamed from store/src/main/java/tools/refinery/data/query/building/RelationAtom.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/building/Variable.java (renamed from store/src/main/java/tools/refinery/data/query/building/Variable.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java (renamed from store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/PredicateTranslator.java (renamed from store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListener.java (renamed from store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListenerEntry.java (renamed from store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java (renamed from store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java (renamed from store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java (renamed from store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java (renamed from store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java (renamed from store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java (renamed from store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/query/view/RelationView.java (renamed from store/src/main/java/tools/refinery/data/query/view/RelationView.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/store/util/CollectionsUtil.java (renamed from store/src/main/java/tools/refinery/data/util/CollectionsUtil.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java) | 14 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java) | 18 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java) | 16 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java) | 12 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java) | 8 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java) | 14 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java) | 14 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java) | 14 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java) | 14 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java (renamed from store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java (renamed from store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java) | 13 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java (renamed from store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java) | 10 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/model/tests/ModelTest.java (renamed from store/src/test/java/tools/refinery/data/model/tests/ModelTest.java) | 12 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/query/test/QueryTest.java (renamed from store/src/test/java/tools/refinery/data/query/test/QueryTest.java) | 26 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java (renamed from store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java) | 6 |
72 files changed, 252 insertions, 249 deletions
diff --git a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java index e501ce8f..a2cab671 100644 --- a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java +++ b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package tools.refinery.language.mapping; | 1 | package tools.refinery.language.mapping; |
2 | 2 | ||
3 | import tools.refinery.data.model.Model; | ||
4 | import tools.refinery.language.model.problem.Problem; | 3 | import tools.refinery.language.model.problem.Problem; |
4 | import tools.refinery.store.model.Model; | ||
5 | 5 | ||
6 | public class PartialModelMapper { | 6 | public class PartialModelMapper { |
7 | public Model transformProblem(Problem problem) { | 7 | public Model transformProblem(Problem problem) { |
diff --git a/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java b/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java index bc5e056f..cdf3d3c8 100644 --- a/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java +++ b/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.benchmarks; | 1 | package tools.refinery.store.map.benchmarks; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.HashMap; | 4 | import java.util.HashMap; |
diff --git a/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java b/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java index 084381a0..756d504e 100644 --- a/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java +++ b/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java | |||
@@ -1,12 +1,13 @@ | |||
1 | package tools.refinery.data.map.benchmarks; | 1 | package tools.refinery.store.map.benchmarks; |
2 | 2 | ||
3 | import java.util.Random; | 3 | import java.util.Random; |
4 | 4 | ||
5 | import tools.refinery.data.map.ContinousHashProvider; | 5 | import tools.refinery.store.map.ContinousHashProvider; |
6 | import tools.refinery.data.map.VersionedMapStore; | 6 | import tools.refinery.store.map.VersionedMapStore; |
7 | import tools.refinery.data.map.VersionedMapStoreImpl; | 7 | import tools.refinery.store.map.VersionedMapStoreImpl; |
8 | import tools.refinery.data.map.internal.VersionedMapImpl; | 8 | import tools.refinery.store.map.internal.VersionedMapImpl; |
9 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 9 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
10 | |||
10 | import org.openjdk.jmh.annotations.Level; | 11 | import org.openjdk.jmh.annotations.Level; |
11 | import org.openjdk.jmh.annotations.Param; | 12 | import org.openjdk.jmh.annotations.Param; |
12 | import org.openjdk.jmh.annotations.Scope; | 13 | import org.openjdk.jmh.annotations.Scope; |
diff --git a/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java b/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java index 6a54a3ff..75f1e2ab 100644 --- a/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java +++ b/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import tools.refinery.data.map.internal.Node; | 3 | import tools.refinery.store.map.internal.Node; |
4 | 4 | ||
5 | /** | 5 | /** |
6 | * A class representing an equivalence relation for a type {@code K} with a | 6 | * A class representing an equivalence relation for a type {@code K} with a |
diff --git a/store/src/main/java/tools/refinery/data/map/Cursor.java b/store/src/main/java/tools/refinery/store/map/Cursor.java index a137e6c1..9c465ddc 100644 --- a/store/src/main/java/tools/refinery/data/map/Cursor.java +++ b/store/src/main/java/tools/refinery/store/map/Cursor.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | 4 | ||
diff --git a/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java b/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java index 02a49ba1..65ae6648 100644 --- a/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java +++ b/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import java.util.Iterator; | 3 | import java.util.Iterator; |
4 | import java.util.NoSuchElementException; | 4 | import java.util.NoSuchElementException; |
diff --git a/store/src/main/java/tools/refinery/data/map/DiffCursor.java b/store/src/main/java/tools/refinery/store/map/DiffCursor.java index 747aa610..701f3ec8 100644 --- a/store/src/main/java/tools/refinery/data/map/DiffCursor.java +++ b/store/src/main/java/tools/refinery/store/map/DiffCursor.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | public interface DiffCursor<K, V> extends Cursor<K,V> { | 3 | public interface DiffCursor<K, V> extends Cursor<K,V> { |
4 | public V getFromValue(); | 4 | public V getFromValue(); |
diff --git a/store/src/main/java/tools/refinery/data/map/MapAsIterable.java b/store/src/main/java/tools/refinery/store/map/MapAsIterable.java index 05bdbef2..6b986732 100644 --- a/store/src/main/java/tools/refinery/data/map/MapAsIterable.java +++ b/store/src/main/java/tools/refinery/store/map/MapAsIterable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import java.util.Iterator; | 3 | import java.util.Iterator; |
4 | import java.util.function.BiFunction; | 4 | import java.util.function.BiFunction; |
diff --git a/store/src/main/java/tools/refinery/data/map/Versioned.java b/store/src/main/java/tools/refinery/store/map/Versioned.java index eb364b87..6a23e9d5 100644 --- a/store/src/main/java/tools/refinery/data/map/Versioned.java +++ b/store/src/main/java/tools/refinery/store/map/Versioned.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | public interface Versioned { | 3 | public interface Versioned { |
4 | public long commit(); | 4 | public long commit(); |
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMap.java b/store/src/main/java/tools/refinery/store/map/VersionedMap.java index d57e3ee5..a8a64d08 100644 --- a/store/src/main/java/tools/refinery/data/map/VersionedMap.java +++ b/store/src/main/java/tools/refinery/store/map/VersionedMap.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | public interface VersionedMap<K,V> extends Versioned{ | 3 | public interface VersionedMap<K,V> extends Versioned{ |
4 | public V get(K key); | 4 | public V get(K key); |
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java index 029cf9e7..a8d7fb1a 100644 --- a/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java +++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java index 162ec4ca..723e5ec4 100644 --- a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java +++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | public class VersionedMapStoreConfiguration { | 3 | public class VersionedMapStoreConfiguration { |
4 | 4 | ||
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java index c194faf8..a626a5e8 100644 --- a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java +++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map; | 1 | package tools.refinery.store.map; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.Arrays; | 4 | import java.util.Arrays; |
@@ -9,10 +9,10 @@ import java.util.List; | |||
9 | import java.util.Map; | 9 | import java.util.Map; |
10 | import java.util.Set; | 10 | import java.util.Set; |
11 | 11 | ||
12 | import tools.refinery.data.map.internal.ImmutableNode; | 12 | import tools.refinery.store.map.internal.ImmutableNode; |
13 | import tools.refinery.data.map.internal.MapDiffCursor; | 13 | import tools.refinery.store.map.internal.MapDiffCursor; |
14 | import tools.refinery.data.map.internal.Node; | 14 | import tools.refinery.store.map.internal.Node; |
15 | import tools.refinery.data.map.internal.VersionedMapImpl; | 15 | import tools.refinery.store.map.internal.VersionedMapImpl; |
16 | 16 | ||
17 | public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> { | 17 | public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> { |
18 | // Configuration | 18 | // Configuration |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/HashClash.java b/store/src/main/java/tools/refinery/store/map/internal/HashClash.java index 640feb95..5402ed4a 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/HashClash.java +++ b/store/src/main/java/tools/refinery/store/map/internal/HashClash.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | enum HashClash { | 3 | enum HashClash { |
4 | /** | 4 | /** |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java b/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java index 99e27bb6..f68734ab 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java +++ b/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.Map; | 4 | import java.util.Map; |
5 | 5 | ||
6 | import tools.refinery.data.map.ContinousHashProvider; | 6 | import tools.refinery.store.map.ContinousHashProvider; |
7 | 7 | ||
8 | public class ImmutableNode<K, V> extends Node<K, V> { | 8 | public class ImmutableNode<K, V> extends Node<K, V> { |
9 | /** | 9 | /** |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java b/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java index 44ed1f45..b90f5b71 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java +++ b/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java | |||
@@ -1,12 +1,12 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.ArrayDeque; | 3 | import java.util.ArrayDeque; |
4 | import java.util.ConcurrentModificationException; | 4 | import java.util.ConcurrentModificationException; |
5 | import java.util.Iterator; | 5 | import java.util.Iterator; |
6 | import java.util.List; | 6 | import java.util.List; |
7 | 7 | ||
8 | import tools.refinery.data.map.Cursor; | 8 | import tools.refinery.store.map.Cursor; |
9 | import tools.refinery.data.map.VersionedMap; | 9 | import tools.refinery.store.map.VersionedMap; |
10 | 10 | ||
11 | public class MapCursor<K,V> implements Cursor<K,V> { | 11 | public class MapCursor<K,V> implements Cursor<K,V> { |
12 | // Constants | 12 | // Constants |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java b/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java index dcff3c06..42333635 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java +++ b/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java | |||
@@ -1,12 +1,12 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | import java.util.stream.Stream; | 4 | import java.util.stream.Stream; |
5 | 5 | ||
6 | import tools.refinery.data.map.ContinousHashProvider; | 6 | import tools.refinery.store.map.ContinousHashProvider; |
7 | import tools.refinery.data.map.Cursor; | 7 | import tools.refinery.store.map.Cursor; |
8 | import tools.refinery.data.map.DiffCursor; | 8 | import tools.refinery.store.map.DiffCursor; |
9 | import tools.refinery.data.map.VersionedMap; | 9 | import tools.refinery.store.map.VersionedMap; |
10 | 10 | ||
11 | /** | 11 | /** |
12 | * A cursor representing the difference between two states of a map. | 12 | * A cursor representing the difference between two states of a map. |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java b/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java index 5522051a..7e94758c 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java +++ b/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.Map; | 4 | import java.util.Map; |
5 | 5 | ||
6 | import tools.refinery.data.map.ContinousHashProvider; | 6 | import tools.refinery.store.map.ContinousHashProvider; |
7 | 7 | ||
8 | public class MutableNode<K, V> extends Node<K, V> { | 8 | public class MutableNode<K, V> extends Node<K, V> { |
9 | int cachedHash; | 9 | int cachedHash; |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/Node.java b/store/src/main/java/tools/refinery/store/map/internal/Node.java index b99275d9..234a4ff3 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/Node.java +++ b/store/src/main/java/tools/refinery/store/map/internal/Node.java | |||
@@ -1,8 +1,8 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import tools.refinery.data.map.ContinousHashProvider; | 5 | import tools.refinery.store.map.ContinousHashProvider; |
6 | 6 | ||
7 | public abstract class Node<K,V>{ | 7 | public abstract class Node<K,V>{ |
8 | public static final int BRANCHING_FACTOR_BITS = 5; | 8 | public static final int BRANCHING_FACTOR_BITS = 5; |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java b/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java index 641c831b..5534c703 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java +++ b/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | public class OldValueBox<V>{ | 3 | public class OldValueBox<V>{ |
4 | V oldValue; | 4 | V oldValue; |
diff --git a/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java b/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java index 8aa9686f..346fe596 100644 --- a/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java +++ b/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java | |||
@@ -1,14 +1,14 @@ | |||
1 | package tools.refinery.data.map.internal; | 1 | package tools.refinery.store.map.internal; |
2 | 2 | ||
3 | import java.util.Iterator; | 3 | import java.util.Iterator; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
5 | import java.util.List; | 5 | import java.util.List; |
6 | 6 | ||
7 | import tools.refinery.data.map.ContinousHashProvider; | 7 | import tools.refinery.store.map.ContinousHashProvider; |
8 | import tools.refinery.data.map.Cursor; | 8 | import tools.refinery.store.map.Cursor; |
9 | import tools.refinery.data.map.DiffCursor; | 9 | import tools.refinery.store.map.DiffCursor; |
10 | import tools.refinery.data.map.VersionedMap; | 10 | import tools.refinery.store.map.VersionedMap; |
11 | import tools.refinery.data.map.VersionedMapStoreImpl; | 11 | import tools.refinery.store.map.VersionedMapStoreImpl; |
12 | 12 | ||
13 | /** | 13 | /** |
14 | * Not threadSafe in itself | 14 | * Not threadSafe in itself |
diff --git a/store/src/main/java/tools/refinery/data/model/Model.java b/store/src/main/java/tools/refinery/store/model/Model.java index 2d0b350a..a42d711a 100644 --- a/store/src/main/java/tools/refinery/data/model/Model.java +++ b/store/src/main/java/tools/refinery/store/model/Model.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
5 | import tools.refinery.data.map.Cursor; | 5 | import tools.refinery.store.map.Cursor; |
6 | import tools.refinery.data.map.Versioned; | 6 | import tools.refinery.store.map.Versioned; |
7 | import tools.refinery.data.model.representation.DataRepresentation; | 7 | import tools.refinery.store.model.representation.DataRepresentation; |
8 | 8 | ||
9 | public interface Model extends Versioned{ | 9 | public interface Model extends Versioned{ |
10 | @SuppressWarnings("squid:S1452") | 10 | @SuppressWarnings("squid:S1452") |
diff --git a/store/src/main/java/tools/refinery/data/model/ModelCursor.java b/store/src/main/java/tools/refinery/store/model/ModelCursor.java index e3537c7d..a835cf69 100644 --- a/store/src/main/java/tools/refinery/data/model/ModelCursor.java +++ b/store/src/main/java/tools/refinery/store/model/ModelCursor.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import tools.refinery.data.map.Cursor; | 5 | import tools.refinery.store.map.Cursor; |
6 | import tools.refinery.data.model.representation.DataRepresentation; | 6 | import tools.refinery.store.model.representation.DataRepresentation; |
7 | 7 | ||
8 | public class ModelCursor { | 8 | public class ModelCursor { |
9 | final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors; | 9 | final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors; |
diff --git a/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java b/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java index cd3eb316..91990fa6 100644 --- a/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java +++ b/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import tools.refinery.data.map.Cursor; | 5 | import tools.refinery.store.map.Cursor; |
6 | import tools.refinery.data.map.DiffCursor; | 6 | import tools.refinery.store.map.DiffCursor; |
7 | import tools.refinery.data.model.representation.DataRepresentation; | 7 | import tools.refinery.store.model.representation.DataRepresentation; |
8 | 8 | ||
9 | public class ModelDiffCursor { | 9 | public class ModelDiffCursor { |
10 | final Map<DataRepresentation<?, ?>,DiffCursor<?,?>> diffcursors; | 10 | final Map<DataRepresentation<?, ?>,DiffCursor<?,?>> diffcursors; |
diff --git a/store/src/main/java/tools/refinery/data/model/ModelStore.java b/store/src/main/java/tools/refinery/store/model/ModelStore.java index 03c1bcca..682a0e78 100644 --- a/store/src/main/java/tools/refinery/data/model/ModelStore.java +++ b/store/src/main/java/tools/refinery/store/model/ModelStore.java | |||
@@ -1,8 +1,8 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
5 | import tools.refinery.data.model.representation.DataRepresentation; | 5 | import tools.refinery.store.model.representation.DataRepresentation; |
6 | 6 | ||
7 | public interface ModelStore { | 7 | public interface ModelStore { |
8 | @SuppressWarnings("squid:S1452") | 8 | @SuppressWarnings("squid:S1452") |
diff --git a/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java b/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java index fcad1d99..97406cbb 100644 --- a/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java +++ b/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java | |||
@@ -1,22 +1,23 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
5 | import java.util.List; | 5 | import java.util.List; |
6 | import java.util.Map; | 6 | import java.util.Map; |
7 | import java.util.Map.Entry; | 7 | import java.util.Map.Entry; |
8 | import java.util.Set; | ||
9 | 8 | ||
10 | import tools.refinery.data.map.ContinousHashProvider; | 9 | import tools.refinery.store.map.ContinousHashProvider; |
11 | import tools.refinery.data.map.DiffCursor; | 10 | import tools.refinery.store.map.DiffCursor; |
12 | import tools.refinery.data.map.VersionedMap; | 11 | import tools.refinery.store.map.VersionedMap; |
13 | import tools.refinery.data.map.VersionedMapStore; | 12 | import tools.refinery.store.map.VersionedMapStore; |
14 | import tools.refinery.data.map.VersionedMapStoreImpl; | 13 | import tools.refinery.store.map.VersionedMapStoreImpl; |
15 | import tools.refinery.data.model.internal.ModelImpl; | 14 | import tools.refinery.store.model.internal.ModelImpl; |
16 | import tools.refinery.data.model.internal.SimilarRelationEquivalenceClass; | 15 | import tools.refinery.store.model.internal.SimilarRelationEquivalenceClass; |
17 | import tools.refinery.data.model.representation.AuxilaryData; | 16 | import tools.refinery.store.model.representation.AuxilaryData; |
18 | import tools.refinery.data.model.representation.DataRepresentation; | 17 | import tools.refinery.store.model.representation.DataRepresentation; |
19 | import tools.refinery.data.model.representation.Relation; | 18 | import tools.refinery.store.model.representation.Relation; |
19 | |||
20 | import java.util.Set; | ||
20 | 21 | ||
21 | public class ModelStoreImpl implements ModelStore { | 22 | public class ModelStoreImpl implements ModelStore { |
22 | 23 | ||
diff --git a/store/src/main/java/tools/refinery/data/model/Tuple.java b/store/src/main/java/tools/refinery/store/model/Tuple.java index 1bffae9e..0aae3727 100644 --- a/store/src/main/java/tools/refinery/data/model/Tuple.java +++ b/store/src/main/java/tools/refinery/store/model/Tuple.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.Arrays; | 4 | import java.util.Arrays; |
diff --git a/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java b/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java index d70130e3..7a01311a 100644 --- a/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java +++ b/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import tools.refinery.data.map.ContinousHashProvider; | 3 | import tools.refinery.store.map.ContinousHashProvider; |
4 | 4 | ||
5 | public class TupleHashProvider implements ContinousHashProvider<Tuple> { | 5 | public class TupleHashProvider implements ContinousHashProvider<Tuple> { |
6 | protected static TupleHashProvider instance; | 6 | protected static TupleHashProvider instance; |
diff --git a/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java b/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java index b13b6eca..5b053229 100644 --- a/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java +++ b/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package tools.refinery.data.model; | 1 | package tools.refinery.store.model; |
2 | 2 | ||
3 | import tools.refinery.data.map.ContinousHashProvider; | 3 | import tools.refinery.store.map.ContinousHashProvider; |
4 | 4 | ||
5 | public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> { | 5 | public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> { |
6 | 6 | ||
diff --git a/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java b/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java index dbf2a000..2a5f2925 100644 --- a/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java +++ b/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java | |||
@@ -1,18 +1,18 @@ | |||
1 | package tools.refinery.data.model.internal; | 1 | package tools.refinery.store.model.internal; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.Map; | 4 | import java.util.Map; |
5 | import java.util.Set; | 5 | import java.util.Set; |
6 | 6 | ||
7 | import tools.refinery.data.map.ContinousHashProvider; | 7 | import tools.refinery.store.map.ContinousHashProvider; |
8 | import tools.refinery.data.map.Cursor; | 8 | import tools.refinery.store.map.Cursor; |
9 | import tools.refinery.data.map.DiffCursor; | 9 | import tools.refinery.store.map.DiffCursor; |
10 | import tools.refinery.data.map.VersionedMap; | 10 | import tools.refinery.store.map.VersionedMap; |
11 | import tools.refinery.data.map.internal.MapDiffCursor; | 11 | import tools.refinery.store.map.internal.MapDiffCursor; |
12 | import tools.refinery.data.model.Model; | 12 | import tools.refinery.store.model.Model; |
13 | import tools.refinery.data.model.ModelDiffCursor; | 13 | import tools.refinery.store.model.ModelDiffCursor; |
14 | import tools.refinery.data.model.ModelStore; | 14 | import tools.refinery.store.model.ModelStore; |
15 | import tools.refinery.data.model.representation.DataRepresentation; | 15 | import tools.refinery.store.model.representation.DataRepresentation; |
16 | 16 | ||
17 | public class ModelImpl implements Model { | 17 | public class ModelImpl implements Model { |
18 | private final ModelStore store; | 18 | private final ModelStore store; |
diff --git a/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java b/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java index 7f073c0c..9d1b1dd0 100644 --- a/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java +++ b/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package tools.refinery.data.model.internal; | 1 | package tools.refinery.store.model.internal; |
2 | 2 | ||
3 | import java.util.Objects; | 3 | import java.util.Objects; |
4 | 4 | ||
5 | import tools.refinery.data.map.ContinousHashProvider; | 5 | import tools.refinery.store.map.ContinousHashProvider; |
6 | import tools.refinery.data.model.Tuple; | 6 | import tools.refinery.store.model.Tuple; |
7 | import tools.refinery.data.model.representation.Relation; | 7 | import tools.refinery.store.model.representation.Relation; |
8 | 8 | ||
9 | public class SimilarRelationEquivalenceClass { | 9 | public class SimilarRelationEquivalenceClass { |
10 | final ContinousHashProvider<Tuple> hashProvider; | 10 | final ContinousHashProvider<Tuple> hashProvider; |
diff --git a/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java b/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java index 9a68506f..ddd8a5f2 100644 --- a/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java +++ b/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package tools.refinery.data.model.representation; | 1 | package tools.refinery.store.model.representation; |
2 | 2 | ||
3 | import tools.refinery.data.map.ContinousHashProvider; | 3 | import tools.refinery.store.map.ContinousHashProvider; |
4 | 4 | ||
5 | public class AuxilaryData<K,V> extends DataRepresentation<K, V> { | 5 | public class AuxilaryData<K,V> extends DataRepresentation<K, V> { |
6 | private final String name; | 6 | private final String name; |
diff --git a/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java b/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java index c22abdab..585e7b88 100644 --- a/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java +++ b/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package tools.refinery.data.model.representation; | 1 | package tools.refinery.store.model.representation; |
2 | 2 | ||
3 | import tools.refinery.data.map.ContinousHashProvider; | 3 | import tools.refinery.store.map.ContinousHashProvider; |
4 | 4 | ||
5 | public abstract class DataRepresentation<K, V> { | 5 | public abstract class DataRepresentation<K, V> { |
6 | protected final ContinousHashProvider<K> hashProvider; | 6 | protected final ContinousHashProvider<K> hashProvider; |
diff --git a/store/src/main/java/tools/refinery/data/model/representation/Relation.java b/store/src/main/java/tools/refinery/store/model/representation/Relation.java index 3ae07249..fc2a3185 100644 --- a/store/src/main/java/tools/refinery/data/model/representation/Relation.java +++ b/store/src/main/java/tools/refinery/store/model/representation/Relation.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package tools.refinery.data.model.representation; | 1 | package tools.refinery.store.model.representation; |
2 | 2 | ||
3 | import tools.refinery.data.model.Tuple; | 3 | import tools.refinery.store.model.Tuple; |
4 | import tools.refinery.data.model.TupleHashProvider; | 4 | import tools.refinery.store.model.TupleHashProvider; |
5 | 5 | ||
6 | public class Relation<D> extends DataRepresentation<Tuple, D> { | 6 | public class Relation<D> extends DataRepresentation<Tuple, D> { |
7 | private final String name; | 7 | private final String name; |
diff --git a/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java b/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java index 795285a6..610713f3 100644 --- a/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java +++ b/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.model.representation; | 1 | package tools.refinery.store.model.representation; |
2 | 2 | ||
3 | public enum TruthValue { | 3 | public enum TruthValue { |
4 | TRUE("true"), | 4 | TRUE("true"), |
diff --git a/store/src/main/java/tools/refinery/data/query/RelationalScope.java b/store/src/main/java/tools/refinery/store/query/RelationalScope.java index d6d6133b..5fe8083a 100644 --- a/store/src/main/java/tools/refinery/data/query/RelationalScope.java +++ b/store/src/main/java/tools/refinery/store/query/RelationalScope.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query; | 1 | package tools.refinery.store.query; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
@@ -8,11 +8,11 @@ import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; | |||
8 | import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener; | 8 | import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener; |
9 | import org.eclipse.viatra.query.runtime.api.scope.QueryScope; | 9 | import org.eclipse.viatra.query.runtime.api.scope.QueryScope; |
10 | 10 | ||
11 | import tools.refinery.data.model.Model; | 11 | import tools.refinery.store.model.Model; |
12 | import tools.refinery.data.model.Tuple; | 12 | import tools.refinery.store.model.Tuple; |
13 | import tools.refinery.data.query.internal.RelationUpdateListener; | 13 | import tools.refinery.store.query.internal.RelationUpdateListener; |
14 | import tools.refinery.data.query.internal.RelationalEngineContext; | 14 | import tools.refinery.store.query.internal.RelationalEngineContext; |
15 | import tools.refinery.data.query.view.RelationView; | 15 | import tools.refinery.store.query.view.RelationView; |
16 | 16 | ||
17 | public class RelationalScope extends QueryScope{ | 17 | public class RelationalScope extends QueryScope{ |
18 | private final Model model; | 18 | private final Model model; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java b/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java index 2de68d38..48dabce2 100644 --- a/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java +++ b/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.HashSet; | 4 | import java.util.HashSet; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java b/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java index a91f27b6..b047d7c8 100644 --- a/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java +++ b/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.Collection; | 3 | import java.util.Collection; |
4 | import java.util.Iterator; | 4 | import java.util.Iterator; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java b/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java index b25e5a7d..f0c9ac42 100644 --- a/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java +++ b/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.HashSet; | 4 | import java.util.HashSet; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java b/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java index b1934391..fede2518 100644 --- a/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java +++ b/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | import java.util.Set; | 4 | import java.util.Set; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java b/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java index e15448dd..42394922 100644 --- a/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java +++ b/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | import java.util.Map; | 4 | import java.util.Map; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java b/store/src/main/java/tools/refinery/store/query/building/PredicateBuilder_string.java index 8e852900..b99407a3 100644 --- a/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java +++ b/store/src/main/java/tools/refinery/store/query/building/PredicateBuilder_string.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.Collections; | 4 | import java.util.Collections; |
5 | import java.util.HashSet; | 5 | import java.util.HashSet; |
6 | import java.util.List; | 6 | import java.util.List; |
7 | 7 | ||
8 | import tools.refinery.data.query.view.RelationView; | 8 | import tools.refinery.store.query.view.RelationView; |
9 | 9 | ||
10 | public class PredicateBuilder_string { | 10 | public class PredicateBuilder_string { |
11 | private PredicateBuilder_string() {} | 11 | private PredicateBuilder_string() {} |
diff --git a/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java b/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java index 315122fe..1238f1d7 100644 --- a/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java +++ b/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | import java.util.Map; | 4 | import java.util.Map; |
5 | import java.util.Set; | 5 | import java.util.Set; |
6 | 6 | ||
7 | import tools.refinery.data.query.view.FilteredRelationView; | 7 | import tools.refinery.store.query.view.FilteredRelationView; |
8 | import tools.refinery.data.query.view.RelationView; | 8 | import tools.refinery.store.query.view.RelationView; |
9 | 9 | ||
10 | public class RelationAtom implements DNFAtom { | 10 | public class RelationAtom implements DNFAtom { |
11 | RelationView<?> view; | 11 | RelationView<?> view; |
diff --git a/store/src/main/java/tools/refinery/data/query/building/Variable.java b/store/src/main/java/tools/refinery/store/query/building/Variable.java index 5c2a2f1e..9ea7ce83 100644 --- a/store/src/main/java/tools/refinery/data/query/building/Variable.java +++ b/store/src/main/java/tools/refinery/store/query/building/Variable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.building; | 1 | package tools.refinery.store.query.building; |
2 | 2 | ||
3 | public class Variable { | 3 | public class Variable { |
4 | private final String name; | 4 | private final String name; |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java b/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java index f0fb7c95..49637071 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java +++ b/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import java.lang.reflect.InvocationTargetException; | 3 | import java.lang.reflect.InvocationTargetException; |
4 | import java.util.concurrent.Callable; | 4 | import java.util.concurrent.Callable; |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java b/store/src/main/java/tools/refinery/store/query/internal/PredicateTranslator.java index f9b6c17f..6b050182 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java +++ b/store/src/main/java/tools/refinery/store/query/internal/PredicateTranslator.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.HashMap; | 4 | import java.util.HashMap; |
@@ -29,8 +29,8 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery; | |||
29 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility; | 29 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility; |
30 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; | 30 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; |
31 | 31 | ||
32 | import tools.refinery.data.query.RelationalScope; | 32 | import tools.refinery.store.query.RelationalScope; |
33 | import tools.refinery.data.query.view.RelationView; | 33 | import tools.refinery.store.query.view.RelationView; |
34 | 34 | ||
35 | public class PredicateTranslator extends BasePQuery { | 35 | public class PredicateTranslator extends BasePQuery { |
36 | 36 | ||
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListener.java index a3b319c8..cf5260f6 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java +++ b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListener.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.HashSet; | 4 | import java.util.HashSet; |
@@ -8,8 +8,8 @@ import java.util.Set; | |||
8 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; | 8 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; |
9 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; | 9 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; |
10 | 10 | ||
11 | import tools.refinery.data.model.Tuple; | 11 | import tools.refinery.store.model.Tuple; |
12 | import tools.refinery.data.query.view.RelationView; | 12 | import tools.refinery.store.query.view.RelationView; |
13 | 13 | ||
14 | public class RelationUpdateListener { | 14 | public class RelationUpdateListener { |
15 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; | 15 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListenerEntry.java index 45be26b1..860a80b7 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java +++ b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListenerEntry.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.Objects; | 4 | import java.util.Objects; |
@@ -7,8 +7,8 @@ import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextLis | |||
7 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; | 7 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; |
8 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; | 8 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; |
9 | 9 | ||
10 | import tools.refinery.data.model.Tuple; | 10 | import tools.refinery.store.model.Tuple; |
11 | import tools.refinery.data.query.view.RelationView; | 11 | import tools.refinery.store.query.view.RelationView; |
12 | 12 | ||
13 | public class RelationUpdateListenerEntry<D> { | 13 | public class RelationUpdateListenerEntry<D> { |
14 | final RelationView<D> key; | 14 | final RelationView<D> key; |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java index 08ab8927..691baf81 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java +++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex; | 3 | import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex; |
4 | import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; | 4 | import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; |
5 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext; | 5 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext; |
6 | 6 | ||
7 | import tools.refinery.data.model.Model; | 7 | import tools.refinery.store.model.Model; |
8 | 8 | ||
9 | public class RelationalEngineContext implements IEngineContext{ | 9 | public class RelationalEngineContext implements IEngineContext{ |
10 | private final IBaseIndex baseIndex = new DummyBaseIndexer(); | 10 | private final IBaseIndex baseIndex = new DummyBaseIndexer(); |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java index 6226b483..05fb0904 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java +++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import java.util.Collection; | 3 | import java.util.Collection; |
4 | import java.util.Collections; | 4 | import java.util.Collections; |
@@ -11,7 +11,7 @@ import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContex | |||
11 | import org.eclipse.viatra.query.runtime.matchers.context.IInputKey; | 11 | import org.eclipse.viatra.query.runtime.matchers.context.IInputKey; |
12 | import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication; | 12 | import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication; |
13 | 13 | ||
14 | import tools.refinery.data.query.view.RelationView; | 14 | import tools.refinery.store.query.view.RelationView; |
15 | 15 | ||
16 | /** | 16 | /** |
17 | * The meta context information for String scopes. | 17 | * The meta context information for String scopes. |
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java index 8ee185af..da118f26 100644 --- a/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java +++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package tools.refinery.data.query.internal; | 1 | package tools.refinery.store.query.internal; |
2 | 2 | ||
3 | import static tools.refinery.data.util.CollectionsUtil.filter; | 3 | import static tools.refinery.store.util.CollectionsUtil.filter; |
4 | import static tools.refinery.data.util.CollectionsUtil.map; | 4 | import static tools.refinery.store.util.CollectionsUtil.map; |
5 | 5 | ||
6 | import java.lang.reflect.InvocationTargetException; | 6 | import java.lang.reflect.InvocationTargetException; |
7 | import java.util.Iterator; | 7 | import java.util.Iterator; |
@@ -20,8 +20,8 @@ import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask; | |||
20 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; | 20 | import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; |
21 | import org.eclipse.viatra.query.runtime.matchers.util.Accuracy; | 21 | import org.eclipse.viatra.query.runtime.matchers.util.Accuracy; |
22 | 22 | ||
23 | import tools.refinery.data.model.Model; | 23 | import tools.refinery.store.model.Model; |
24 | import tools.refinery.data.query.view.RelationView; | 24 | import tools.refinery.store.query.view.RelationView; |
25 | 25 | ||
26 | public class RelationalRuntimeContext implements IQueryRuntimeContext { | 26 | public class RelationalRuntimeContext implements IQueryRuntimeContext { |
27 | private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext(); | 27 | private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext(); |
diff --git a/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java b/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java index b33a47af..2e264c44 100644 --- a/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java +++ b/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package tools.refinery.data.query.view; | 1 | package tools.refinery.store.query.view; |
2 | 2 | ||
3 | import java.util.function.BiPredicate; | 3 | import java.util.function.BiPredicate; |
4 | 4 | ||
5 | import tools.refinery.data.model.Model; | 5 | import tools.refinery.store.model.Model; |
6 | import tools.refinery.data.model.Tuple; | 6 | import tools.refinery.store.model.Tuple; |
7 | import tools.refinery.data.model.Tuple.Tuple1; | 7 | import tools.refinery.store.model.Tuple.Tuple1; |
8 | import tools.refinery.data.model.representation.Relation; | 8 | import tools.refinery.store.model.representation.Relation; |
9 | 9 | ||
10 | public class FilteredRelationView<D> extends RelationView<D>{ | 10 | public class FilteredRelationView<D> extends RelationView<D>{ |
11 | private final BiPredicate<Tuple,D> predicate; | 11 | private final BiPredicate<Tuple,D> predicate; |
diff --git a/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java b/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java index eaffb389..f54d4428 100644 --- a/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java +++ b/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package tools.refinery.data.query.view; | 1 | package tools.refinery.store.query.view; |
2 | 2 | ||
3 | import tools.refinery.data.model.Model; | 3 | import tools.refinery.store.model.Model; |
4 | import tools.refinery.data.model.Tuple; | 4 | import tools.refinery.store.model.Tuple; |
5 | import tools.refinery.data.model.Tuple.Tuple1; | 5 | import tools.refinery.store.model.Tuple.Tuple1; |
6 | import tools.refinery.data.model.representation.Relation; | 6 | import tools.refinery.store.model.representation.Relation; |
7 | 7 | ||
8 | public class FunctionalRelationView<D> extends RelationView<D> { | 8 | public class FunctionalRelationView<D> extends RelationView<D> { |
9 | 9 | ||
diff --git a/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java b/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java index 2cc10752..1d1932cc 100644 --- a/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java +++ b/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package tools.refinery.data.query.view; | 1 | package tools.refinery.store.query.view; |
2 | 2 | ||
3 | import tools.refinery.data.model.Tuple; | 3 | import tools.refinery.store.model.Tuple; |
4 | import tools.refinery.data.model.representation.Relation; | 4 | import tools.refinery.store.model.representation.Relation; |
5 | 5 | ||
6 | public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{ | 6 | public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{ |
7 | 7 | ||
diff --git a/store/src/main/java/tools/refinery/data/query/view/RelationView.java b/store/src/main/java/tools/refinery/store/query/view/RelationView.java index 10b67221..2c2a37c4 100644 --- a/store/src/main/java/tools/refinery/data/query/view/RelationView.java +++ b/store/src/main/java/tools/refinery/store/query/view/RelationView.java | |||
@@ -1,13 +1,13 @@ | |||
1 | package tools.refinery.data.query.view; | 1 | package tools.refinery.store.query.view; |
2 | 2 | ||
3 | import java.util.Objects; | 3 | import java.util.Objects; |
4 | 4 | ||
5 | import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper; | 5 | import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper; |
6 | 6 | ||
7 | import tools.refinery.data.map.CursorAsIterator; | 7 | import tools.refinery.store.map.CursorAsIterator; |
8 | import tools.refinery.data.model.Model; | 8 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.data.model.Tuple; | 9 | import tools.refinery.store.model.Tuple; |
10 | import tools.refinery.data.model.representation.Relation; | 10 | import tools.refinery.store.model.representation.Relation; |
11 | 11 | ||
12 | /** | 12 | /** |
13 | * Represents a view of a {@link Relation} that can be queried. | 13 | * Represents a view of a {@link Relation} that can be queried. |
diff --git a/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java b/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java index bd813b20..841d0dfa 100644 --- a/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java +++ b/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.util; | 1 | package tools.refinery.store.util; |
2 | 2 | ||
3 | import java.util.Iterator; | 3 | import java.util.Iterator; |
4 | import java.util.NoSuchElementException; | 4 | import java.util.NoSuchElementException; |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java index d744a79d..1f9d022f 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -11,12 +11,12 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
11 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
12 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
13 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | 14 | import tools.refinery.store.map.ContinousHashProvider; |
15 | import tools.refinery.data.map.VersionedMapStore; | 15 | import tools.refinery.store.map.VersionedMapStore; |
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | 16 | import tools.refinery.store.map.VersionedMapStoreImpl; |
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | 17 | import tools.refinery.store.map.internal.VersionedMapImpl; |
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 18 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 19 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
20 | 20 | ||
21 | class CommitFuzzTest { | 21 | class CommitFuzzTest { |
22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java index 1f6f9609..263cb2cd 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.fail; | 4 | import static org.junit.jupiter.api.Assertions.fail; |
@@ -16,14 +16,14 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
16 | import org.junit.jupiter.params.provider.Arguments; | 16 | import org.junit.jupiter.params.provider.Arguments; |
17 | import org.junit.jupiter.params.provider.MethodSource; | 17 | import org.junit.jupiter.params.provider.MethodSource; |
18 | 18 | ||
19 | import tools.refinery.data.map.ContinousHashProvider; | 19 | import tools.refinery.store.map.ContinousHashProvider; |
20 | import tools.refinery.data.map.Cursor; | 20 | import tools.refinery.store.map.Cursor; |
21 | import tools.refinery.data.map.VersionedMap; | 21 | import tools.refinery.store.map.VersionedMap; |
22 | import tools.refinery.data.map.VersionedMapStore; | 22 | import tools.refinery.store.map.VersionedMapStore; |
23 | import tools.refinery.data.map.VersionedMapStoreImpl; | 23 | import tools.refinery.store.map.VersionedMapStoreImpl; |
24 | import tools.refinery.data.map.internal.VersionedMapImpl; | 24 | import tools.refinery.store.map.internal.VersionedMapImpl; |
25 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 25 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
26 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 26 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
27 | 27 | ||
28 | class ContentEqualsFuzzTest { | 28 | class ContentEqualsFuzzTest { |
29 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 29 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java index fd663a7c..e6334224 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -11,13 +11,13 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
11 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
12 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
13 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | 14 | import tools.refinery.store.map.ContinousHashProvider; |
15 | import tools.refinery.data.map.DiffCursor; | 15 | import tools.refinery.store.map.DiffCursor; |
16 | import tools.refinery.data.map.VersionedMapStore; | 16 | import tools.refinery.store.map.VersionedMapStore; |
17 | import tools.refinery.data.map.VersionedMapStoreImpl; | 17 | import tools.refinery.store.map.VersionedMapStoreImpl; |
18 | import tools.refinery.data.map.internal.VersionedMapImpl; | 18 | import tools.refinery.store.map.internal.VersionedMapImpl; |
19 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 19 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
20 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 20 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
21 | 21 | ||
22 | class DiffCursorFuzzTest { | 22 | class DiffCursorFuzzTest { |
23 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 23 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java index e6af13bf..1ab431a8 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.fail; | 4 | import static org.junit.jupiter.api.Assertions.fail; |
@@ -14,11 +14,11 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
14 | import org.junit.jupiter.params.provider.Arguments; | 14 | import org.junit.jupiter.params.provider.Arguments; |
15 | import org.junit.jupiter.params.provider.MethodSource; | 15 | import org.junit.jupiter.params.provider.MethodSource; |
16 | 16 | ||
17 | import tools.refinery.data.map.ContinousHashProvider; | 17 | import tools.refinery.store.map.ContinousHashProvider; |
18 | import tools.refinery.data.map.VersionedMapStore; | 18 | import tools.refinery.store.map.VersionedMapStore; |
19 | import tools.refinery.data.map.VersionedMapStoreImpl; | 19 | import tools.refinery.store.map.VersionedMapStoreImpl; |
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 20 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 21 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
22 | 22 | ||
23 | class MultiThreadFuzzTest { | 23 | class MultiThreadFuzzTest { |
24 | public static final int noThreads = 32; | 24 | public static final int noThreads = 32; |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java index 922178c6..f77f9ee5 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.Collections; | 4 | import java.util.Collections; |
@@ -8,9 +8,9 @@ import java.util.List; | |||
8 | import java.util.Map; | 8 | import java.util.Map; |
9 | import java.util.Random; | 9 | import java.util.Random; |
10 | 10 | ||
11 | import tools.refinery.data.map.VersionedMapStore; | 11 | import tools.refinery.store.map.VersionedMapStore; |
12 | import tools.refinery.data.map.internal.VersionedMapImpl; | 12 | import tools.refinery.store.map.internal.VersionedMapImpl; |
13 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 13 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
14 | 14 | ||
15 | public class MultiThreadTestRunnable implements Runnable { | 15 | public class MultiThreadTestRunnable implements Runnable { |
16 | String scenario; | 16 | String scenario; |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java index a16cb8f5..d40c49c4 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -11,12 +11,12 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
11 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
12 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
13 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | 14 | import tools.refinery.store.map.ContinousHashProvider; |
15 | import tools.refinery.data.map.VersionedMapStore; | 15 | import tools.refinery.store.map.VersionedMapStore; |
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | 16 | import tools.refinery.store.map.VersionedMapStoreImpl; |
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | 17 | import tools.refinery.store.map.internal.VersionedMapImpl; |
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 18 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 19 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
20 | 20 | ||
21 | class MutableFuzzTest { | 21 | class MutableFuzzTest { |
22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) { | 22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) { |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java index 45308892..410705a2 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -11,12 +11,12 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
11 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
12 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
13 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | 14 | import tools.refinery.store.map.ContinousHashProvider; |
15 | import tools.refinery.data.map.VersionedMapStore; | 15 | import tools.refinery.store.map.VersionedMapStore; |
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | 16 | import tools.refinery.store.map.VersionedMapStoreImpl; |
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | 17 | import tools.refinery.store.map.internal.VersionedMapImpl; |
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 18 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 19 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
20 | 20 | ||
21 | class MutableImmutableCompareFuzzTest { | 21 | class MutableImmutableCompareFuzzTest { |
22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 22 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java index 1b8b38c4..2e29a03f 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.fail; | 3 | import static org.junit.jupiter.api.Assertions.fail; |
4 | 4 | ||
@@ -13,12 +13,12 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
13 | import org.junit.jupiter.params.provider.Arguments; | 13 | import org.junit.jupiter.params.provider.Arguments; |
14 | import org.junit.jupiter.params.provider.MethodSource; | 14 | import org.junit.jupiter.params.provider.MethodSource; |
15 | 15 | ||
16 | import tools.refinery.data.map.ContinousHashProvider; | 16 | import tools.refinery.store.map.ContinousHashProvider; |
17 | import tools.refinery.data.map.VersionedMapStore; | 17 | import tools.refinery.store.map.VersionedMapStore; |
18 | import tools.refinery.data.map.VersionedMapStoreImpl; | 18 | import tools.refinery.store.map.VersionedMapStoreImpl; |
19 | import tools.refinery.data.map.internal.VersionedMapImpl; | 19 | import tools.refinery.store.map.internal.VersionedMapImpl; |
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 20 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 21 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
22 | 22 | ||
23 | class RestoreFuzzTest { | 23 | class RestoreFuzzTest { |
24 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 24 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java index 1703a732..914a0f63 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz; | 1 | package tools.refinery.store.map.tests.fuzz; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
@@ -13,12 +13,12 @@ import org.junit.jupiter.params.ParameterizedTest; | |||
13 | import org.junit.jupiter.params.provider.Arguments; | 13 | import org.junit.jupiter.params.provider.Arguments; |
14 | import org.junit.jupiter.params.provider.MethodSource; | 14 | import org.junit.jupiter.params.provider.MethodSource; |
15 | 15 | ||
16 | import tools.refinery.data.map.ContinousHashProvider; | 16 | import tools.refinery.store.map.ContinousHashProvider; |
17 | import tools.refinery.data.map.VersionedMapStore; | 17 | import tools.refinery.store.map.VersionedMapStore; |
18 | import tools.refinery.data.map.VersionedMapStoreImpl; | 18 | import tools.refinery.store.map.VersionedMapStoreImpl; |
19 | import tools.refinery.data.map.internal.VersionedMapImpl; | 19 | import tools.refinery.store.map.internal.VersionedMapImpl; |
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | 20 | import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils; |
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | 21 | import tools.refinery.store.map.tests.utils.MapTestEnvironment; |
22 | 22 | ||
23 | class SharedStoreFuzzTest { | 23 | class SharedStoreFuzzTest { |
24 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, | 24 | private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency, |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java index 23df4aef..e75d7f5a 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz.utils; | 1 | package tools.refinery.store.map.tests.fuzz.utils; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
diff --git a/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java b/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java index abf8be3c..72f2a46c 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java +++ b/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.fuzz.utils; | 1 | package tools.refinery.store.map.tests.fuzz.utils; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | 4 | ||
diff --git a/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java b/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java index e1cfc2e2..991b4f51 100644 --- a/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java +++ b/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.map.tests.utils; | 1 | package tools.refinery.store.map.tests.utils; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.assertTrue; | 4 | import static org.junit.jupiter.api.Assertions.assertTrue; |
@@ -9,12 +9,13 @@ import java.util.Iterator; | |||
9 | import java.util.List; | 9 | import java.util.List; |
10 | import java.util.Map; | 10 | import java.util.Map; |
11 | import java.util.Map.Entry; | 11 | import java.util.Map.Entry; |
12 | import java.util.TreeMap; | ||
13 | 12 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | 13 | import tools.refinery.store.map.ContinousHashProvider; |
15 | import tools.refinery.data.map.Cursor; | 14 | import tools.refinery.store.map.Cursor; |
16 | import tools.refinery.data.map.VersionedMap; | 15 | import tools.refinery.store.map.VersionedMap; |
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | 16 | import tools.refinery.store.map.internal.VersionedMapImpl; |
17 | |||
18 | import java.util.TreeMap; | ||
18 | 19 | ||
19 | public class MapTestEnvironment<K, V> { | 20 | public class MapTestEnvironment<K, V> { |
20 | public static String[] prepareValues(int maxValue) { | 21 | public static String[] prepareValues(int maxValue) { |
diff --git a/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java b/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java index f3479846..7d070380 100644 --- a/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java +++ b/store/src/test/java/tools/refinery/store/model/hashTests/HashEfficiencyTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.model.hashTests; | 1 | package tools.refinery.store.model.hashTests; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | 4 | ||
@@ -9,10 +9,10 @@ import java.util.Random; | |||
9 | 9 | ||
10 | import org.junit.jupiter.api.Test; | 10 | import org.junit.jupiter.api.Test; |
11 | 11 | ||
12 | import tools.refinery.data.map.ContinousHashProvider; | 12 | import tools.refinery.store.map.ContinousHashProvider; |
13 | import tools.refinery.data.model.Tuple; | 13 | import tools.refinery.store.model.Tuple; |
14 | import tools.refinery.data.model.TupleHashProvider; | 14 | import tools.refinery.store.model.TupleHashProvider; |
15 | import tools.refinery.data.model.TupleHashProviderBitMagic; | 15 | import tools.refinery.store.model.TupleHashProviderBitMagic; |
16 | 16 | ||
17 | class HashEfficiencyTest { | 17 | class HashEfficiencyTest { |
18 | 18 | ||
diff --git a/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java b/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java index 2b7589bc..9d90b1e1 100644 --- a/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java +++ b/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.model.tests; | 1 | package tools.refinery.store.model.tests; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.assertFalse; | 4 | import static org.junit.jupiter.api.Assertions.assertFalse; |
@@ -9,11 +9,11 @@ import java.util.Set; | |||
9 | import org.junit.jupiter.api.Assertions; | 9 | import org.junit.jupiter.api.Assertions; |
10 | import org.junit.jupiter.api.Test; | 10 | import org.junit.jupiter.api.Test; |
11 | 11 | ||
12 | import tools.refinery.data.model.Model; | 12 | import tools.refinery.store.model.Model; |
13 | import tools.refinery.data.model.ModelStore; | 13 | import tools.refinery.store.model.ModelStore; |
14 | import tools.refinery.data.model.ModelStoreImpl; | 14 | import tools.refinery.store.model.ModelStoreImpl; |
15 | import tools.refinery.data.model.Tuple; | 15 | import tools.refinery.store.model.Tuple; |
16 | import tools.refinery.data.model.representation.Relation; | 16 | import tools.refinery.store.model.representation.Relation; |
17 | 17 | ||
18 | class ModelTest { | 18 | class ModelTest { |
19 | 19 | ||
diff --git a/store/src/test/java/tools/refinery/data/query/test/QueryTest.java b/store/src/test/java/tools/refinery/store/query/test/QueryTest.java index faf3f111..38aa130a 100644 --- a/store/src/test/java/tools/refinery/data/query/test/QueryTest.java +++ b/store/src/test/java/tools/refinery/store/query/test/QueryTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package tools.refinery.data.query.test; | 1 | package tools.refinery.store.query.test; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static org.junit.jupiter.api.Assertions.assertFalse; | 4 | import static org.junit.jupiter.api.Assertions.assertFalse; |
@@ -14,18 +14,18 @@ import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification; | |||
14 | import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine; | 14 | import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine; |
15 | import org.junit.jupiter.api.Test; | 15 | import org.junit.jupiter.api.Test; |
16 | 16 | ||
17 | import tools.refinery.data.model.Model; | 17 | import tools.refinery.store.model.Model; |
18 | import tools.refinery.data.model.ModelStore; | 18 | import tools.refinery.store.model.ModelStore; |
19 | import tools.refinery.data.model.ModelStoreImpl; | 19 | import tools.refinery.store.model.ModelStoreImpl; |
20 | import tools.refinery.data.model.Tuple; | 20 | import tools.refinery.store.model.Tuple; |
21 | import tools.refinery.data.model.representation.Relation; | 21 | import tools.refinery.store.model.representation.Relation; |
22 | import tools.refinery.data.model.representation.TruthValue; | 22 | import tools.refinery.store.model.representation.TruthValue; |
23 | import tools.refinery.data.query.RelationalScope; | 23 | import tools.refinery.store.query.RelationalScope; |
24 | import tools.refinery.data.query.internal.PredicateTranslator; | 24 | import tools.refinery.store.query.internal.PredicateTranslator; |
25 | import tools.refinery.data.query.view.FilteredRelationView; | 25 | import tools.refinery.store.query.view.FilteredRelationView; |
26 | import tools.refinery.data.query.view.FunctionalRelationView; | 26 | import tools.refinery.store.query.view.FunctionalRelationView; |
27 | import tools.refinery.data.query.view.KeyOnlyRelationView; | 27 | import tools.refinery.store.query.view.KeyOnlyRelationView; |
28 | import tools.refinery.data.query.view.RelationView; | 28 | import tools.refinery.store.query.view.RelationView; |
29 | 29 | ||
30 | class QueryTest { | 30 | class QueryTest { |
31 | @Test | 31 | @Test |
diff --git a/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java b/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java index 39ff4aca..171be0e5 100644 --- a/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java +++ b/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java | |||
@@ -1,8 +1,8 @@ | |||
1 | package tools.refinery.data.util; | 1 | package tools.refinery.store.util; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | import static tools.refinery.data.util.CollectionsUtil.filter; | 4 | import static tools.refinery.store.util.CollectionsUtil.filter; |
5 | import static tools.refinery.data.util.CollectionsUtil.map; | 5 | import static tools.refinery.store.util.CollectionsUtil.map; |
6 | 6 | ||
7 | import java.util.ArrayList; | 7 | import java.util.ArrayList; |
8 | import java.util.Iterator; | 8 | import java.util.Iterator; |