3 files changed, 61 insertions, 27 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
index 4602af21..bfa3d13a 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
@@ -11,7 +11,7 @@ public class FilteredRelationView<D> extends RelationView<D>{
         private final BiPredicate<Tuple,D> predicate;
 
         public FilteredRelationView(Model model, Relation<D> representation, BiPredicate<Tuple,D> predicate) {
-                super(model, representation);
+                super(representation);
                 this.predicate = predicate;
         }
         @Override
@@ -19,13 +19,13 @@ public class FilteredRelationView<D> extends RelationView<D>{
                 return toTuple1Array(key);
         }
         @Override
-        public boolean get(Object[] tuple) {
+        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 = this.model.get(representation, key);
+                D value = model.get(representation, key);
                 return filter(key, value);
         }
         
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
index b8d0ef72..71759bc5 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
@@ -8,7 +8,7 @@ import org.eclipse.viatra.solver.data.model.representation.Relation;
 public class FunctionalRelationView<D> extends RelationView<D> {
 
         public FunctionalRelationView(Model model, Relation<D> representation) {
-                super(model, representation);
+                super(representation);
         }
 
         @Override
@@ -22,7 +22,7 @@ public class FunctionalRelationView<D> extends RelationView<D> {
         }
 
         @Override
-        public boolean get(Object[] tuple) {
+        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);
@@ -30,7 +30,7 @@ public class FunctionalRelationView<D> extends RelationView<D> {
                 Tuple key = Tuple.of(content);
                 @SuppressWarnings("unchecked")
                 D valueInTuple = (D) tuple[tuple.length-1];
-                D valueInMap = this.model.get(representation, key);
+                D valueInMap = model.get(representation, key);
                 return valueInTuple.equals(valueInMap);
         }
         
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java
index 18d2692d..c5bc5228 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java
@@ -1,51 +1,85 @@
 package org.eclipse.viatra.solver.data.query.view;
 
+import java.util.Objects;
+
+import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
 import org.eclipse.viatra.solver.data.map.CursorAsIterator;
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.representation.Relation;
-import org.eclipse.viatra.solver.data.query.internal.RelationViewKey;
 
 /**
  * Represents a view of a {@link Relation} that can be queried.
+ * 
  * @author Oszkar Semerath
  *
  * @param <D>
  */
-public abstract class RelationView<D>{
-        protected final Model model;
+public abstract class RelationView<D> extends BaseInputKeyWrapper<RelationView<D>> {
         protected final Relation<D> representation;
-        private final RelationViewKey<D> key;
-        
-        protected RelationView(Model model, Relation<D> representation) {
-                this.model = model;
+
+        protected RelationView(Relation<D> representation) {
+                super(null);
+                this.wrappedKey = this;
                 this.representation = representation;
-                key = new RelationViewKey<>(this, getArity());
         }
-        
-        public Model getModel() {
-                return model;
+
+        @Override
+        public String getPrettyPrintableName() {
+                return representation.getName();
+        }
+
+        @Override
+        public String getStringID() {
+                return representation.getName() + this.getClass().getName();
         }
+
         public Relation<D> getRepresentation() {
                 return representation;
         }
-        
-        public abstract int getArity();
+
+        @Override
+        public boolean isEnumerable() {
+                return true;
+        }
+
         protected abstract boolean filter(Tuple key, D value);
+
         protected abstract Object[] forwardMap(Tuple key, D value);
-        public abstract boolean get(Object[] tuple);
+
+        public abstract boolean get(Model model, Object[] tuple);
 
         public Object[] transform(Tuple tuple, D value) {
-                if(filter(tuple, value)) {
+                if (filter(tuple, value)) {
                         return forwardMap(tuple, value);
-                } else return null;
+                } else
+                        return null;
         }
 
-        public Iterable<Object[]> getAll() {
-                return (()->new CursorAsIterator<>(model.getAll(representation), (k,v)->forwardMap(k,v), (k,v)->filter(k,v)));
+        public Iterable<Object[]> getAll(Model model) {
+                return (() -> new CursorAsIterator<>(model.getAll(representation), (k, v) -> forwardMap(k, v),
+                                (k, v) -> filter(k, v)));
         }
-        
-        public RelationViewKey<D> getKey() {
-                return key;
+
+        @Override
+        public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + Objects.hash(representation);
+                return result;
         }
+
+        @Override
+        public boolean equals(Object obj) {
+                if (this == obj)
+                        return true;
+                if (!super.equals(obj))
+                        return false;
+                if (!(obj instanceof RelationView))
+                        return false;
+                @SuppressWarnings("unchecked")
+                RelationView<D> other = ((RelationView<D>) obj);
+                return Objects.equals(representation, other.representation);
+        }
+
 }