Fixes for cyclic dependencies.

ad-freiburg · Oct 27, 2021 · 4ade5af · 4ade5af
1 parent c01f791
commit 4ade5af
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/engine/sparqlExpressions/AggregateExpression.h b/src/engine/sparqlExpressions/AggregateExpression.h
@@ -8,6 +8,7 @@
 #ifndef QLEVER_AGGREGATEEXPRESSION_H
 #define QLEVER_AGGREGATEEXPRESSION_H
 
+#include "./SparqlExpressionGenerators.h"
 #include "SparqlExpression.h"
 namespace sparqlExpression {
 
@@ -95,7 +96,7 @@ class AggregateExpression : public SparqlExpression {
     const auto& valueGetter = std::get<0>(aggregateOperation._valueGetters);
 
     if (!distinct) {
-      auto values = valueGetterGenerator(
+      auto values = detail::valueGetterGenerator(
           inputSize, context, std::forward<Operand>(operand), valueGetter);
       auto it = values.begin();
       auto result = *it;
@@ -173,8 +174,8 @@ inline auto averageFinalOp = [](const auto& aggregation, size_t numElements) {
                            static_cast<double>(numElements)
                      : std::numeric_limits<double>::quiet_NaN();
 };
-using AvgExpression =
-    detail::AggregateExpression<AGG_OP<decltype(add), NumericValueGetter>>;
+using AvgExpression = detail::AggregateExpression<
+    AGG_OP<decltype(addForSum), NumericValueGetter>>;
 
 // MIN
 inline auto minLambda = [](const auto& a, const auto& b) {