refactor: remove viatra dependency from store

5 files changed, 109 insertions, 88 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/AbstractFilteredRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/AbstractFilteredRelationView.java
new file mode 100644
index 00000000..a21a38ba
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/AbstractFilteredRelationView.java
@@ -0,0 +1,44 @@
+package tools.refinery.store.query.view;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.Tuple.Tuple1;
+import tools.refinery.store.model.representation.Relation;
+
+public abstract class AbstractFilteredRelationView<D> extends RelationView<D> {
+        protected AbstractFilteredRelationView(Relation<D> representation, String name) {
+                super(representation, name);
+        }
+
+        protected AbstractFilteredRelationView(Relation<D> representation) {
+                super(representation);
+        }
+
+        @Override
+        public Object[] forwardMap(Tuple key, D value) {
+                return toTuple1Array(key);
+        }
+
+        @Override
+        public boolean get(Model model, Object[] tuple) {
+                int[] content = new int[tuple.length];
+                for (int i = 0; i < tuple.length; i++) {
+                        content[i] = ((Tuple1) tuple[i]).get(0);
+                }
+                Tuple key = Tuple.of(content);
+                D value = model.get(getRepresentation(), key);
+                return filter(key, value);
+        }
+
+        public int getArity() {
+                return this.getRepresentation().getArity();
+        }
+
+        private static Object[] toTuple1Array(Tuple t) {
+                Object[] result = new Object[t.getSize()];
+                for (int i = 0; i < t.getSize(); i++) {
+                        result[i] = Tuple.of(t.get(i));
+                }
+                return result;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
index 3531195a..bb5d0237 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
@@ -1,48 +1,34 @@
 package tools.refinery.store.query.view;
 
-import java.util.function.BiPredicate;
-
-import tools.refinery.store.model.Model;
 import tools.refinery.store.model.Tuple;
-import tools.refinery.store.model.Tuple.Tuple1;
 import tools.refinery.store.model.representation.Relation;
 
-public class FilteredRelationView<D> extends RelationView<D>{
-        private final BiPredicate<Tuple,D> predicate;
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
 
-        public FilteredRelationView(Relation<D> representation, BiPredicate<Tuple,D> predicate) {
-                super(representation);
+public class FilteredRelationView<D> extends AbstractFilteredRelationView<D> {
+        private final BiPredicate<Tuple, D> predicate;
+
+        public FilteredRelationView(Relation<D> representation, String name, BiPredicate<Tuple, D> predicate) {
+                super(representation, name);
                 this.predicate = predicate;
         }
-        @Override
-        protected Object[] forwardMap(Tuple key, D value) {
-                return toTuple1Array(key);
-        }
-        @Override
-        public boolean get(Model model, Object[] tuple) {
-                int[] content = new int[tuple.length];
-                for(int i = 0; i<tuple.length; i++) {
-                        content[i] =((Tuple1)tuple[i]).get(0);
-                }
-                Tuple key = Tuple.of(content);
-                D value = model.get(representation, key);
-                return filter(key, value);
+
+        public FilteredRelationView(Relation<D> representation, BiPredicate<Tuple, D> predicate) {
+                super(representation);
+                this.predicate = predicate;
         }
-        
-        public static Object[] toTuple1Array(Tuple t) {
-                Object[] result = new Object[t.getSize()];
-                for(int i = 0; i<t.getSize(); i++) {
-                        result[i] = Tuple.of(t.get(i));
-                }
-                return result;
+
+        public FilteredRelationView(Relation<D> representation, String name, Predicate<D> predicate) {
+                this(representation, name, (k, v) -> predicate.test(v));
         }
-        
-        @Override
-        public int getArity() {
-                return this.representation.getArity();
+
+        public FilteredRelationView(Relation<D> representation, Predicate<D> predicate) {
+                this(representation, (k, v) -> predicate.test(v));
         }
+
         @Override
-        protected boolean filter(Tuple key, D value) {
+        public boolean filter(Tuple key, D value) {
                 return this.predicate.test(key, value);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
index db9ba4b8..54baa050 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
@@ -6,45 +6,48 @@ import tools.refinery.store.model.Tuple.Tuple1;
 import tools.refinery.store.model.representation.Relation;
 
 public class FunctionalRelationView<D> extends RelationView<D> {
+        public FunctionalRelationView(Relation<D> representation, String name) {
+                super(representation, name);
+        }
 
         public FunctionalRelationView(Relation<D> representation) {
                 super(representation);
         }
 
         @Override
-        protected boolean filter(Tuple key, D value) {
+        public boolean filter(Tuple key, D value) {
                 return true;
         }
 
         @Override
-        protected Object[] forwardMap(Tuple key, D value) {
+        public Object[] forwardMap(Tuple key, D value) {
                 return toTuple1ArrayPlusValue(key, value);
         }
 
         @Override
         public boolean get(Model model, Object[] tuple) {
-                int[] content = new int[tuple.length-1];
-                for(int i = 0; i<tuple.length-1; i++) {
-                        content[i] =((Tuple1)tuple[i]).get(0);
+                int[] content = new int[tuple.length - 1];
+                for (int i = 0; i < tuple.length - 1; i++) {
+                        content[i] = ((Tuple1) tuple[i]).get(0);
                 }
                 Tuple key = Tuple.of(content);
                 @SuppressWarnings("unchecked")
-                D valueInTuple = (D) tuple[tuple.length-1];
-                D valueInMap = model.get(representation, key);
+                D valueInTuple = (D) tuple[tuple.length - 1];
+                D valueInMap = model.get(getRepresentation(), key);
                 return valueInTuple.equals(valueInMap);
         }
-        
-        public static <D> Object[] toTuple1ArrayPlusValue(Tuple t, D value) {
-                Object[] result = new Object[t.getSize()+1];
-                for(int i = 0; i<t.getSize(); i++) {
+
+        @Override
+        public int getArity() {
+                return getRepresentation().getArity() + 1;
+        }
+
+        private static <D> Object[] toTuple1ArrayPlusValue(Tuple t, D value) {
+                Object[] result = new Object[t.getSize() + 1];
+                for (int i = 0; i < t.getSize(); i++) {
                         result[i] = Tuple.of(t.get(i));
                 }
                 result[t.getSize()] = value;
                 return result;
         }
-        
-        @Override
-        public int getArity() {
-                return this.representation.getArity()+1;
-        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
index 6fa387a1..b9a9ed9f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
@@ -3,14 +3,18 @@ package tools.refinery.store.query.view;
 import tools.refinery.store.model.Tuple;
 import tools.refinery.store.model.representation.Relation;
 
-public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{
+public class KeyOnlyRelationView extends AbstractFilteredRelationView<Boolean> {
+        public static final String VIEW_NAME = "key";
+
+        private final Boolean defaultValue;
 
         public KeyOnlyRelationView(Relation<Boolean> representation) {
-                super(representation, (k,v)->true);
+                super(representation, VIEW_NAME);
+                defaultValue = representation.getDefaultValue();
         }
+
         @Override
-        protected boolean filter(Tuple key, Boolean value) {
-                return !value.equals(representation.getDefaultValue());
+        public boolean filter(Tuple key, Boolean value) {
+                return !value.equals(defaultValue);
         }
-        
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
index fd55eed4..b8a54046 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
@@ -1,66 +1,51 @@
 package tools.refinery.store.query.view;
 
-import java.util.Objects;
-
-import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
-
 import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.Tuple;
 import tools.refinery.store.model.representation.Relation;
 
+import java.util.Objects;
+import java.util.UUID;
+
 /**
  * Represents a view of a {@link Relation} that can be queried.
- * 
- * @author Oszkar Semerath
  *
  * @param <D>
+ * @author Oszkar Semerath
  */
-public abstract class RelationView<D> extends BaseInputKeyWrapper<RelationView<D>> {
-        protected final Relation<D> representation;
+public abstract class RelationView<D> {
+        private final Relation<D> representation;
 
-        protected RelationView(Relation<D> representation) {
-                super(null);
-                this.wrappedKey = this;
+        private final String name;
+
+        protected RelationView(Relation<D> representation, String name) {
                 this.representation = representation;
+                this.name = name;
         }
 
-        @Override
-        public String getPrettyPrintableName() {
-                return representation.getName();
+        protected RelationView(Relation<D> representation) {
+                this(representation, UUID.randomUUID().toString());
         }
 
-        @Override
-        public String getStringID() {
-                return representation.getName() + this.getClass().getName();
-        }
+        public abstract int getArity();
 
         public Relation<D> getRepresentation() {
                 return representation;
         }
 
-        @Override
-        public boolean isEnumerable() {
-                return true;
+        public String getName() {
+                return representation.getName() + "#" + name;
         }
 
-        protected abstract boolean filter(Tuple key, D value);
+        public abstract boolean filter(Tuple key, D value);
 
-        protected abstract Object[] forwardMap(Tuple key, D value);
+        public abstract Object[] forwardMap(Tuple key, D value);
 
         public abstract boolean get(Model model, Object[] tuple);
-        
-        @SuppressWarnings("squid:S1168")
-        public Object[] transform(Tuple tuple, D value) {
-                if (filter(tuple, value)) {
-                        return forwardMap(tuple, value);
-                } else
-                        return null;
-        }
 
         public Iterable<Object[]> getAll(Model model) {
-                return (() -> new CursorAsIterator<>(model.getAll(representation), (k, v) -> forwardMap(k, v),
-                                (k, v) -> filter(k, v)));
+                return (() -> new CursorAsIterator<>(model.getAll(representation), this::forwardMap, this::filter));
         }
 
         @Override
@@ -81,5 +66,4 @@ public abstract class RelationView<D> extends BaseInputKeyWrapper<RelationView<D
                 RelationView<D> other = ((RelationView<D>) obj);
                 return Objects.equals(representation, other.representation);
         }
-
 }