Small fixes in query transformation and view equivalence checking

3 files changed, 12 insertions, 13 deletions

diff --git a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
index 6a340589..653783dd 100644
--- a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
+++ b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java
@@ -19,6 +19,7 @@ import tools.refinery.store.query.building.RelationAtom;
 import tools.refinery.store.query.internal.DNF2PQuery;
 import tools.refinery.store.query.internal.QueriableModelImpl;
 import tools.refinery.store.query.internal.RawPatternMatcher;
+import tools.refinery.store.query.internal.DNF2PQuery.SimplePQuery;
 import tools.refinery.store.query.view.RelationView;
 
 public class QueriableModelStoreImpl implements QueriableModelStore {
@@ -82,9 +83,9 @@ public class QueriableModelStoreImpl implements QueriableModelStore {
 
         private Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> initPredicates(Set<DNFPredicate> predicates) {
                 Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> result = new HashMap<>();
-
+                Map<DNFPredicate, SimplePQuery> dnf2PQueryMap = new HashMap<>();
                 for (DNFPredicate dnfPredicate : predicates) {
-                        GenericQuerySpecification<RawPatternMatcher> query = DNF2PQuery.translate(dnfPredicate).build();
+                        GenericQuerySpecification<RawPatternMatcher> query = DNF2PQuery.translate(dnfPredicate,dnf2PQueryMap).build();
                         result.put(dnfPredicate, query);
                 }
 
diff --git a/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java b/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
index aa797cde..5e408f59 100644
--- a/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
@@ -35,9 +35,9 @@ import tools.refinery.store.query.building.RelationAtom;
 import tools.refinery.store.query.building.Variable;
 
 public class DNF2PQuery {
-        private static Map<DNFPredicate, SimplePQuery> DNF2PQueryMap = new HashMap<>();
+        //private static Map<DNFPredicate, SimplePQuery> DNF2PQueryMap = new HashMap<>();
 
-        public static SimplePQuery translate(DNFPredicate predicate) {
+        public static SimplePQuery translate(DNFPredicate predicate, Map<DNFPredicate, SimplePQuery> DNF2PQueryMap) {
                 SimplePQuery query = DNF2PQueryMap.get(predicate);
                 if (query != null) {
                         return query;
@@ -61,14 +61,14 @@ public class DNF2PQuery {
                         body.setSymbolicParameters(symbolicParameters);
                         query.addBody(body);
                         for (DNFAtom constraint : clause.getConstraints()) {
-                                translateDNFAtom(constraint, body);
+                                translateDNFAtom(constraint, body, DNF2PQueryMap);
                         }
                 }
                 DNF2PQueryMap.put(predicate, query);
                 return query;
         }
 
-        private static void translateDNFAtom(DNFAtom constraint, PBody body) {
+        private static void translateDNFAtom(DNFAtom constraint, PBody body, Map<DNFPredicate, SimplePQuery> DNF2PQueryMap) {
                 if (constraint instanceof EquivalenceAtom equivalence) {
                         translateEquivalenceAtom(equivalence, body);
                 }
@@ -76,7 +76,7 @@ public class DNF2PQuery {
                         translateRelationAtom(relation, body);
                 }
                 if (constraint instanceof PredicateAtom predicate) {
-                        translatePredicateAtom(predicate, body);
+                        translatePredicateAtom(predicate, body, DNF2PQueryMap);
                 }
         }
 
@@ -101,7 +101,7 @@ public class DNF2PQuery {
                 new TypeConstraint(body, Tuples.flatTupleOf(variables), relation.getView());
         }
 
-        private static void translatePredicateAtom(PredicateAtom predicate, PBody body) {
+        private static void translatePredicateAtom(PredicateAtom predicate, PBody body, Map<DNFPredicate, SimplePQuery> DNF2PQueryMap) {
                 Object[] variables = new Object[predicate.getSubstitution().size()];
                 for (int i = 0; i < predicate.getSubstitution().size(); i++) {
                         variables[i] = body.getOrCreateVariableByName(predicate.getSubstitution().get(i).getName());
@@ -112,17 +112,17 @@ public class DNF2PQuery {
                                         throw new IllegalArgumentException("Transitive Predicate Atoms must be binary.");
                                 }
                                 new BinaryTransitiveClosure(body, Tuples.flatTupleOf(variables),
-                                                DNF2PQuery.translate(predicate.getReferred()));
+                                                DNF2PQuery.translate(predicate.getReferred(), DNF2PQueryMap));
                         } else {
                                 new PositivePatternCall(body, Tuples.flatTupleOf(variables),
-                                                DNF2PQuery.translate(predicate.getReferred()));
+                                                DNF2PQuery.translate(predicate.getReferred(), DNF2PQueryMap));
                         }
                 } else {
                         if (predicate.isTransitive()) {
                                 throw new InputMismatchException("Transitive Predicate Atoms cannot be negative.");
                         } else {
                                 new NegativePatternCall(body, Tuples.flatTupleOf(variables),
-                                                DNF2PQuery.translate(predicate.getReferred()));
+                                                DNF2PQuery.translate(predicate.getReferred(), DNF2PQueryMap));
                         }
                 }
         }
diff --git a/store/src/main/java/tools/refinery/store/query/view/RelationView.java b/store/src/main/java/tools/refinery/store/query/view/RelationView.java
index 2c2a37c4..efe9945f 100644
--- a/store/src/main/java/tools/refinery/store/query/view/RelationView.java
+++ b/store/src/main/java/tools/refinery/store/query/view/RelationView.java
@@ -74,8 +74,6 @@ public abstract class RelationView<D> extends BaseInputKeyWrapper<RelationView<D
         public boolean equals(Object obj) {
                 if (this == obj)
                         return true;
-                if (!super.equals(obj))
-                        return false;
                 if (!(obj instanceof RelationView))
                         return false;
                 @SuppressWarnings("unchecked")