refactor: EDSL for DNF literals

9 files changed, 91 insertions, 45 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/Dnf.java b/subprojects/store/src/main/java/tools/refinery/store/query/Dnf.java
index f7b27b81..1eb9ac76 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/Dnf.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/Dnf.java
@@ -1,5 +1,7 @@
 package tools.refinery.store.query;
 
+import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.literal.DnfCallLiteral;
 import tools.refinery.store.query.literal.Literal;
 
 import java.util.*;
@@ -72,6 +74,22 @@ public final class Dnf implements RelationLike {
                 return clauses;
         }
 
+        public DnfCallLiteral call(CallPolarity polarity, List<Variable> substitution) {
+                return new DnfCallLiteral(polarity, this, substitution);
+        }
+
+        public DnfCallLiteral call(CallPolarity polarity, Variable... substitution) {
+                return call(polarity, List.of(substitution));
+        }
+
+        public DnfCallLiteral call(Variable... substitution) {
+                return call(CallPolarity.POSITIVE, substitution);
+        }
+
+        public DnfCallLiteral callTransitive(Variable left, Variable right) {
+                return call(CallPolarity.TRANSITIVE, List.of(left, right));
+        }
+
         public static Builder builder() {
                 return builder(null);
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java b/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java
index 6a6831ae..2eb87649 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java
@@ -1,5 +1,8 @@
 package tools.refinery.store.query;
 
+import tools.refinery.store.query.literal.ConstantLiteral;
+import tools.refinery.store.query.literal.EquivalenceLiteral;
+
 import java.util.Objects;
 
 public class Variable {
@@ -28,6 +31,18 @@ public class Variable {
                 return name != null;
         }
 
+        public ConstantLiteral isConstant(int value) {
+                return new ConstantLiteral(this, value);
+        }
+
+        public EquivalenceLiteral isEquivalent(Variable other) {
+                return new EquivalenceLiteral(true, this, other);
+        }
+
+        public EquivalenceLiteral notEquivalent(Variable other) {
+                return new EquivalenceLiteral(false, this, other);
+        }
+
         @Override
         public boolean equals(Object o) {
                 if (this == o) return true;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/CallPolarity.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
index ddea0221..84b4b771 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
@@ -22,7 +22,11 @@ public enum CallPolarity {
                 return transitive;
         }
 
-        public static CallPolarity fromBoolean(boolean positive) {
-                return positive ? POSITIVE : NEGATIVE;
+        public CallPolarity negate() {
+                return switch (this) {
+                        case POSITIVE -> NEGATIVE;
+                        case NEGATIVE -> POSITIVE;
+                        case TRANSITIVE -> throw new IllegalArgumentException("Transitive polarity cannot be negated");
+                };
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/DnfCallLiteral.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/DnfCallLiteral.java
index e3410c21..86149b33 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/literal/DnfCallLiteral.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/DnfCallLiteral.java
@@ -5,28 +5,13 @@ import tools.refinery.store.query.Variable;
 
 import java.util.List;
 
-public final class DnfCallLiteral extends CallLiteral<Dnf> {
+public final class DnfCallLiteral extends CallLiteral<Dnf> implements PolarLiteral<DnfCallLiteral> {
         public DnfCallLiteral(CallPolarity polarity, Dnf target, List<Variable> substitution) {
                 super(polarity, target, substitution);
         }
 
-        public DnfCallLiteral(CallPolarity polarity, Dnf target, Variable... substitution) {
-                this(polarity, target, List.of(substitution));
-        }
-
-        public DnfCallLiteral(boolean positive, Dnf target, List<Variable> substitution) {
-                this(CallPolarity.fromBoolean(positive), target, substitution);
-        }
-
-        public DnfCallLiteral(boolean positive, Dnf target, Variable... substitution) {
-                this(positive, target, List.of(substitution));
-        }
-
-        public DnfCallLiteral(Dnf target, List<Variable> substitution) {
-                this(CallPolarity.POSITIVE, target, substitution);
-        }
-
-        public DnfCallLiteral(Dnf target, Variable... substitution) {
-                this(target, List.of(substitution));
+        @Override
+        public DnfCallLiteral negate() {
+                return new DnfCallLiteral(getPolarity().negate(), getTarget(), getSubstitution());
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
index a1ec2c41..75afd50b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
@@ -4,14 +4,16 @@ import tools.refinery.store.query.Variable;
 
 import java.util.Set;
 
-public record EquivalenceLiteral(boolean positive, Variable left, Variable right) implements Literal {
-        public EquivalenceLiteral(Variable left, Variable right) {
-                this(true, left, right);
-        }
-
+public record EquivalenceLiteral(boolean positive, Variable left, Variable right)
+                implements PolarLiteral<EquivalenceLiteral> {
         @Override
         public void collectAllVariables(Set<Variable> variables) {
                 variables.add(left);
                 variables.add(right);
         }
+
+        @Override
+        public EquivalenceLiteral negate() {
+                return new EquivalenceLiteral(!positive, left, right);
+        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/Literals.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/Literals.java
new file mode 100644
index 00000000..2c7e893f
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/Literals.java
@@ -0,0 +1,11 @@
+package tools.refinery.store.query.literal;
+
+public final class Literals {
+        private Literals() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static <T extends PolarLiteral<T>> T not(PolarLiteral<T> literal) {
+                return literal.negate();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/PolarLiteral.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/PolarLiteral.java
new file mode 100644
index 00000000..32523675
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/PolarLiteral.java
@@ -0,0 +1,5 @@
+package tools.refinery.store.query.literal;
+
+public interface PolarLiteral<T extends PolarLiteral<T>> extends Literal {
+        T negate();
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/literal/RelationViewLiteral.java b/subprojects/store/src/main/java/tools/refinery/store/query/literal/RelationViewLiteral.java
index e2106ba9..7fa99abb 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/literal/RelationViewLiteral.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/literal/RelationViewLiteral.java
@@ -5,28 +5,14 @@ import tools.refinery.store.query.view.AnyRelationView;
 
 import java.util.List;
 
-public final class RelationViewLiteral extends CallLiteral<AnyRelationView> {
+public final class RelationViewLiteral extends CallLiteral<AnyRelationView>
+                implements PolarLiteral<RelationViewLiteral> {
         public RelationViewLiteral(CallPolarity polarity, AnyRelationView target, List<Variable> substitution) {
                 super(polarity, target, substitution);
         }
 
-        public RelationViewLiteral(CallPolarity polarity, AnyRelationView target, Variable... substitution) {
-                this(polarity, target, List.of(substitution));
-        }
-
-        public RelationViewLiteral(boolean positive, AnyRelationView target, List<Variable> substitution) {
-                this(CallPolarity.fromBoolean(positive), target, substitution);
-        }
-
-        public RelationViewLiteral(boolean positive, AnyRelationView target, Variable... substitution) {
-                this(positive, target, List.of(substitution));
-        }
-
-        public RelationViewLiteral(AnyRelationView target, List<Variable> substitution) {
-                this(CallPolarity.POSITIVE, target, substitution);
-        }
-
-        public RelationViewLiteral(AnyRelationView target, Variable... substitution) {
-                this(target, List.of(substitution));
+        @Override
+        public RelationViewLiteral negate() {
+                return new RelationViewLiteral(getPolarity().negate(), getTarget(), getSubstitution());
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
index bbec1e73..0bea962d 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
@@ -2,9 +2,13 @@ package tools.refinery.store.query.view;
 
 import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
+import tools.refinery.store.query.Variable;
+import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.literal.RelationViewLiteral;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -47,6 +51,22 @@ public abstract non-sealed class RelationView<T> implements AnyRelationView {
                 return (() -> new CursorAsIterator<>(model.getInterpretation(symbol).getAll(), this::forwardMap, this::filter));
         }
 
+        public RelationViewLiteral call(CallPolarity polarity, List<Variable> substitution) {
+                return new RelationViewLiteral(polarity, this, substitution);
+        }
+
+        public RelationViewLiteral call(CallPolarity polarity, Variable... substitution) {
+                return call(polarity, List.of(substitution));
+        }
+
+        public RelationViewLiteral call(Variable... substitution) {
+                return call(CallPolarity.POSITIVE, substitution);
+        }
+
+        public RelationViewLiteral callTransitive(Variable left, Variable right) {
+                return call(CallPolarity.TRANSITIVE, List.of(left, right));
+        }
+
         @Override
         public boolean equals(Object o) {
                 if (this == o) return true;