From 372058e54825ab58a66c25ae528e81a656c22659 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 7 Mar 2023 16:26:26 +0100 Subject: feat: terms and improved query evaluation * Implement data terms for computations in queries. * Function-like queries with computed results. * Improved query evaluation, including positive and negative diagonal cosntraints. * Preliminary local search support. * Changes to the DNF representation for count and aggregation support. feat: terms wip feat: query terms wip feat: query evaluation, diagonal constraints, local search wip fix reasoning compilation wip --- .../store/query/tests/MismatchDescribingDnfEqualityChecker.java | 8 ++++---- .../java/tools/refinery/store/query/tests/QueryMatchers.java | 2 +- .../tools/refinery/store/query/tests/StructurallyEqualTo.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'subprojects/store-query/src/testFixtures/java') diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java index aaab2e7e..685957c9 100644 --- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java +++ b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java @@ -30,14 +30,14 @@ class MismatchDescribingDnfEqualityChecker extends DeepDnfEqualityChecker { var inProgress = getInProgress(); int size = inProgress.size(); if (size <= 1) { - description.appendText("was ").appendValue(pair.left()); + description.appendText("was ").appendText(pair.left().toDefinitionString()); return; } var last = inProgress.get(size - 1); - description.appendText("expected ").appendValue(last.right()); + description.appendText("expected ").appendText(last.right().toDefinitionString()); for (int i = size - 2; i >= 0; i--) { - description.appendText(" called from ").appendText(inProgress.get(i).left().name()); + description.appendText(" called from ").appendText(inProgress.get(i).left().toString()); } - description.appendText(" was not structurally equal to ").appendValue(last.right()); + description.appendText(" was not structurally equal to ").appendText(last.right().toDefinitionString()); } } diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java index 83614278..bf1c1b74 100644 --- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java +++ b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java @@ -1,7 +1,7 @@ package tools.refinery.store.query.tests; import org.hamcrest.Matcher; -import tools.refinery.store.query.Dnf; +import tools.refinery.store.query.dnf.Dnf; public final class QueryMatchers { private QueryMatchers() { diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java index a42396dd..a9a78f88 100644 --- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java +++ b/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java @@ -2,7 +2,7 @@ package tools.refinery.store.query.tests; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -import tools.refinery.store.query.Dnf; +import tools.refinery.store.query.dnf.Dnf; import tools.refinery.store.query.equality.DeepDnfEqualityChecker; public class StructurallyEqualTo extends TypeSafeMatcher { @@ -31,6 +31,6 @@ public class StructurallyEqualTo extends TypeSafeMatcher { @Override public void describeTo(Description description) { - description.appendText("structurally equal to ").appendValue(expected); + description.appendText("structurally equal to ").appendText(expected.toDefinitionString()); } } -- cgit v1.2.3-70-g09d2