aboutsummaryrefslogtreecommitdiffstats
path: root/store/src/main/java
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-10-05 00:36:47 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-10-05 00:36:47 +0200
commitc3e27396c62f191b4343df151e5a86bfa63a32f3 (patch)
tree4f698c9ba0320a5c740c53877c3f75c00240dca4 /store/src/main/java
parentfix(web): improve accessibility (diff)
downloadrefinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.tar.gz
refinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.tar.zst
refinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.zip
chore: change package name
Diffstat (limited to 'store/src/main/java')
-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
53 files changed, 151 insertions, 143 deletions
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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import org.eclipse.viatra.solver.data.map.internal.Node; 3import 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import java.util.List; 3import 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import java.util.Iterator; 3import java.util.Iterator;
4import java.util.NoSuchElementException; 4import 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3public interface DiffCursor<K, V> extends Cursor<K,V> { 3public 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import java.util.Iterator; 3import java.util.Iterator;
4import java.util.function.BiFunction; 4import 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3public interface Versioned { 3public 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3public interface VersionedMap<K,V> extends Versioned{ 3public 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import java.util.Set; 3import 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3public class VersionedMapStoreConfiguration { 3public 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 @@
1package org.eclipse.viatra.solver.data.map; 1package tools.refinery.data.map;
2 2
3import java.util.ArrayList; 3import java.util.ArrayList;
4import java.util.Arrays; 4import java.util.Arrays;
@@ -9,10 +9,10 @@ import java.util.List;
9import java.util.Map; 9import java.util.Map;
10import java.util.Set; 10import java.util.Set;
11 11
12import org.eclipse.viatra.solver.data.map.internal.ImmutableNode; 12import tools.refinery.data.map.internal.ImmutableNode;
13import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor; 13import tools.refinery.data.map.internal.MapDiffCursor;
14import org.eclipse.viatra.solver.data.map.internal.Node; 14import tools.refinery.data.map.internal.Node;
15import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl; 15import tools.refinery.data.map.internal.VersionedMapImpl;
16 16
17public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> { 17public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3enum HashClash { 3enum 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.Arrays; 3import java.util.Arrays;
4import java.util.Map; 4import java.util.Map;
5 5
6import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 6import tools.refinery.data.map.ContinousHashProvider;
7 7
8public class ImmutableNode<K, V> extends Node<K, V> { 8public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.ArrayDeque; 3import java.util.ArrayDeque;
4import java.util.ConcurrentModificationException; 4import java.util.ConcurrentModificationException;
5import java.util.Iterator; 5import java.util.Iterator;
6import java.util.List; 6import java.util.List;
7 7
8import org.eclipse.viatra.solver.data.map.Cursor; 8import tools.refinery.data.map.Cursor;
9import org.eclipse.viatra.solver.data.map.VersionedMap; 9import tools.refinery.data.map.VersionedMap;
10 10
11public class MapCursor<K,V> implements Cursor<K,V> { 11public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.List; 3import java.util.List;
4import java.util.stream.Stream; 4import java.util.stream.Stream;
5 5
6import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 6import tools.refinery.data.map.ContinousHashProvider;
7import org.eclipse.viatra.solver.data.map.Cursor; 7import tools.refinery.data.map.Cursor;
8import org.eclipse.viatra.solver.data.map.DiffCursor; 8import tools.refinery.data.map.DiffCursor;
9import org.eclipse.viatra.solver.data.map.VersionedMap; 9import 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.Arrays; 3import java.util.Arrays;
4import java.util.Map; 4import java.util.Map;
5 5
6import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 6import tools.refinery.data.map.ContinousHashProvider;
7 7
8public class MutableNode<K, V> extends Node<K, V> { 8public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.Map; 3import java.util.Map;
4 4
5import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 5import tools.refinery.data.map.ContinousHashProvider;
6 6
7public abstract class Node<K,V>{ 7public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3public class OldValueBox<V>{ 3public 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 @@
1package org.eclipse.viatra.solver.data.map.internal; 1package tools.refinery.data.map.internal;
2 2
3import java.util.Iterator; 3import java.util.Iterator;
4import java.util.LinkedList; 4import java.util.LinkedList;
5import java.util.List; 5import java.util.List;
6 6
7import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 7import tools.refinery.data.map.ContinousHashProvider;
8import org.eclipse.viatra.solver.data.map.Cursor; 8import tools.refinery.data.map.Cursor;
9import org.eclipse.viatra.solver.data.map.DiffCursor; 9import tools.refinery.data.map.DiffCursor;
10import org.eclipse.viatra.solver.data.map.VersionedMap; 10import tools.refinery.data.map.VersionedMap;
11import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; 11import 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.Set; 3import java.util.Set;
4 4
5import org.eclipse.viatra.solver.data.map.Cursor; 5import tools.refinery.data.map.Cursor;
6import org.eclipse.viatra.solver.data.map.Versioned; 6import tools.refinery.data.map.Versioned;
7import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 7import tools.refinery.data.model.representation.DataRepresentation;
8 8
9public interface Model extends Versioned{ 9public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.Map; 3import java.util.Map;
4 4
5import org.eclipse.viatra.solver.data.map.Cursor; 5import tools.refinery.data.map.Cursor;
6import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 6import tools.refinery.data.model.representation.DataRepresentation;
7 7
8public class ModelCursor { 8public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.Map; 3import java.util.Map;
4 4
5import org.eclipse.viatra.solver.data.map.Cursor; 5import tools.refinery.data.map.Cursor;
6import org.eclipse.viatra.solver.data.map.DiffCursor; 6import tools.refinery.data.map.DiffCursor;
7import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 7import tools.refinery.data.model.representation.DataRepresentation;
8 8
9public class ModelDiffCursor { 9public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.Set; 3import java.util.Set;
4 4
5import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 5import tools.refinery.data.model.representation.DataRepresentation;
6 6
7public interface ModelStore { 7public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.HashMap; 3import java.util.HashMap;
4import java.util.LinkedList; 4import java.util.LinkedList;
@@ -7,16 +7,16 @@ import java.util.Map;
7import java.util.Map.Entry; 7import java.util.Map.Entry;
8import java.util.Set; 8import java.util.Set;
9 9
10import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 10import tools.refinery.data.map.ContinousHashProvider;
11import org.eclipse.viatra.solver.data.map.DiffCursor; 11import tools.refinery.data.map.DiffCursor;
12import org.eclipse.viatra.solver.data.map.VersionedMap; 12import tools.refinery.data.map.VersionedMap;
13import org.eclipse.viatra.solver.data.map.VersionedMapStore; 13import tools.refinery.data.map.VersionedMapStore;
14import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl; 14import tools.refinery.data.map.VersionedMapStoreImpl;
15import org.eclipse.viatra.solver.data.model.internal.ModelImpl; 15import tools.refinery.data.model.internal.ModelImpl;
16import org.eclipse.viatra.solver.data.model.internal.SimilarRelationEquivalenceClass; 16import tools.refinery.data.model.internal.SimilarRelationEquivalenceClass;
17import org.eclipse.viatra.solver.data.model.representation.AuxilaryData; 17import tools.refinery.data.model.representation.AuxilaryData;
18import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 18import tools.refinery.data.model.representation.DataRepresentation;
19import org.eclipse.viatra.solver.data.model.representation.Relation; 19import tools.refinery.data.model.representation.Relation;
20 20
21public class ModelStoreImpl implements ModelStore { 21public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import java.util.ArrayList; 3import java.util.ArrayList;
4import java.util.Arrays; 4import 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 3import tools.refinery.data.map.ContinousHashProvider;
4 4
5public class TupleHashProvider implements ContinousHashProvider<Tuple> { 5public 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 @@
1package org.eclipse.viatra.solver.data.model; 1package tools.refinery.data.model;
2 2
3import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 3import tools.refinery.data.map.ContinousHashProvider;
4 4
5public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> { 5public 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 @@
1package org.eclipse.viatra.solver.data.model.internal; 1package tools.refinery.data.model.internal;
2 2
3import java.util.HashMap; 3import java.util.HashMap;
4import java.util.Map; 4import java.util.Map;
5import java.util.Set; 5import java.util.Set;
6 6
7import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 7import tools.refinery.data.map.ContinousHashProvider;
8import org.eclipse.viatra.solver.data.map.Cursor; 8import tools.refinery.data.map.Cursor;
9import org.eclipse.viatra.solver.data.map.DiffCursor; 9import tools.refinery.data.map.DiffCursor;
10import org.eclipse.viatra.solver.data.map.VersionedMap; 10import tools.refinery.data.map.VersionedMap;
11import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor; 11import tools.refinery.data.map.internal.MapDiffCursor;
12import org.eclipse.viatra.solver.data.model.Model; 12import tools.refinery.data.model.Model;
13import org.eclipse.viatra.solver.data.model.ModelDiffCursor; 13import tools.refinery.data.model.ModelDiffCursor;
14import org.eclipse.viatra.solver.data.model.ModelStore; 14import tools.refinery.data.model.ModelStore;
15import org.eclipse.viatra.solver.data.model.representation.DataRepresentation; 15import tools.refinery.data.model.representation.DataRepresentation;
16 16
17public class ModelImpl implements Model { 17public 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 @@
1package org.eclipse.viatra.solver.data.model.internal; 1package tools.refinery.data.model.internal;
2 2
3import java.util.Objects; 3import java.util.Objects;
4 4
5import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 5import tools.refinery.data.map.ContinousHashProvider;
6import org.eclipse.viatra.solver.data.model.Tuple; 6import tools.refinery.data.model.Tuple;
7import org.eclipse.viatra.solver.data.model.representation.Relation; 7import tools.refinery.data.model.representation.Relation;
8 8
9public class SimilarRelationEquivalenceClass { 9public 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 @@
1package org.eclipse.viatra.solver.data.model.representation; 1package tools.refinery.data.model.representation;
2 2
3import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 3import tools.refinery.data.map.ContinousHashProvider;
4 4
5public class AuxilaryData<K,V> extends DataRepresentation<K, V> { 5public 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 @@
1package org.eclipse.viatra.solver.data.model.representation; 1package tools.refinery.data.model.representation;
2 2
3import org.eclipse.viatra.solver.data.map.ContinousHashProvider; 3import tools.refinery.data.map.ContinousHashProvider;
4 4
5public abstract class DataRepresentation<K, V> { 5public 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 @@
1package org.eclipse.viatra.solver.data.model.representation; 1package tools.refinery.data.model.representation;
2 2
3import org.eclipse.viatra.solver.data.model.Tuple; 3import tools.refinery.data.model.Tuple;
4import org.eclipse.viatra.solver.data.model.TupleHashProvider; 4import tools.refinery.data.model.TupleHashProvider;
5 5
6public class Relation<D> extends DataRepresentation<Tuple, D> { 6public 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 @@
1package org.eclipse.viatra.solver.data.model.representation; 1package tools.refinery.data.model.representation;
2 2
3public enum TruthValue { 3public 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 @@
1package org.eclipse.viatra.solver.data.query; 1package tools.refinery.data.query;
2 2
3import java.util.Set; 3import java.util.Set;
4 4
@@ -7,11 +7,12 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
7import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; 7import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
8import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener; 8import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener;
9import org.eclipse.viatra.query.runtime.api.scope.QueryScope; 9import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
10import org.eclipse.viatra.solver.data.model.Model; 10
11import org.eclipse.viatra.solver.data.model.Tuple; 11import tools.refinery.data.model.Model;
12import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener; 12import tools.refinery.data.model.Tuple;
13import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext; 13import tools.refinery.data.query.internal.RelationUpdateListener;
14import org.eclipse.viatra.solver.data.query.view.RelationView; 14import tools.refinery.data.query.internal.RelationalEngineContext;
15import tools.refinery.data.query.view.RelationView;
15 16
16public class RelationalScope extends QueryScope{ 17public 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.HashMap; 3import java.util.HashMap;
4import java.util.HashSet; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.Collection; 3import java.util.Collection;
4import java.util.Iterator; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.HashMap; 3import java.util.HashMap;
4import java.util.HashSet; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.Map; 3import java.util.Map;
4import java.util.Set; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.List; 3import java.util.List;
4import java.util.Map; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.ArrayList; 3import java.util.ArrayList;
4import java.util.Collections; 4import java.util.Collections;
5import java.util.HashSet; 5import java.util.HashSet;
6import java.util.List; 6import java.util.List;
7 7
8import org.eclipse.viatra.solver.data.query.view.RelationView; 8import tools.refinery.data.query.view.RelationView;
9 9
10public class PredicateBuilder_string { 10public 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3import java.util.List; 3import java.util.List;
4import java.util.Map; 4import java.util.Map;
5import java.util.Set; 5import java.util.Set;
6 6
7import org.eclipse.viatra.solver.data.query.view.FilteredRelationView; 7import tools.refinery.data.query.view.FilteredRelationView;
8import org.eclipse.viatra.solver.data.query.view.RelationView; 8import tools.refinery.data.query.view.RelationView;
9 9
10public class RelationAtom implements DNFAtom { 10public 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 @@
1package org.eclipse.viatra.solver.data.query.building; 1package tools.refinery.data.query.building;
2 2
3public class Variable { 3public 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import java.lang.reflect.InvocationTargetException; 3import java.lang.reflect.InvocationTargetException;
4import java.util.concurrent.Callable; 4import 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import java.util.ArrayList; 3import java.util.ArrayList;
4import java.util.HashMap; 4import java.util.HashMap;
@@ -28,8 +28,9 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
28import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery; 28import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
29import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility; 29import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
30import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; 30import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
31import org.eclipse.viatra.solver.data.query.RelationalScope; 31
32import org.eclipse.viatra.solver.data.query.view.RelationView; 32import tools.refinery.data.query.RelationalScope;
33import tools.refinery.data.query.view.RelationView;
33 34
34public class PredicateTranslator extends BasePQuery { 35public 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import java.util.HashMap; 3import java.util.HashMap;
4import java.util.HashSet; 4import java.util.HashSet;
@@ -7,8 +7,9 @@ import java.util.Set;
7 7
8import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; 8import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
9import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; 9import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
10import org.eclipse.viatra.solver.data.model.Tuple; 10
11import org.eclipse.viatra.solver.data.query.view.RelationView; 11import tools.refinery.data.model.Tuple;
12import tools.refinery.data.query.view.RelationView;
12 13
13public class RelationUpdateListener { 14public 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import java.util.Arrays; 3import java.util.Arrays;
4import java.util.Objects; 4import java.util.Objects;
@@ -6,8 +6,9 @@ import java.util.Objects;
6import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; 6import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
7import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; 7import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
8import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; 8import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
9import org.eclipse.viatra.solver.data.model.Tuple; 9
10import org.eclipse.viatra.solver.data.query.view.RelationView; 10import tools.refinery.data.model.Tuple;
11import tools.refinery.data.query.view.RelationView;
11 12
12public class RelationUpdateListenerEntry<D> { 13public 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex; 3import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex;
4import org.eclipse.viatra.query.runtime.api.scope.IEngineContext; 4import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
5import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext; 5import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext;
6import org.eclipse.viatra.solver.data.model.Model; 6
7import tools.refinery.data.model.Model;
7 8
8public class RelationalEngineContext implements IEngineContext{ 9public 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import java.util.Collection; 3import java.util.Collection;
4import java.util.Collections; 4import java.util.Collections;
@@ -10,7 +10,8 @@ import java.util.Set;
10import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext; 10import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext;
11import org.eclipse.viatra.query.runtime.matchers.context.IInputKey; 11import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
12import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication; 12import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication;
13import org.eclipse.viatra.solver.data.query.view.RelationView; 13
14import 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 @@
1package org.eclipse.viatra.solver.data.query.internal; 1package tools.refinery.data.query.internal;
2 2
3import static org.eclipse.viatra.solver.data.util.CollectionsUtil.filter; 3import static tools.refinery.data.util.CollectionsUtil.filter;
4import static org.eclipse.viatra.solver.data.util.CollectionsUtil.map; 4import static tools.refinery.data.util.CollectionsUtil.map;
5 5
6import java.lang.reflect.InvocationTargetException; 6import java.lang.reflect.InvocationTargetException;
7import java.util.Iterator; 7import java.util.Iterator;
@@ -19,8 +19,9 @@ import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
19import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask; 19import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
20import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples; 20import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
21import org.eclipse.viatra.query.runtime.matchers.util.Accuracy; 21import org.eclipse.viatra.query.runtime.matchers.util.Accuracy;
22import org.eclipse.viatra.solver.data.model.Model; 22
23import org.eclipse.viatra.solver.data.query.view.RelationView; 23import tools.refinery.data.model.Model;
24import tools.refinery.data.query.view.RelationView;
24 25
25public class RelationalRuntimeContext implements IQueryRuntimeContext { 26public 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 @@
1package org.eclipse.viatra.solver.data.query.view; 1package tools.refinery.data.query.view;
2 2
3import java.util.function.BiPredicate; 3import java.util.function.BiPredicate;
4 4
5import org.eclipse.viatra.solver.data.model.Model; 5import tools.refinery.data.model.Model;
6import org.eclipse.viatra.solver.data.model.Tuple; 6import tools.refinery.data.model.Tuple;
7import org.eclipse.viatra.solver.data.model.Tuple.Tuple1; 7import tools.refinery.data.model.Tuple.Tuple1;
8import org.eclipse.viatra.solver.data.model.representation.Relation; 8import tools.refinery.data.model.representation.Relation;
9 9
10public class FilteredRelationView<D> extends RelationView<D>{ 10public 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 @@
1package org.eclipse.viatra.solver.data.query.view; 1package tools.refinery.data.query.view;
2 2
3import org.eclipse.viatra.solver.data.model.Model; 3import tools.refinery.data.model.Model;
4import org.eclipse.viatra.solver.data.model.Tuple; 4import tools.refinery.data.model.Tuple;
5import org.eclipse.viatra.solver.data.model.Tuple.Tuple1; 5import tools.refinery.data.model.Tuple.Tuple1;
6import org.eclipse.viatra.solver.data.model.representation.Relation; 6import tools.refinery.data.model.representation.Relation;
7 7
8public class FunctionalRelationView<D> extends RelationView<D> { 8public 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 @@
1package org.eclipse.viatra.solver.data.query.view; 1package tools.refinery.data.query.view;
2 2
3import org.eclipse.viatra.solver.data.model.Tuple; 3import tools.refinery.data.model.Tuple;
4import org.eclipse.viatra.solver.data.model.representation.Relation; 4import tools.refinery.data.model.representation.Relation;
5 5
6public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{ 6public 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 @@
1package org.eclipse.viatra.solver.data.query.view; 1package tools.refinery.data.query.view;
2 2
3import java.util.Objects; 3import java.util.Objects;
4 4
5import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper; 5import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
6import org.eclipse.viatra.solver.data.map.CursorAsIterator; 6
7import org.eclipse.viatra.solver.data.model.Model; 7import tools.refinery.data.map.CursorAsIterator;
8import org.eclipse.viatra.solver.data.model.Tuple; 8import tools.refinery.data.model.Model;
9import org.eclipse.viatra.solver.data.model.representation.Relation; 9import tools.refinery.data.model.Tuple;
10import 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 @@
1package org.eclipse.viatra.solver.data.util; 1package tools.refinery.data.util;
2 2
3import java.util.Iterator; 3import java.util.Iterator;
4import java.util.NoSuchElementException; 4import java.util.NoSuchElementException;