feat: negative and transitive RelationViewAtom

Use PVisibility.EMBEDDED helper patterns to avoid superfluous production
nodes in the Rete net.

3 files changed, 40 insertions, 60 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/AbstractSubstitutionAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/AbstractSubstitutionAtom.java
deleted file mode 100644
index af6a8f5a..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/AbstractSubstitutionAtom.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.representation.SymbolLike;
-import tools.refinery.store.query.Variable;
-
-import java.util.List;
-import java.util.Set;
-
-public abstract class AbstractSubstitutionAtom<T extends SymbolLike> implements DNFAtom {
-        private final T target;
-
-        private final List<Variable> substitution;
-
-        protected AbstractSubstitutionAtom(T target, List<Variable> substitution) {
-                if (substitution.size() != target.arity()) {
-                        throw new IllegalArgumentException("%s needs %d arguments, but got %s".formatted(target.name(),
-                                        target.arity(), substitution.size()));
-                }
-                this.target = target;
-                this.substitution = substitution;
-        }
-
-        public T getTarget() {
-                return target;
-        }
-
-        public List<Variable> getSubstitution() {
-                return substitution;
-        }
-
-        @Override
-        public void collectAllVariables(Set<Variable> variables) {
-                variables.addAll(substitution);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
index 2e855246..6de5cd08 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
@@ -1,21 +1,28 @@
 package tools.refinery.store.query.atom;
 
-import tools.refinery.store.representation.SymbolLike;
 import tools.refinery.store.query.Variable;
+import tools.refinery.store.representation.SymbolLike;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-public abstract class CallAtom<T extends SymbolLike> extends AbstractSubstitutionAtom<T> {
+public abstract class CallAtom<T extends SymbolLike> implements DNFAtom {
         private final CallPolarity polarity;
+        private final T target;
+        private final List<Variable> substitution;
 
         protected CallAtom(CallPolarity polarity, T target, List<Variable> substitution) {
-                super(target, substitution);
+                if (substitution.size() != target.arity()) {
+                        throw new IllegalArgumentException("%s needs %d arguments, but got %s".formatted(target.name(),
+                                        target.arity(), substitution.size()));
+                }
                 if (polarity.isTransitive() && target.arity() != 2) {
                         throw new IllegalArgumentException("Transitive closures can only take binary relations");
                 }
                 this.polarity = polarity;
+                this.target = target;
+                this.substitution = substitution;
         }
 
         protected CallAtom(CallPolarity polarity, T target, Variable... substitution) {
@@ -42,10 +49,18 @@ public abstract class CallAtom<T extends SymbolLike> extends AbstractSubstitutio
                 return polarity;
         }
 
+        public T getTarget() {
+                return target;
+        }
+
+        public List<Variable> getSubstitution() {
+                return substitution;
+        }
+
         @Override
         public void collectAllVariables(Set<Variable> variables) {
                 if (polarity.isPositive()) {
-                        super.collectAllVariables(variables);
+                        variables.addAll(substitution);
                 }
         }
 
@@ -53,14 +68,13 @@ public abstract class CallAtom<T extends SymbolLike> extends AbstractSubstitutio
         public boolean equals(Object o) {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
-                CallAtom<?> that = (CallAtom<?>) o;
-                return Objects.equals(polarity, that.polarity)
-                                && Objects.equals(getTarget(), that.getTarget())
-                                && Objects.equals(getSubstitution(), that.getSubstitution());
+                CallAtom<?> callAtom = (CallAtom<?>) o;
+                return polarity == callAtom.polarity && Objects.equals(target, callAtom.target) && Objects.equals(substitution
+                                , callAtom.substitution);
         }
 
         @Override
         public int hashCode() {
-                return Objects.hash(polarity, getTarget(), getSubstitution());
+                return Objects.hash(polarity, target, substitution);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java
index cf836541..a2b176c4 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java
@@ -4,28 +4,29 @@ import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.view.AnyRelationView;
 
 import java.util.List;
-import java.util.Objects;
 
-public final class RelationViewAtom extends AbstractSubstitutionAtom<AnyRelationView> {
-        public RelationViewAtom(AnyRelationView target, List<Variable> substitution) {
-                super(target, substitution);
+public final class RelationViewAtom extends CallAtom<AnyRelationView> {
+        public RelationViewAtom(CallPolarity polarity, AnyRelationView target, List<Variable> substitution) {
+                super(polarity, target, substitution);
         }
 
-        public RelationViewAtom(AnyRelationView target, Variable... substitution) {
-                this(target, List.of(substitution));
+        public RelationViewAtom(CallPolarity polarity, AnyRelationView target, Variable... substitution) {
+                super(polarity, target, substitution);
         }
 
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                RelationViewAtom relationViewAtom = (RelationViewAtom) o;
-                return Objects.equals(getTarget(), relationViewAtom.getTarget())
-                                && Objects.equals(getSubstitution(), relationViewAtom.getSubstitution());
+        public RelationViewAtom(boolean positive, AnyRelationView target, List<Variable> substitution) {
+                super(positive, target, substitution);
         }
 
-        @Override
-        public int hashCode() {
-                return Objects.hash(getTarget(), getSubstitution());
+        public RelationViewAtom(boolean positive, AnyRelationView target, Variable... substitution) {
+                super(positive, target, substitution);
+        }
+
+        public RelationViewAtom(AnyRelationView target, List<Variable> substitution) {
+                super(target, substitution);
+        }
+
+        public RelationViewAtom(AnyRelationView target, Variable... substitution) {
+                super(target, substitution);
         }
 }