changend the visibility of view.arity

3 files changed, 20 insertions, 3 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 2f4661ae..713673e2 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
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.relationView;
+package org.eclipse.viatra.solver.data.query.view;
 
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
@@ -32,4 +32,9 @@ public abstract class FilteredRelationView<D> extends RelationView<D>{
                 }
                 return result;
         }
+        
+        @Override
+        public int getArity() {
+                return this.representation.getSymbol().getArity();
+        }
 }
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 69001606..03c25641 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
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.relationView;
+package org.eclipse.viatra.solver.data.query.view;
 
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
@@ -42,4 +42,9 @@ public class FunctionalRelationView<D> extends RelationView<D> {
                 result[t.getSize()] = value;
                 return result;
         }
+        
+        @Override
+        public int getArity() {
+                return this.representation.getSymbol().getArity()+1;
+        }
 }
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 08296705..efd8e990 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,9 +1,10 @@
-package org.eclipse.viatra.solver.data.query.relationView;
+package org.eclipse.viatra.solver.data.query.view;
 
 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.
@@ -14,6 +15,7 @@ import org.eclipse.viatra.solver.data.model.representation.Relation;
 public abstract class RelationView<D>{
         protected final Model model;
         protected final Relation<D> representation;
+        RelationViewKey<D> key = new RelationViewKey<>(this, getArity());
         
         protected RelationView(Model model, Relation<D> representation) {
                 this.model = model;
@@ -27,6 +29,7 @@ public abstract class RelationView<D>{
                 return representation;
         }
         
+        public abstract int getArity();
         protected abstract boolean filter(Tuple key, D value);
         protected abstract Object[] forwardMap(Tuple key, D value);
         public abstract boolean get(Object[] tuple);
@@ -40,4 +43,8 @@ public abstract class RelationView<D>{
         public Iterable<Object[]> getAll() {
                 return (()->new CursorAsIterator<>(model.getAll(representation), (k,v)->forwardMap(k,v), (k,v)->filter(k,v)));
         }
+        
+        public RelationViewKey<D> getKey() {
+                return key;
+        }
 }