refactor(reasoning): candidate view should always be a refinement of partial

Merge the candidate may/must queries with the partial may/must queries so that
reasoning in the candidate model uses "Gentzen-style" assumptions about the
candidate values of partal symbols that would be computed as unknown.

This should not lead to performance degradation, because the corresponding joins
were already being computed in the stopping criterion. In many cases, the extra
clauses are immediately optimized away by the query optimizer anyways.

1 files changed, 3 insertions, 3 deletions

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));