refactor: prefer Query.of over Dnf.of

3 files changed, 24 insertions, 8 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java
index c0995e53..916fb35c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java
@@ -60,13 +60,13 @@ public interface Constraint {
                 return count(List.of(arguments));
         }
 
-        default <R, T> AssignedValue<R> aggregate(DataVariable<T> inputVariable, Aggregator<R, T> aggregator,
-                                                                                          List<Variable> arguments) {
+        default <R, T> AssignedValue<R> aggregateBy(DataVariable<T> inputVariable, Aggregator<R, T> aggregator,
+                                                                                                List<Variable> arguments) {
                 return targetVariable -> new AggregationLiteral<>(targetVariable, aggregator, inputVariable, this, arguments);
         }
 
-        default <R, T> AssignedValue<R> aggregate(DataVariable<T> inputVariable, Aggregator<R, T> aggregator,
-                                                                                          Variable... arguments) {
-                return aggregate(inputVariable, aggregator, List.of(arguments));
+        default <R, T> AssignedValue<R> aggregateBy(DataVariable<T> inputVariable, Aggregator<R, T> aggregator,
+                                                                                                Variable... arguments) {
+                return aggregateBy(inputVariable, aggregator, List.of(arguments));
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
index 6f253012..5a32b1ba 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
@@ -74,7 +74,7 @@ public final class FunctionalQuery<T> extends Query<T> {
                         argumentsWithPlaceholder.addAll(arguments);
                         argumentsWithPlaceholder.add(placeholderVariable);
                         return getDnf()
-                                        .aggregate(placeholderVariable, aggregator, argumentsWithPlaceholder)
+                                        .aggregateBy(placeholderVariable, aggregator, argumentsWithPlaceholder)
                                         .toLiteral(targetVariable);
                 };
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
index 1b89e77c..74a5be07 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
@@ -5,10 +5,12 @@
  */
 package tools.refinery.store.query.view;
 
-import tools.refinery.store.query.term.Parameter;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.*;
 import tools.refinery.store.representation.Symbol;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public final class FunctionView<T> extends AbstractFunctionView<T> {
         public FunctionView(Symbol<T> symbol, String name) {
                 super(symbol, name, new Parameter(symbol.valueType(), ParameterDirection.OUT));
@@ -17,4 +19,18 @@ public final class FunctionView<T> extends AbstractFunctionView<T> {
         public FunctionView(Symbol<T> symbol) {
                 this(symbol, "function");
         }
+
+        public <R> AssignedValue<R> aggregate(Aggregator<R, T> aggregator, List<NodeVariable> arguments) {
+                return targetVariable -> {
+                        var placeholderVariable = Variable.of(getSymbol().valueType());
+                        var argumentsWithPlaceholder = new ArrayList<Variable>(arguments.size() + 1);
+                        argumentsWithPlaceholder.addAll(arguments);
+                        argumentsWithPlaceholder.add(placeholderVariable);
+                        return aggregateBy(placeholderVariable, aggregator, argumentsWithPlaceholder).toLiteral(targetVariable);
+                };
+        }
+
+        public <R> AssignedValue<R> aggregate(Aggregator<R, T> aggregator, NodeVariable... arguments) {
+                return aggregate(aggregator, List.of(arguments));
+        }
 }