renaming

6 files changed, 7 insertions, 6 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java
index 66d55885..f0a390aa 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java
@@ -10,7 +10,7 @@ import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener;
 import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext;
-import org.eclipse.viatra.solver.data.query.relationView.RelationView;
+import org.eclipse.viatra.solver.data.query.view.RelationView;
 
 public class RelationalScope extends QueryScope{
         private final RelationUpdateListener updateListener;
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java
index b7d3b866..de814936 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java
@@ -8,7 +8,7 @@ import java.util.Set;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
 import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.query.relationView.RelationView;
+import org.eclipse.viatra.solver.data.query.view.RelationView;
 
 public class RelationUpdateListener {
         private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners;
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java
index f73ddd25..bae0af45 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java
@@ -4,15 +4,16 @@ import java.util.Objects;
 import java.util.UUID;
 
 import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
-import org.eclipse.viatra.solver.data.query.relationView.RelationView;
+import org.eclipse.viatra.solver.data.query.view.RelationView;
 
 public class RelationViewKey<D> extends BaseInputKeyWrapper<RelationView<D>>{
         private final String uniqueName;
+        private final int arity;
         
-        
-        public RelationViewKey(RelationView<D> wrappedKey) {
+        public RelationViewKey(RelationView<D> wrappedKey, int arity) {
                 super(wrappedKey);
                 this.uniqueName = wrappedKey.getRepresentation().getName() + "-"+UUID.randomUUID();
+                this.arity = arity;
         }
 
         @Override
@@ -27,7 +28,7 @@ public class RelationViewKey<D> extends BaseInputKeyWrapper<RelationView<D>>{
 
         @Override
         public int getArity() {
-                return wrappedKey.getRepresentation().getSymbol().getArity();
+                return arity;
         }
 
         @Override
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FilteredRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
index 2f4661ae..2f4661ae 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FilteredRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FunctionalRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
index 69001606..69001606 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FunctionalRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/RelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java
index 08296705..08296705 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/RelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java