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

3 files changed, 68 insertions, 64 deletions

diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
index e6701fe3..ceb46d6f 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfBuilderTest.java
@@ -1,7 +1,9 @@
 package tools.refinery.store.query;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.literal.BooleanLiteral;
+import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
 
@@ -12,8 +14,8 @@ import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo
 class DnfBuilderTest {
         @Test
         void eliminateTrueTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
 
@@ -28,8 +30,8 @@ class DnfBuilderTest {
 
         @Test
         void eliminateFalseTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
 
@@ -45,8 +47,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysTrueTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
 
@@ -62,8 +64,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysFalseTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
 
@@ -78,8 +80,8 @@ class DnfBuilderTest {
 
         @Test
         void eliminateTrueDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
@@ -95,8 +97,8 @@ class DnfBuilderTest {
 
         @Test
         void eliminateFalseDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
@@ -113,8 +115,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysTrueDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
@@ -131,8 +133,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysFalseDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
@@ -148,8 +150,8 @@ class DnfBuilderTest {
 
         @Test
         void eliminateNotFalseDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
@@ -165,8 +167,8 @@ class DnfBuilderTest {
 
         @Test
         void eliminateNotTrueDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
@@ -183,8 +185,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysNotFalseDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var falseDnf = Dnf.builder().parameter(p).build();
@@ -201,8 +203,8 @@ class DnfBuilderTest {
 
         @Test
         void alwaysNotTrueDnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var trueDnf = Dnf.builder().parameter(p).clause().build();
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToStringTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java
index e6e4bef3..9b469bb0 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToStringTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/DnfToDefinitionStringTest.java
@@ -1,6 +1,8 @@
 package tools.refinery.store.query;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
 
@@ -8,13 +10,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static tools.refinery.store.query.literal.Literals.not;
 
-class DnfToStringTest {
+class DnfToDefinitionStringTest {
         @Test
         void noClausesTest() {
-                var p = new Variable("p");
+                var p = Variable.of("p");
                 var dnf = Dnf.builder("Example").parameter(p).build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     <no clauses>.
                                 """));
@@ -24,7 +26,7 @@ class DnfToStringTest {
         void noParametersTest() {
                 var dnf = Dnf.builder("Example").build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example() <->
                                     <no clauses>.
                                 """));
@@ -32,10 +34,10 @@ class DnfToStringTest {
 
         @Test
         void emptyClauseTest() {
-                var p = new Variable("p");
+                var p = Variable.of("p");
                 var dnf = Dnf.builder("Example").parameter(p).clause().build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     <empty>.
                                 """));
@@ -43,13 +45,13 @@ class DnfToStringTest {
 
         @Test
         void relationViewPositiveTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(friendView.call(p, q)).build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     @RelationView("key") friend(p, q).
                                 """));
@@ -57,13 +59,13 @@ class DnfToStringTest {
 
         @Test
         void relationViewNegativeTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(not(friendView.call(p, q))).build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     !(@RelationView("key") friend(p, q)).
                                 """));
@@ -71,13 +73,13 @@ class DnfToStringTest {
 
         @Test
         void relationViewTransitiveTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var dnf = Dnf.builder("Example").parameter(p).clause(friendView.callTransitive(p, q)).build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     @RelationView("key") friend+(p, q).
                                 """));
@@ -85,13 +87,13 @@ class DnfToStringTest {
 
         @Test
         void multipleParametersTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var dnf = Dnf.builder("Example").parameters(p, q).clause(friendView.call(p, q)).build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p, q) <->
                                     @RelationView("key") friend(p, q).
                                 """));
@@ -99,8 +101,8 @@ class DnfToStringTest {
 
         @Test
         void multipleLiteralsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
@@ -114,7 +116,7 @@ class DnfToStringTest {
                                 )
                                 .build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     @RelationView("key") person(p),
                                     @RelationView("key") person(q),
@@ -124,8 +126,8 @@ class DnfToStringTest {
 
         @Test
         void multipleClausesTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyRelationView<>(friend);
                 var dnf = Dnf.builder("Example")
@@ -134,7 +136,7 @@ class DnfToStringTest {
                                 .clause(friendView.call(q, p))
                                 .build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     @RelationView("key") friend(p, q)
                                 ;
@@ -144,10 +146,10 @@ class DnfToStringTest {
 
         @Test
         void dnfTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
-                var r = new Variable("r");
-                var s = new Variable("s");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
+                var r = Variable.of("r");
+                var s = Variable.of("s");
                 var person = new Symbol<>("person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
@@ -162,7 +164,7 @@ class DnfToStringTest {
                                 )
                                 .build();
 
-                assertThat(dnf.toString(), is("""
+                assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(p) <->
                                     @RelationView("key") person(p),
                                     @RelationView("key") person(q),
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
index 0cda22df..a61e2b65 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
@@ -1,8 +1,8 @@
 package tools.refinery.store.query.tests;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.Dnf;
-import tools.refinery.store.query.Variable;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
 
@@ -14,8 +14,8 @@ import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo
 class StructurallyEqualToTest {
         @Test
         void flatEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -27,8 +27,8 @@ class StructurallyEqualToTest {
 
         @Test
         void flatNotEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -41,8 +41,8 @@ class StructurallyEqualToTest {
 
         @Test
         void deepEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -58,8 +58,8 @@ class StructurallyEqualToTest {
 
         @Test
         void deepNotEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -72,6 +72,6 @@ class StructurallyEqualToTest {
 
                 var assertion = structurallyEqualTo(expected);
                 var error = assertThrows(AssertionError.class, () -> assertThat(actual, assertion));
-                assertThat(error.getMessage(), containsString(" called from Expected "));
+                assertThat(error.getMessage(), containsString(" called from Expected/1 "));
         }
 }