Update on relationalViews constructor visibility

3 files changed, 13 insertions, 4 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 9f71f8cf..4602af21 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,14 +1,18 @@
 package org.eclipse.viatra.solver.data.query.view;
 
+import java.util.function.BiPredicate;
+
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.Tuple.Tuple1;
 import org.eclipse.viatra.solver.data.model.representation.Relation;
 
-public abstract class FilteredRelationView<D> extends RelationView<D>{
+public class FilteredRelationView<D> extends RelationView<D>{
+        private final BiPredicate<Tuple,D> predicate;
 
-        protected FilteredRelationView(Model model, Relation<D> representation) {
+        public FilteredRelationView(Model model, Relation<D> representation, BiPredicate<Tuple,D> predicate) {
                 super(model, representation);
+                this.predicate = predicate;
         }
         @Override
         protected Object[] forwardMap(Tuple key, D value) {
@@ -37,4 +41,8 @@ public abstract class FilteredRelationView<D> extends RelationView<D>{
         public int getArity() {
                 return this.representation.getArity();
         }
+        @Override
+        protected boolean filter(Tuple key, D value) {
+                return this.predicate.test(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 ee52972c..b8d0ef72 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
@@ -7,7 +7,7 @@ import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public class FunctionalRelationView<D> extends RelationView<D> {
 
-        protected FunctionalRelationView(Model model, Relation<D> representation) {
+        public FunctionalRelationView(Model model, Relation<D> representation) {
                 super(model, representation);
         }
 
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 efd8e990..18d2692d 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
@@ -15,11 +15,12 @@ import org.eclipse.viatra.solver.data.query.internal.RelationViewKey;
 public abstract class RelationView<D>{
         protected final Model model;
         protected final Relation<D> representation;
-        RelationViewKey<D> key = new RelationViewKey<>(this, getArity());
+        private final RelationViewKey<D> key;
         
         protected RelationView(Model model, Relation<D> representation) {
                 this.model = model;
                 this.representation = representation;
+                key = new RelationViewKey<>(this, getArity());
         }
         
         public Model getModel() {