1 files changed, 27 insertions, 8 deletions

diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
index 3be9e9ac..78fdbb89 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
@@ -5,30 +5,49 @@
  */
 package tools.refinery.store.reasoning.interpretation;
 
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.literal.AbstractCallLiteral;
 import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
 
 import java.util.List;
+import java.util.Set;
 
 public class QueryBasedRelationRewriter implements PartialRelationRewriter {
-        private final Query<Boolean> may;
-        private final Query<Boolean> must;
-        private final Query<Boolean> candidateMay;
-        private final Query<Boolean> candidateMust;
+        private final RelationalQuery may;
+        private final RelationalQuery must;
+        private final RelationalQuery candidateMay;
+        private final RelationalQuery candidateMust;
 
-        public QueryBasedRelationRewriter(Query<Boolean> may, Query<Boolean> must, Query<Boolean> candidateMay,
-                                                                          Query<Boolean> candidateMust) {
+        public QueryBasedRelationRewriter(RelationalQuery may, RelationalQuery must, RelationalQuery candidateMay,
+                                                                          RelationalQuery candidateMust) {
                 this.may = may;
                 this.must = must;
                 this.candidateMay = candidateMay;
                 this.candidateMust = candidateMust;
         }
 
+        public RelationalQuery getMay() {
+                return may;
+        }
+
+        public RelationalQuery getMust() {
+                return must;
+        }
+
+        public RelationalQuery getCandidateMay() {
+                return candidateMay;
+        }
+
+        public RelationalQuery getCandidateMust() {
+                return candidateMust;
+        }
+
         @Override
-        public List<Literal> rewriteLiteral(AbstractCallLiteral literal, Modality modality, Concreteness concreteness) {
+        public List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal,
+                                                                                Modality modality, Concreteness concreteness) {
                 var query = switch (concreteness) {
                         case PARTIAL -> switch (modality) {
                                 case MAY -> may;