2 files changed, 26 insertions, 13 deletions

diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
index 1c3f6a6d..a9031f4c 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
@@ -52,6 +52,8 @@ public final class PartialRelationTranslator extends PartialSymbolTranslator<Tru
         private RelationalQuery must;
         private RelationalQuery candidateMay;
         private RelationalQuery candidateMust;
+        private RelationalQuery candidateMayMerged;
+        private RelationalQuery candidateMustMerged;
         private RoundingMode roundingMode;
 
         private PartialRelationTranslator(PartialRelation partialRelation) {
@@ -202,6 +204,7 @@ public final class PartialRelationTranslator extends PartialSymbolTranslator<Tru
                 liftQueries(storeBuilder);
                 createFallbackQueriesFromSymbol();
                 setFallbackCandidateQueries();
+                mergeCandidateQueries();
                 createFallbackRewriter();
                 createFallbackInterpretation();
                 createFallbackRefiner();
@@ -272,9 +275,11 @@ public final class PartialRelationTranslator extends PartialSymbolTranslator<Tru
                 }
                 if (candidateMay == null) {
                         candidateMay = queryBasedRelationRewriter.getCandidateMay();
+                        candidateMayMerged = candidateMay;
                 }
                 if (candidateMust == null) {
                         candidateMust = queryBasedRelationRewriter.getCandidateMust();
+                        candidateMustMerged = candidateMust;
                 }
         }
 
@@ -309,15 +314,31 @@ public final class PartialRelationTranslator extends PartialSymbolTranslator<Tru
                 }
         }
 
+        private void mergeCandidateQueries() {
+                if (candidateMayMerged == null) {
+                        candidateMayMerged = createQuery("candidateMayMerged", (builder, arguments) -> builder
+                                        .clause(
+                                                        candidateMay.call(arguments),
+                                                        may.call(arguments)
+                                        ));
+                }
+                if (candidateMustMerged == null) {
+                        candidateMustMerged = createQuery("candidateMustMerged", (builder, arguments) -> builder
+                                        .clause(candidateMust.call(arguments))
+                                        .clause(must.call(arguments)));
+                }
+        }
+
         private void createFallbackRewriter() {
                 if (rewriter == null) {
-                        rewriter = new QueryBasedRelationRewriter(may, must, candidateMay, candidateMust);
+                        rewriter = new QueryBasedRelationRewriter(may, must, candidateMayMerged, candidateMustMerged);
                 }
         }
 
         private void createFallbackInterpretation() {
                 if (interpretationFactory == null) {
-                        interpretationFactory = new QueryBasedRelationInterpretationFactory(may, must, candidateMay, candidateMust);
+                        interpretationFactory = new QueryBasedRelationInterpretationFactory(may, must, candidateMayMerged,
+                                        candidateMustMerged);
                 }
         }
 
@@ -354,14 +375,6 @@ public final class PartialRelationTranslator extends PartialSymbolTranslator<Tru
                                 .clause(
                                                 PartialLiterals.candidateMust(partialRelation.call(parameters)),
                                                 not(PartialLiterals.candidateMay(partialRelation.call(parameters)))
-                                )
-                                .clause(
-                                                PartialLiterals.candidateMust(partialRelation.call(parameters)),
-                                                not(PartialLiterals.may(partialRelation.call(parameters)))
-                                )
-                                .clause(
-                                                PartialLiterals.must(partialRelation.call(parameters)),
-                                                not(PartialLiterals.candidateMay(partialRelation.call(parameters)))
                                 ));
                 var reject = createQuery("reject", (builder, parameters) -> {
                         var literals = new ArrayList<Literal>(parameters.length + 1);
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
index e87b2684..85147921 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
@@ -149,7 +149,7 @@ class TypeHierarchyPartialModelTest {
 
                 var personCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, person);
                 assertThat(personCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
-                assertThat(personCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+                assertThat(personCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
 
                 var memberInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, member);
                 assertThat(memberInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
@@ -157,7 +157,7 @@ class TypeHierarchyPartialModelTest {
 
                 var memberCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, member);
                 assertThat(memberCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
-                assertThat(memberCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+                assertThat(memberCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
 
                 var studentInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, student);
                 assertThat(studentInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
@@ -165,7 +165,7 @@ class TypeHierarchyPartialModelTest {
 
                 var studentCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, student);
                 assertThat(studentCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
-                assertThat(studentCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+                assertThat(studentCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
 
                 var teacherInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, teacher);
                 assertThat(teacherInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));