diff options
Diffstat (limited to 'store')
-rw-r--r-- | store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java (renamed from store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutBenchmark.java) | 2 | ||||
-rw-r--r-- | store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java (renamed from store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutExecutionPlan.java) | 12 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/Cursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/CursorAsIterator.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/CursorAsIterator.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/DiffCursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/MapAsIterable.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/MapAsIterable.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/Versioned.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/Versioned.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/VersionedMap.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/VersionedMapStore.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStore.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreConfiguration.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/HashClash.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/HashClash.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/MapCursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/MutableNode.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/Node.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/OldValueBox.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java) | 12 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/Model.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/Model.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/ModelCursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/ModelCursor.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/ModelDiffCursor.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/ModelStore.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStore.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java) | 22 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/Tuple.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/TupleHashProvider.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProvider.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProviderBitMagic.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java) | 20 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java) | 8 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/representation/Relation.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/model/representation/TruthValue.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/model/representation/TruthValue.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/RelationalScope.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java) | 13 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/DNFAnd.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAnd.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/DNFAtom.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFPredicate.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/EquivalenceAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateAtom.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateBuilder_string.java) | 4 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/RelationAtom.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/RelationAtom.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/building/Variable.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/building/Variable.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/DummyBaseIndexer.java) | 2 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java) | 7 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java) | 7 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListenerEntry.java) | 7 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalEngineContext.java) | 5 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalQueryMetaContext.java) | 5 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalRuntimeContext.java) | 11 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java) | 10 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java) | 6 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/query/view/RelationView.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java) | 11 | ||||
-rw-r--r-- | store/src/main/java/tools/refinery/data/util/CollectionsUtil.java (renamed from store/src/main/java/org/eclipse/viatra/solver/data/util/CollectionsUtil.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java) | 15 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java) | 19 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java) | 17 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadFuzzTest.java) | 13 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadTestRunnable.java) | 8 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java) | 15 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java) | 15 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java) | 15 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java) | 15 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java) | 2 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java) | 10 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/model/hashTests/HashEfficiencyTest.java) | 11 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/model/tests/ModelTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/model/tests/ModelTest.java) | 13 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/query/test/QueryTest.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java) | 27 | ||||
-rw-r--r-- | store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java (renamed from store/src/test/java/org/eclipse/viatra/solver/data/util/CollectionsUtilTests.java) | 9 |
71 files changed, 267 insertions, 247 deletions
diff --git a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutBenchmark.java b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java index f0af443f..bc5e056f 100644 --- a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutBenchmark.java +++ b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.benchmarks; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutExecutionPlan.java b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java index 6cac74af..084381a0 100644 --- a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutExecutionPlan.java +++ b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java | |||
@@ -1,12 +1,12 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.benchmarks; | 1 | package tools.refinery.data.map.benchmarks; |
2 | 2 | ||
3 | import java.util.Random; | 3 | import java.util.Random; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 5 | import tools.refinery.data.map.ContinousHashProvider; |
6 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 6 | import tools.refinery.data.map.VersionedMapStore; |
7 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 7 | import tools.refinery.data.map.VersionedMapStoreImpl; |
8 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 8 | import tools.refinery.data.map.internal.VersionedMapImpl; |
9 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 9 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; |
10 | import org.openjdk.jmh.annotations.Level; | 10 | import org.openjdk.jmh.annotations.Level; |
11 | import org.openjdk.jmh.annotations.Param; | 11 | import org.openjdk.jmh.annotations.Param; |
12 | import org.openjdk.jmh.annotations.Scope; | 12 | import org.openjdk.jmh.annotations.Scope; |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java b/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java index dd64f901..6a54a3ff 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java +++ b/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.map; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.map.internal.Node; | 3 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/Cursor.java b/store/src/main/java/tools/refinery/data/map/Cursor.java index e45b1f20..a137e6c1 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java +++ b/store/src/main/java/tools/refinery/data/map/Cursor.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.map; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | 4 | ||
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/CursorAsIterator.java b/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java index b29b3119..02a49ba1 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/CursorAsIterator.java +++ b/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/DiffCursor.java b/store/src/main/java/tools/refinery/data/map/DiffCursor.java index f0af1436..747aa610 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java +++ b/store/src/main/java/tools/refinery/data/map/DiffCursor.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/MapAsIterable.java b/store/src/main/java/tools/refinery/data/map/MapAsIterable.java index 22b5e6c1..05bdbef2 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/MapAsIterable.java +++ b/store/src/main/java/tools/refinery/data/map/MapAsIterable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/Versioned.java b/store/src/main/java/tools/refinery/data/map/Versioned.java index e46be237..eb364b87 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/Versioned.java +++ b/store/src/main/java/tools/refinery/data/map/Versioned.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/VersionedMap.java b/store/src/main/java/tools/refinery/data/map/VersionedMap.java index 3a35b9f0..d57e3ee5 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java +++ b/store/src/main/java/tools/refinery/data/map/VersionedMap.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/VersionedMapStore.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java index 0ff0773f..029cf9e7 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStore.java +++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.map; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreConfiguration.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java index be768e98..162ec4ca 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreConfiguration.java +++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.map; |
2 | 2 | ||
3 | public class VersionedMapStoreConfiguration { | 3 | public class VersionedMapStoreConfiguration { |
4 | 4 | ||
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java index 83d0e8cd..c194faf8 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java +++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.internal.ImmutableNode; | 12 | import tools.refinery.data.map.internal.ImmutableNode; |
13 | import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor; | 13 | import tools.refinery.data.map.internal.MapDiffCursor; |
14 | import org.eclipse.viatra.solver.data.map.internal.Node; | 14 | import tools.refinery.data.map.internal.Node; |
15 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 15 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/HashClash.java b/store/src/main/java/tools/refinery/data/map/internal/HashClash.java index c70fb8b8..640feb95 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/HashClash.java +++ b/store/src/main/java/tools/refinery/data/map/internal/HashClash.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.map.internal; |
2 | 2 | ||
3 | enum HashClash { | 3 | enum HashClash { |
4 | /** | 4 | /** |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java b/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java index b507763f..99e27bb6 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java +++ b/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 6 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/MapCursor.java b/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java index cc5a3982..44ed1f45 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java +++ b/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java | |||
@@ -1,12 +1,12 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.Cursor; | 8 | import tools.refinery.data.map.Cursor; |
9 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 9 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java b/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java index 35d20539..dcff3c06 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java +++ b/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java | |||
@@ -1,12 +1,12 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 6 | import tools.refinery.data.map.ContinousHashProvider; |
7 | import org.eclipse.viatra.solver.data.map.Cursor; | 7 | import tools.refinery.data.map.Cursor; |
8 | import org.eclipse.viatra.solver.data.map.DiffCursor; | 8 | import tools.refinery.data.map.DiffCursor; |
9 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 9 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/MutableNode.java b/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java index b5fee673..5522051a 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java +++ b/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 6 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/Node.java b/store/src/main/java/tools/refinery/data/map/internal/Node.java index d40f980a..b99275d9 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java +++ b/store/src/main/java/tools/refinery/data/map/internal/Node.java | |||
@@ -1,8 +1,8 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.map.internal; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 5 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/OldValueBox.java b/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java index 23502857..641c831b 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/OldValueBox.java +++ b/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java b/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java index de41e602..8aa9686f 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java +++ b/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java | |||
@@ -1,14 +1,14 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 7 | import tools.refinery.data.map.ContinousHashProvider; |
8 | import org.eclipse.viatra.solver.data.map.Cursor; | 8 | import tools.refinery.data.map.Cursor; |
9 | import org.eclipse.viatra.solver.data.map.DiffCursor; | 9 | import tools.refinery.data.map.DiffCursor; |
10 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 10 | import tools.refinery.data.map.VersionedMap; |
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 11 | import tools.refinery.data.map.VersionedMapStoreImpl; |
12 | 12 | ||
13 | /** | 13 | /** |
14 | * Not threadSafe in itself | 14 | * Not threadSafe in itself |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/Model.java b/store/src/main/java/tools/refinery/data/model/Model.java index 2b21e3e7..2d0b350a 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/Model.java +++ b/store/src/main/java/tools/refinery/data/model/Model.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.Cursor; | 5 | import tools.refinery.data.map.Cursor; |
6 | import org.eclipse.viatra.solver.data.map.Versioned; | 6 | import tools.refinery.data.map.Versioned; |
7 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 7 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/ModelCursor.java b/store/src/main/java/tools/refinery/data/model/ModelCursor.java index 3157c9f0..e3537c7d 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelCursor.java +++ b/store/src/main/java/tools/refinery/data/model/ModelCursor.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.Cursor; | 5 | import tools.refinery.data.map.Cursor; |
6 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 6 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/ModelDiffCursor.java b/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java index d3551e47..cd3eb316 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelDiffCursor.java +++ b/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import java.util.Map; | 3 | import java.util.Map; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.Cursor; | 5 | import tools.refinery.data.map.Cursor; |
6 | import org.eclipse.viatra.solver.data.map.DiffCursor; | 6 | import tools.refinery.data.map.DiffCursor; |
7 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 7 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/ModelStore.java b/store/src/main/java/tools/refinery/data/model/ModelStore.java index 35ac72b5..03c1bcca 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStore.java +++ b/store/src/main/java/tools/refinery/data/model/ModelStore.java | |||
@@ -1,8 +1,8 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 5 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java b/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java index a97fb27a..fcad1d99 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java +++ b/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.LinkedList; | 4 | import java.util.LinkedList; |
@@ -7,16 +7,16 @@ import java.util.Map; | |||
7 | import java.util.Map.Entry; | 7 | import java.util.Map.Entry; |
8 | import java.util.Set; | 8 | import java.util.Set; |
9 | 9 | ||
10 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 10 | import tools.refinery.data.map.ContinousHashProvider; |
11 | import org.eclipse.viatra.solver.data.map.DiffCursor; | 11 | import tools.refinery.data.map.DiffCursor; |
12 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 12 | import tools.refinery.data.map.VersionedMap; |
13 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | 13 | import tools.refinery.data.map.VersionedMapStore; |
14 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | 14 | import tools.refinery.data.map.VersionedMapStoreImpl; |
15 | import org.eclipse.viatra.solver.data.model.internal.ModelImpl; | 15 | import tools.refinery.data.model.internal.ModelImpl; |
16 | import org.eclipse.viatra.solver.data.model.internal.SimilarRelationEquivalenceClass; | 16 | import tools.refinery.data.model.internal.SimilarRelationEquivalenceClass; |
17 | import org.eclipse.viatra.solver.data.model.representation.AuxilaryData; | 17 | import tools.refinery.data.model.representation.AuxilaryData; |
18 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 18 | import tools.refinery.data.model.representation.DataRepresentation; |
19 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 19 | import tools.refinery.data.model.representation.Relation; |
20 | 20 | ||
21 | public class ModelStoreImpl implements ModelStore { | 21 | public class ModelStoreImpl implements ModelStore { |
22 | 22 | ||
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java b/store/src/main/java/tools/refinery/data/model/Tuple.java index ca6548a4..1bffae9e 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java +++ b/store/src/main/java/tools/refinery/data/model/Tuple.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/model/TupleHashProvider.java b/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java index 6c37aa37..d70130e3 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProvider.java +++ b/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 3 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/TupleHashProviderBitMagic.java b/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java index 2a514d66..b13b6eca 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProviderBitMagic.java +++ b/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.data.model; | 1 | package tools.refinery.data.model; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 3 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java b/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java index 6d7f4e97..dbf2a000 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java +++ b/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java | |||
@@ -1,18 +1,18 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.internal; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 7 | import tools.refinery.data.map.ContinousHashProvider; |
8 | import org.eclipse.viatra.solver.data.map.Cursor; | 8 | import tools.refinery.data.map.Cursor; |
9 | import org.eclipse.viatra.solver.data.map.DiffCursor; | 9 | import tools.refinery.data.map.DiffCursor; |
10 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 10 | import tools.refinery.data.map.VersionedMap; |
11 | import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor; | 11 | import tools.refinery.data.map.internal.MapDiffCursor; |
12 | import org.eclipse.viatra.solver.data.model.Model; | 12 | import tools.refinery.data.model.Model; |
13 | import org.eclipse.viatra.solver.data.model.ModelDiffCursor; | 13 | import tools.refinery.data.model.ModelDiffCursor; |
14 | import org.eclipse.viatra.solver.data.model.ModelStore; | 14 | import tools.refinery.data.model.ModelStore; |
15 | import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; | 15 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java b/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java index 7054e4db..7f073c0c 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java +++ b/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java | |||
@@ -1,10 +1,10 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.internal; | 1 | package tools.refinery.data.model.internal; |
2 | 2 | ||
3 | import java.util.Objects; | 3 | import java.util.Objects; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 5 | import tools.refinery.data.map.ContinousHashProvider; |
6 | import org.eclipse.viatra.solver.data.model.Tuple; | 6 | import tools.refinery.data.model.Tuple; |
7 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 7 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java b/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java index 7fc79348..9a68506f 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java +++ b/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.representation; | 1 | package tools.refinery.data.model.representation; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 3 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java b/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java index fd48eb94..c22abdab 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java +++ b/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.representation; | 1 | package tools.refinery.data.model.representation; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 3 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/representation/Relation.java b/store/src/main/java/tools/refinery/data/model/representation/Relation.java index eafb5c56..3ae07249 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java +++ b/store/src/main/java/tools/refinery/data/model/representation/Relation.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.representation; | 1 | package tools.refinery.data.model.representation; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.model.Tuple; | 3 | import tools.refinery.data.model.Tuple; |
4 | import org.eclipse.viatra.solver.data.model.TupleHashProvider; | 4 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/model/representation/TruthValue.java b/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java index 049c7eac..795285a6 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/TruthValue.java +++ b/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.representation; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/RelationalScope.java b/store/src/main/java/tools/refinery/data/query/RelationalScope.java index 97b33935..d6d6133b 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java +++ b/store/src/main/java/tools/refinery/data/query/RelationalScope.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query; | 1 | package tools.refinery.data.query; |
2 | 2 | ||
3 | import java.util.Set; | 3 | import java.util.Set; |
4 | 4 | ||
@@ -7,11 +7,12 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine; | |||
7 | import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; | 7 | 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 | import org.eclipse.viatra.solver.data.model.Model; | 10 | |
11 | import org.eclipse.viatra.solver.data.model.Tuple; | 11 | import tools.refinery.data.model.Model; |
12 | import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener; | 12 | import tools.refinery.data.model.Tuple; |
13 | import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext; | 13 | import tools.refinery.data.query.internal.RelationUpdateListener; |
14 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 14 | import tools.refinery.data.query.internal.RelationalEngineContext; |
15 | import tools.refinery.data.query.view.RelationView; | ||
15 | 16 | ||
16 | public class RelationalScope extends QueryScope{ | 17 | public class RelationalScope extends QueryScope{ |
17 | private final Model model; | 18 | private final Model model; |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAnd.java b/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java index ff5a7848..2de68d38 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAnd.java +++ b/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/DNFAtom.java b/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java index 05a3e3f8..a91f27b6 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAtom.java +++ b/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/DNFPredicate.java b/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java index 8ee540ae..b25e5a7d 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFPredicate.java +++ b/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/EquivalenceAtom.java b/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java index b47fe2a8..b1934391 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/EquivalenceAtom.java +++ b/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/PredicateAtom.java b/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java index 439298d0..e15448dd 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateAtom.java +++ b/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/PredicateBuilder_string.java b/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java index 41f85d39..8e852900 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateBuilder_string.java +++ b/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.query.view.RelationView; | 8 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/RelationAtom.java b/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java index adf2f8c7..315122fe 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/RelationAtom.java +++ b/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.query.view.FilteredRelationView; | 7 | import tools.refinery.data.query.view.FilteredRelationView; |
8 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 8 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/query/building/Variable.java b/store/src/main/java/tools/refinery/data/query/building/Variable.java index 29f9fc8b..5c2a2f1e 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/Variable.java +++ b/store/src/main/java/tools/refinery/data/query/building/Variable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.building; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/internal/DummyBaseIndexer.java b/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java index 042ec3dc..f0fb7c95 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/DummyBaseIndexer.java +++ b/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java b/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java index 54cb4bab..f9b6c17f 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java +++ b/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.query.internal; |
2 | 2 | ||
3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
4 | import java.util.HashMap; | 4 | import java.util.HashMap; |
@@ -28,8 +28,9 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter; | |||
28 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery; | 28 | 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 | import org.eclipse.viatra.solver.data.query.RelationalScope; | 31 | |
32 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 32 | import tools.refinery.data.query.RelationalScope; |
33 | import tools.refinery.data.query.view.RelationView; | ||
33 | 34 | ||
34 | public class PredicateTranslator extends BasePQuery { | 35 | public class PredicateTranslator extends BasePQuery { |
35 | 36 | ||
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java index c6d12614..a3b319c8 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java +++ b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.query.internal; |
2 | 2 | ||
3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
4 | import java.util.HashSet; | 4 | import java.util.HashSet; |
@@ -7,8 +7,9 @@ import java.util.Set; | |||
7 | 7 | ||
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 | import org.eclipse.viatra.solver.data.model.Tuple; | 10 | |
11 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 11 | import tools.refinery.data.model.Tuple; |
12 | import tools.refinery.data.query.view.RelationView; | ||
12 | 13 | ||
13 | public class RelationUpdateListener { | 14 | public class RelationUpdateListener { |
14 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; | 15 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListenerEntry.java b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java index 55aed7c8..45be26b1 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListenerEntry.java +++ b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.query.internal; |
2 | 2 | ||
3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
4 | import java.util.Objects; | 4 | import java.util.Objects; |
@@ -6,8 +6,9 @@ import java.util.Objects; | |||
6 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; | 6 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; |
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 | import org.eclipse.viatra.solver.data.model.Tuple; | 9 | |
10 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 10 | import tools.refinery.data.model.Tuple; |
11 | import tools.refinery.data.query.view.RelationView; | ||
11 | 12 | ||
12 | public class RelationUpdateListenerEntry<D> { | 13 | public class RelationUpdateListenerEntry<D> { |
13 | final RelationView<D> key; | 14 | final RelationView<D> key; |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalEngineContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java index 01948828..08ab8927 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalEngineContext.java +++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java | |||
@@ -1,9 +1,10 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.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 | import org.eclipse.viatra.solver.data.model.Model; | 6 | |
7 | import tools.refinery.data.model.Model; | ||
7 | 8 | ||
8 | public class RelationalEngineContext implements IEngineContext{ | 9 | public class RelationalEngineContext implements IEngineContext{ |
9 | private final IBaseIndex baseIndex = new DummyBaseIndexer(); | 10 | private final IBaseIndex baseIndex = new DummyBaseIndexer(); |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalQueryMetaContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java index de500fc9..6226b483 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalQueryMetaContext.java +++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.query.internal; |
2 | 2 | ||
3 | import java.util.Collection; | 3 | import java.util.Collection; |
4 | import java.util.Collections; | 4 | import java.util.Collections; |
@@ -10,7 +10,8 @@ import java.util.Set; | |||
10 | import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext; | 10 | import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext; |
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 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 13 | |
14 | import tools.refinery.data.query.view.RelationView; | ||
14 | 15 | ||
15 | /** | 16 | /** |
16 | * The meta context information for String scopes. | 17 | * The meta context information for String scopes. |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalRuntimeContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java index fa6a59ab..8ee185af 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalRuntimeContext.java +++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.internal; | 1 | package tools.refinery.data.query.internal; |
2 | 2 | ||
3 | import static org.eclipse.viatra.solver.data.util.CollectionsUtil.filter; | 3 | import static tools.refinery.data.util.CollectionsUtil.filter; |
4 | import static org.eclipse.viatra.solver.data.util.CollectionsUtil.map; | 4 | import static tools.refinery.data.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; |
@@ -19,8 +19,9 @@ import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple; | |||
19 | import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask; | 19 | 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 | import org.eclipse.viatra.solver.data.model.Model; | 22 | |
23 | import org.eclipse.viatra.solver.data.query.view.RelationView; | 23 | import tools.refinery.data.model.Model; |
24 | import tools.refinery.data.query.view.RelationView; | ||
24 | 25 | ||
25 | public class RelationalRuntimeContext implements IQueryRuntimeContext { | 26 | public class RelationalRuntimeContext implements IQueryRuntimeContext { |
26 | private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext(); | 27 | private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext(); |
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java b/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java index edc534b7..b33a47af 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java +++ b/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java | |||
@@ -1,11 +1,11 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.view; | 1 | package tools.refinery.data.query.view; |
2 | 2 | ||
3 | import java.util.function.BiPredicate; | 3 | import java.util.function.BiPredicate; |
4 | 4 | ||
5 | import org.eclipse.viatra.solver.data.model.Model; | 5 | import tools.refinery.data.model.Model; |
6 | import org.eclipse.viatra.solver.data.model.Tuple; | 6 | import tools.refinery.data.model.Tuple; |
7 | import org.eclipse.viatra.solver.data.model.Tuple.Tuple1; | 7 | import tools.refinery.data.model.Tuple.Tuple1; |
8 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 8 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java b/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java index 4aa7cfd0..eaffb389 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java +++ b/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java | |||
@@ -1,9 +1,9 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.view; | 1 | package tools.refinery.data.query.view; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.model.Model; | 3 | import tools.refinery.data.model.Model; |
4 | import org.eclipse.viatra.solver.data.model.Tuple; | 4 | import tools.refinery.data.model.Tuple; |
5 | import org.eclipse.viatra.solver.data.model.Tuple.Tuple1; | 5 | import tools.refinery.data.model.Tuple.Tuple1; |
6 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 6 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java b/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java index 11a24fc8..2cc10752 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java +++ b/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java | |||
@@ -1,7 +1,7 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.view; | 1 | package tools.refinery.data.query.view; |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.data.model.Tuple; | 3 | import tools.refinery.data.model.Tuple; |
4 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 4 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/query/view/RelationView.java b/store/src/main/java/tools/refinery/data/query/view/RelationView.java index c5bc5228..10b67221 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java +++ b/store/src/main/java/tools/refinery/data/query/view/RelationView.java | |||
@@ -1,12 +1,13 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.view; | 1 | package tools.refinery.data.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 | import org.eclipse.viatra.solver.data.map.CursorAsIterator; | 6 | |
7 | import org.eclipse.viatra.solver.data.model.Model; | 7 | import tools.refinery.data.map.CursorAsIterator; |
8 | import org.eclipse.viatra.solver.data.model.Tuple; | 8 | import tools.refinery.data.model.Model; |
9 | import org.eclipse.viatra.solver.data.model.representation.Relation; | 9 | import tools.refinery.data.model.Tuple; |
10 | import tools.refinery.data.model.representation.Relation; | ||
10 | 11 | ||
11 | /** | 12 | /** |
12 | * 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/org/eclipse/viatra/solver/data/util/CollectionsUtil.java b/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java index 21b0a9df..bd813b20 100644 --- a/store/src/main/java/org/eclipse/viatra/solver/data/util/CollectionsUtil.java +++ b/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.util; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java index e160df2b..d744a79d 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java | |||
@@ -1,22 +1,23 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 | ||
5 | import java.util.Random; | 5 | import java.util.Random; |
6 | import java.util.stream.Stream; | 6 | import java.util.stream.Stream; |
7 | 7 | ||
8 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
14 | import org.junit.jupiter.api.Tag; | 8 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 9 | import org.junit.jupiter.api.Timeout; |
16 | import org.junit.jupiter.params.ParameterizedTest; | 10 | import org.junit.jupiter.params.ParameterizedTest; |
17 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
18 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | ||
15 | import tools.refinery.data.map.VersionedMapStore; | ||
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
20 | |||
20 | class CommitFuzzTest { | 21 | class CommitFuzzTest { |
21 | 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, |
22 | boolean evilHash) { | 23 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java index 5004c152..1f6f9609 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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; |
@@ -10,20 +10,21 @@ import java.util.List; | |||
10 | import java.util.Random; | 10 | import java.util.Random; |
11 | import java.util.stream.Stream; | 11 | import java.util.stream.Stream; |
12 | 12 | ||
13 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
14 | import org.eclipse.viatra.solver.data.map.Cursor; | ||
15 | import org.eclipse.viatra.solver.data.map.VersionedMap; | ||
16 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
17 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
18 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
19 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
20 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
21 | import org.junit.jupiter.api.Tag; | 13 | import org.junit.jupiter.api.Tag; |
22 | import org.junit.jupiter.api.Timeout; | 14 | import org.junit.jupiter.api.Timeout; |
23 | import org.junit.jupiter.params.ParameterizedTest; | 15 | import org.junit.jupiter.params.ParameterizedTest; |
24 | import org.junit.jupiter.params.provider.Arguments; | 16 | import org.junit.jupiter.params.provider.Arguments; |
25 | import org.junit.jupiter.params.provider.MethodSource; | 17 | import org.junit.jupiter.params.provider.MethodSource; |
26 | 18 | ||
19 | import tools.refinery.data.map.ContinousHashProvider; | ||
20 | import tools.refinery.data.map.Cursor; | ||
21 | import tools.refinery.data.map.VersionedMap; | ||
22 | import tools.refinery.data.map.VersionedMapStore; | ||
23 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
24 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
25 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
26 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
27 | |||
27 | class ContentEqualsFuzzTest { | 28 | class ContentEqualsFuzzTest { |
28 | 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, |
29 | boolean evilHash) { | 30 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java index 4b79a98a..fd663a7c 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java | |||
@@ -1,23 +1,24 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 | ||
5 | import java.util.Random; | 5 | import java.util.Random; |
6 | import java.util.stream.Stream; | 6 | import java.util.stream.Stream; |
7 | 7 | ||
8 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
9 | import org.eclipse.viatra.solver.data.map.DiffCursor; | ||
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
12 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
13 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
14 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
15 | import org.junit.jupiter.api.Tag; | 8 | import org.junit.jupiter.api.Tag; |
16 | import org.junit.jupiter.api.Timeout; | 9 | import org.junit.jupiter.api.Timeout; |
17 | import org.junit.jupiter.params.ParameterizedTest; | 10 | import org.junit.jupiter.params.ParameterizedTest; |
18 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
19 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
20 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | ||
15 | import tools.refinery.data.map.DiffCursor; | ||
16 | import tools.refinery.data.map.VersionedMapStore; | ||
17 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
18 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
19 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
20 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
21 | |||
21 | class DiffCursorFuzzTest { | 22 | class DiffCursorFuzzTest { |
22 | 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, |
23 | boolean evilHash) { | 24 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java index c3a3e8ea..e6af13bf 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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; |
@@ -8,17 +8,18 @@ import java.util.LinkedList; | |||
8 | import java.util.List; | 8 | import java.util.List; |
9 | import java.util.stream.Stream; | 9 | import java.util.stream.Stream; |
10 | 10 | ||
11 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
12 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
13 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
14 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
16 | import org.junit.jupiter.api.Tag; | 11 | import org.junit.jupiter.api.Tag; |
17 | import org.junit.jupiter.api.Timeout; | 12 | import org.junit.jupiter.api.Timeout; |
18 | import org.junit.jupiter.params.ParameterizedTest; | 13 | import org.junit.jupiter.params.ParameterizedTest; |
19 | import org.junit.jupiter.params.provider.Arguments; | 14 | import org.junit.jupiter.params.provider.Arguments; |
20 | import org.junit.jupiter.params.provider.MethodSource; | 15 | import org.junit.jupiter.params.provider.MethodSource; |
21 | 16 | ||
17 | import tools.refinery.data.map.ContinousHashProvider; | ||
18 | import tools.refinery.data.map.VersionedMapStore; | ||
19 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
22 | |||
22 | class MultiThreadFuzzTest { | 23 | class MultiThreadFuzzTest { |
23 | public static final int noThreads = 32; | 24 | public static final int noThreads = 32; |
24 | 25 | ||
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadTestRunnable.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java index a18298a2..922178c6 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadTestRunnable.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.VersionedMapStore; | 11 | import tools.refinery.data.map.VersionedMapStore; |
12 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 12 | import tools.refinery.data.map.internal.VersionedMapImpl; |
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | 13 | import tools.refinery.data.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/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java index 2d589dc9..a16cb8f5 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java | |||
@@ -1,22 +1,23 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 | ||
5 | import java.util.Random; | 5 | import java.util.Random; |
6 | import java.util.stream.Stream; | 6 | import java.util.stream.Stream; |
7 | 7 | ||
8 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
14 | import org.junit.jupiter.api.Tag; | 8 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 9 | import org.junit.jupiter.api.Timeout; |
16 | import org.junit.jupiter.params.ParameterizedTest; | 10 | import org.junit.jupiter.params.ParameterizedTest; |
17 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
18 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | ||
15 | import tools.refinery.data.map.VersionedMapStore; | ||
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
20 | |||
20 | class MutableFuzzTest { | 21 | class MutableFuzzTest { |
21 | 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) { |
22 | String[] values = MapTestEnvironment.prepareValues(maxValue); | 23 | String[] values = MapTestEnvironment.prepareValues(maxValue); |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java index cc2abfe4..45308892 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java | |||
@@ -1,22 +1,23 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 | ||
5 | import java.util.Random; | 5 | import java.util.Random; |
6 | import java.util.stream.Stream; | 6 | import java.util.stream.Stream; |
7 | 7 | ||
8 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
9 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
10 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
11 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
12 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
13 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
14 | import org.junit.jupiter.api.Tag; | 8 | import org.junit.jupiter.api.Tag; |
15 | import org.junit.jupiter.api.Timeout; | 9 | import org.junit.jupiter.api.Timeout; |
16 | import org.junit.jupiter.params.ParameterizedTest; | 10 | import org.junit.jupiter.params.ParameterizedTest; |
17 | import org.junit.jupiter.params.provider.Arguments; | 11 | import org.junit.jupiter.params.provider.Arguments; |
18 | import org.junit.jupiter.params.provider.MethodSource; | 12 | import org.junit.jupiter.params.provider.MethodSource; |
19 | 13 | ||
14 | import tools.refinery.data.map.ContinousHashProvider; | ||
15 | import tools.refinery.data.map.VersionedMapStore; | ||
16 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
17 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
18 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
19 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
20 | |||
20 | class MutableImmutableCompareFuzzTest { | 21 | class MutableImmutableCompareFuzzTest { |
21 | 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, |
22 | boolean evilHash) { | 23 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java index 7d9f5372..1b8b38c4 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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 | ||
@@ -7,18 +7,19 @@ import java.util.Map; | |||
7 | import java.util.Random; | 7 | import java.util.Random; |
8 | import java.util.stream.Stream; | 8 | import java.util.stream.Stream; |
9 | 9 | ||
10 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
14 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
16 | import org.junit.jupiter.api.Tag; | 10 | import org.junit.jupiter.api.Tag; |
17 | import org.junit.jupiter.api.Timeout; | 11 | import org.junit.jupiter.api.Timeout; |
18 | import org.junit.jupiter.params.ParameterizedTest; | 12 | import org.junit.jupiter.params.ParameterizedTest; |
19 | import org.junit.jupiter.params.provider.Arguments; | 13 | import org.junit.jupiter.params.provider.Arguments; |
20 | import org.junit.jupiter.params.provider.MethodSource; | 14 | import org.junit.jupiter.params.provider.MethodSource; |
21 | 15 | ||
16 | import tools.refinery.data.map.ContinousHashProvider; | ||
17 | import tools.refinery.data.map.VersionedMapStore; | ||
18 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
19 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
22 | |||
22 | class RestoreFuzzTest { | 23 | class RestoreFuzzTest { |
23 | 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, |
24 | boolean evilHash) { | 25 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java index 800308b4..1703a732 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz; | 1 | package tools.refinery.data.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; |
@@ -7,18 +7,19 @@ import java.util.Map; | |||
7 | import java.util.Random; | 7 | import java.util.Random; |
8 | import java.util.stream.Stream; | 8 | import java.util.stream.Stream; |
9 | 9 | ||
10 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
11 | import org.eclipse.viatra.solver.data.map.VersionedMapStore; | ||
12 | import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; | ||
13 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | ||
14 | import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
15 | import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment; | ||
16 | import org.junit.jupiter.api.Tag; | 10 | import org.junit.jupiter.api.Tag; |
17 | import org.junit.jupiter.api.Timeout; | 11 | import org.junit.jupiter.api.Timeout; |
18 | import org.junit.jupiter.params.ParameterizedTest; | 12 | import org.junit.jupiter.params.ParameterizedTest; |
19 | import org.junit.jupiter.params.provider.Arguments; | 13 | import org.junit.jupiter.params.provider.Arguments; |
20 | import org.junit.jupiter.params.provider.MethodSource; | 14 | import org.junit.jupiter.params.provider.MethodSource; |
21 | 15 | ||
16 | import tools.refinery.data.map.ContinousHashProvider; | ||
17 | import tools.refinery.data.map.VersionedMapStore; | ||
18 | import tools.refinery.data.map.VersionedMapStoreImpl; | ||
19 | import tools.refinery.data.map.internal.VersionedMapImpl; | ||
20 | import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils; | ||
21 | import tools.refinery.data.map.tests.utils.MapTestEnvironment; | ||
22 | |||
22 | class SharedStoreFuzzTest { | 23 | class SharedStoreFuzzTest { |
23 | 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, |
24 | boolean evilHash) { | 25 | boolean evilHash) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java index ec21bb7b..23df4aef 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz.utils; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java index 3f4214bc..abf8be3c 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java +++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.fuzz.utils; | 1 | package tools.refinery.data.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/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java b/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java index 4c043350..e1cfc2e2 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java +++ b/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.map.tests.utils; | 1 | package tools.refinery.data.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; |
@@ -11,10 +11,10 @@ import java.util.Map; | |||
11 | import java.util.Map.Entry; | 11 | import java.util.Map.Entry; |
12 | import java.util.TreeMap; | 12 | import java.util.TreeMap; |
13 | 13 | ||
14 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | 14 | import tools.refinery.data.map.ContinousHashProvider; |
15 | import org.eclipse.viatra.solver.data.map.Cursor; | 15 | import tools.refinery.data.map.Cursor; |
16 | import org.eclipse.viatra.solver.data.map.VersionedMap; | 16 | import tools.refinery.data.map.VersionedMap; |
17 | import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; | 17 | import tools.refinery.data.map.internal.VersionedMapImpl; |
18 | 18 | ||
19 | public class MapTestEnvironment<K, V> { | 19 | public class MapTestEnvironment<K, V> { |
20 | public static String[] prepareValues(int maxValue) { | 20 | public static String[] prepareValues(int maxValue) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/model/hashTests/HashEfficiencyTest.java b/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java index c4d98a43..f3479846 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/model/hashTests/HashEfficiencyTest.java +++ b/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.hashTests; | 1 | package tools.refinery.data.model.hashTests; |
2 | 2 | ||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | 3 | import static org.junit.jupiter.api.Assertions.assertEquals; |
4 | 4 | ||
@@ -7,12 +7,13 @@ import java.util.LinkedList; | |||
7 | import java.util.List; | 7 | import java.util.List; |
8 | import java.util.Random; | 8 | import java.util.Random; |
9 | 9 | ||
10 | import org.eclipse.viatra.solver.data.map.ContinousHashProvider; | ||
11 | import org.eclipse.viatra.solver.data.model.Tuple; | ||
12 | import org.eclipse.viatra.solver.data.model.TupleHashProvider; | ||
13 | import org.eclipse.viatra.solver.data.model.TupleHashProviderBitMagic; | ||
14 | import org.junit.jupiter.api.Test; | 10 | import org.junit.jupiter.api.Test; |
15 | 11 | ||
12 | import tools.refinery.data.map.ContinousHashProvider; | ||
13 | import tools.refinery.data.model.Tuple; | ||
14 | import tools.refinery.data.model.TupleHashProvider; | ||
15 | import tools.refinery.data.model.TupleHashProviderBitMagic; | ||
16 | |||
16 | class HashEfficiencyTest { | 17 | class HashEfficiencyTest { |
17 | 18 | ||
18 | private static List<Tuple> permutations(int range, int arity) { | 19 | private static List<Tuple> permutations(int range, int arity) { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/model/tests/ModelTest.java b/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java index c9bf3da9..2b7589bc 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/model/tests/ModelTest.java +++ b/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.model.tests; | 1 | package tools.refinery.data.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; |
@@ -6,14 +6,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue; | |||
6 | 6 | ||
7 | import java.util.Set; | 7 | import java.util.Set; |
8 | 8 | ||
9 | import org.eclipse.viatra.solver.data.model.Model; | ||
10 | import org.eclipse.viatra.solver.data.model.ModelStore; | ||
11 | import org.eclipse.viatra.solver.data.model.ModelStoreImpl; | ||
12 | import org.eclipse.viatra.solver.data.model.Tuple; | ||
13 | import org.eclipse.viatra.solver.data.model.representation.Relation; | ||
14 | import org.junit.jupiter.api.Assertions; | 9 | import org.junit.jupiter.api.Assertions; |
15 | import org.junit.jupiter.api.Test; | 10 | import org.junit.jupiter.api.Test; |
16 | 11 | ||
12 | import tools.refinery.data.model.Model; | ||
13 | import tools.refinery.data.model.ModelStore; | ||
14 | import tools.refinery.data.model.ModelStoreImpl; | ||
15 | import tools.refinery.data.model.Tuple; | ||
16 | import tools.refinery.data.model.representation.Relation; | ||
17 | |||
17 | class ModelTest { | 18 | class ModelTest { |
18 | 19 | ||
19 | @Test | 20 | @Test |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java b/store/src/test/java/tools/refinery/data/query/test/QueryTest.java index 1500f77c..faf3f111 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java +++ b/store/src/test/java/tools/refinery/data/query/test/QueryTest.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.data.query.test; | 1 | package tools.refinery.data.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; |
@@ -12,20 +12,21 @@ import org.eclipse.viatra.query.runtime.api.GenericPatternMatch; | |||
12 | import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher; | 12 | import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher; |
13 | import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification; | 13 | 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.eclipse.viatra.solver.data.model.Model; | ||
16 | import org.eclipse.viatra.solver.data.model.ModelStore; | ||
17 | import org.eclipse.viatra.solver.data.model.ModelStoreImpl; | ||
18 | import org.eclipse.viatra.solver.data.model.Tuple; | ||
19 | import org.eclipse.viatra.solver.data.model.representation.Relation; | ||
20 | import org.eclipse.viatra.solver.data.model.representation.TruthValue; | ||
21 | import org.eclipse.viatra.solver.data.query.RelationalScope; | ||
22 | import org.eclipse.viatra.solver.data.query.internal.PredicateTranslator; | ||
23 | import org.eclipse.viatra.solver.data.query.view.FilteredRelationView; | ||
24 | import org.eclipse.viatra.solver.data.query.view.FunctionalRelationView; | ||
25 | import org.eclipse.viatra.solver.data.query.view.RelationView; | ||
26 | import org.eclipse.viatra.solver.data.query.view.KeyOnlyRelationView; | ||
27 | import org.junit.jupiter.api.Test; | 15 | import org.junit.jupiter.api.Test; |
28 | 16 | ||
17 | import tools.refinery.data.model.Model; | ||
18 | import tools.refinery.data.model.ModelStore; | ||
19 | import tools.refinery.data.model.ModelStoreImpl; | ||
20 | import tools.refinery.data.model.Tuple; | ||
21 | import tools.refinery.data.model.representation.Relation; | ||
22 | import tools.refinery.data.model.representation.TruthValue; | ||
23 | import tools.refinery.data.query.RelationalScope; | ||
24 | import tools.refinery.data.query.internal.PredicateTranslator; | ||
25 | import tools.refinery.data.query.view.FilteredRelationView; | ||
26 | import tools.refinery.data.query.view.FunctionalRelationView; | ||
27 | import tools.refinery.data.query.view.KeyOnlyRelationView; | ||
28 | import tools.refinery.data.query.view.RelationView; | ||
29 | |||
29 | class QueryTest { | 30 | class QueryTest { |
30 | @Test | 31 | @Test |
31 | void minimalTest() { | 32 | void minimalTest() { |
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/util/CollectionsUtilTests.java b/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java index 16368912..39ff4aca 100644 --- a/store/src/test/java/org/eclipse/viatra/solver/data/util/CollectionsUtilTests.java +++ b/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java | |||
@@ -1,4 +1,8 @@ | |||
1 | package org.eclipse.viatra.solver.data.util; | 1 | package tools.refinery.data.util; |
2 | |||
3 | import static org.junit.jupiter.api.Assertions.assertEquals; | ||
4 | import static tools.refinery.data.util.CollectionsUtil.filter; | ||
5 | import static tools.refinery.data.util.CollectionsUtil.map; | ||
2 | 6 | ||
3 | import java.util.ArrayList; | 7 | import java.util.ArrayList; |
4 | import java.util.Iterator; | 8 | import java.util.Iterator; |
@@ -8,9 +12,6 @@ import java.util.NoSuchElementException; | |||
8 | import org.junit.jupiter.api.Assertions; | 12 | import org.junit.jupiter.api.Assertions; |
9 | import org.junit.jupiter.api.Test; | 13 | import org.junit.jupiter.api.Test; |
10 | 14 | ||
11 | import static org.eclipse.viatra.solver.data.util.CollectionsUtil.*; | ||
12 | import static org.junit.jupiter.api.Assertions.assertEquals; | ||
13 | |||
14 | class CollectionsUtilTests { | 15 | class CollectionsUtilTests { |
15 | List<Integer> list10 = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); | 16 | List<Integer> list10 = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); |
16 | List<String> listTen = List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10"); | 17 | List<String> listTen = List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10"); |