5 files changed, 37 insertions, 21 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));
+        }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
index 3608d09e..c52d26b2 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
@@ -38,7 +38,7 @@ class VariableDirectionTest {
         private static final Symbol<Integer> age = Symbol.of("age", 1, Integer.class);
         private static final AnySymbolView personView = new KeyOnlyView<>(person);
         private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
-        private static final AnySymbolView ageView = new FunctionView<>(age);
+        private static final FunctionView<Integer> ageView = new FunctionView<>(age);
         private static final NodeVariable p = Variable.of("p");
         private static final NodeVariable q = Variable.of("q");
         private static final DataVariable<Integer> x = Variable.of("x", Integer.class);
@@ -149,10 +149,10 @@ class VariableDirectionTest {
                 return Stream.of(
                                 Arguments.of(not(friendView.call(p, q))),
                                 Arguments.of(y.assign(friendView.count(p, q))),
-                                Arguments.of(y.assign(ageView.aggregate(z, INT_SUM, p, z))),
+                                Arguments.of(y.assign(ageView.aggregate(INT_SUM, p))),
                                 Arguments.of(not(dnfWithOutput.call(p, q))),
                                 Arguments.of(y.assign(dnfWithOutput.count(p, q))),
-                                Arguments.of(y.assign(dnfWithOutputToAggregate.aggregate(z, INT_SUM, p, q, z)))
+                                Arguments.of(y.assign(dnfWithOutputToAggregate.aggregateBy(z, INT_SUM, p, q, z)))
                 );
         }
 
@@ -192,8 +192,8 @@ class VariableDirectionTest {
                                 Arguments.of(not(dnfWithInput.call(p, p))),
                                 Arguments.of(y.assign(dnfWithInput.count(p, q))),
                                 Arguments.of(y.assign(dnfWithInput.count(p, p))),
-                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, p, q, z))),
-                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, p, p, z)))
+                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, p, q, z))),
+                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, p, p, z)))
                 );
         }
 
@@ -357,7 +357,7 @@ class VariableDirectionTest {
                                 Arguments.of(dnfWithInput.call(x, q)),
                                 Arguments.of(not(dnfWithInput.call(x, q))),
                                 Arguments.of(y.assign(dnfWithInput.count(x, q))),
-                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, x, q, z)))
+                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, x, q, z)))
                 );
         }
 
@@ -415,10 +415,10 @@ class VariableDirectionTest {
                                 Arguments.of(x.assign(constant(24))),
                                 Arguments.of(ageView.call(q, x)),
                                 Arguments.of(x.assign(personView.count(q))),
-                                Arguments.of(x.assign(ageView.aggregate(z, INT_SUM, q, z))),
+                                Arguments.of(x.assign(ageView.aggregate(INT_SUM, q))),
                                 Arguments.of(dnfWithDataOutput.call(x, q)),
                                 Arguments.of(x.assign(dnfWithOutput.count(q))),
-                                Arguments.of(x.assign(dnfWithOutputToAggregate.aggregate(z, INT_SUM, q, z)))
+                                Arguments.of(x.assign(dnfWithOutputToAggregate.aggregateBy(z, INT_SUM, q, z)))
                 );
         }
 
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
index 5293b273..35910e08 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
@@ -44,7 +44,7 @@ class AggregationLiteralTest {
 
         @Test
         void parameterDirectionTest() {
-                var literal = x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y));
+                var literal = x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y));
                 assertAll(
                                 () -> assertThat(literal.getOutputVariables(), containsInAnyOrder(x)),
                                 () -> assertThat(literal.getInputVariables(Set.of()), empty()),
@@ -56,13 +56,13 @@ class AggregationLiteralTest {
 
         @Test
         void missingAggregationVariableTest() {
-                var aggregation = fakeConstraint.aggregate(y, INT_SUM, p, z);
+                var aggregation = fakeConstraint.aggregateBy(y, INT_SUM, p, z);
                 assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
         }
 
         @Test
         void circularAggregationVariableTest() {
-                var aggregation = fakeConstraint.aggregate(x, INT_SUM, p, x);
+                var aggregation = fakeConstraint.aggregateBy(x, INT_SUM, p, x);
                 assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
         }
 
@@ -71,7 +71,7 @@ class AggregationLiteralTest {
                 var builder = Dnf.builder()
                                 .clause(
                                                 not(fakeConstraint.call(p, y)),
-                                                x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y))
+                                                x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
                 assertThrows(IllegalArgumentException.class, builder::build);
         }
@@ -81,7 +81,7 @@ class AggregationLiteralTest {
                 var builder = Dnf.builder()
                                 .clause(
                                                 y.assign(constant(27)),
-                                                x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y))
+                                                x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
                 assertThrows(IllegalArgumentException.class, builder::build);
         }