Implement math:pow()

ad-freiburg · Oct 12, 2024 · 854b81f · 854b81f
1 parent 309f6b7
commit 854b81f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 0 deletions.
diff --git a/src/engine/sparqlExpressions/NaryExpression.h b/src/engine/sparqlExpressions/NaryExpression.h
@@ -42,6 +42,8 @@ SparqlExpression::Ptr makeSqrtExpression(SparqlExpression::Ptr child);
 SparqlExpression::Ptr makeSinExpression(SparqlExpression::Ptr child);
 SparqlExpression::Ptr makeCosExpression(SparqlExpression::Ptr child);
 SparqlExpression::Ptr makeTanExpression(SparqlExpression::Ptr child);
+SparqlExpression::Ptr makePowExpression(SparqlExpression::Ptr child1,
+                                        SparqlExpression::Ptr child2);
 
 SparqlExpression::Ptr makeDistExpression(SparqlExpression::Ptr child1,
                                          SparqlExpression::Ptr child2);

diff --git a/src/engine/sparqlExpressions/NumericBinaryExpressions.cpp b/src/engine/sparqlExpressions/NumericBinaryExpressions.cpp
@@ -2,6 +2,7 @@
 //                  Chair of Algorithms and Data Structures.
 //  Author: Johannes Kalmbach <[email protected]>
 #include "engine/sparqlExpressions/NaryExpressionImpl.h"
+#include "engine/sparqlExpressions/SparqlExpressionValueGetters.h"
 
 namespace sparqlExpression {
 namespace detail {
@@ -33,6 +34,15 @@ inline auto subtract = makeNumericExpression<std::minus<>>();
 NARY_EXPRESSION(SubtractExpression, 2,
                 FV<decltype(subtract), NumericValueGetter>);
 
+// Power
+struct powOp {
+  constexpr double operator()(const double base, const double exp) {
+    return std::pow(base, exp);
+  }
+};
+inline auto pow = makeNumericExpression<powOp>();
+NARY_EXPRESSION(PowExpression, 2, FV<decltype(pow), NumericValueGetter>);
+
 // Or
 inline auto orLambda = [](TernaryBool a, TernaryBool b) {
   using enum TernaryBool;
@@ -96,4 +106,9 @@ SparqlExpression::Ptr makeOrExpression(SparqlExpression::Ptr child1,
                                        SparqlExpression::Ptr child2) {
   return std::make_unique<OrExpression>(std::move(child1), std::move(child2));
 }
+
+SparqlExpression::Ptr makePowExpression(SparqlExpression::Ptr child1,
+                                        SparqlExpression::Ptr child2) {
+  return std::make_unique<PowExpression>(std::move(child1), std::move(child2));
+}
 }  // namespace sparqlExpression
diff --git a/src/parser/sparqlParser/SparqlQleverVisitor.cpp b/src/parser/sparqlParser/SparqlQleverVisitor.cpp
@@ -17,6 +17,7 @@
 #include "engine/sparqlExpressions/CountStarExpression.h"
 #include "engine/sparqlExpressions/GroupConcatExpression.h"
 #include "engine/sparqlExpressions/LiteralExpression.h"
+#include "engine/sparqlExpressions/NaryExpression.h"
 #include "engine/sparqlExpressions/NowDatetimeExpression.h"
 #include "engine/sparqlExpressions/RandomExpression.h"
 #include "engine/sparqlExpressions/RegexExpression.h"
@@ -131,6 +132,10 @@ ExpressionPtr Visitor::processIriFunctionCall(
     } else if (functionName == "tan") {
       checkNumArgs(1);
       return sparqlExpression::makeTanExpression(std::move(argList[0]));
+    } else if (functionName == "pow") {
+      checkNumArgs(2);
+      return sparqlExpression::makePowExpression(std::move(argList[0]),
+                                                 std::move(argList[1]));
     }
   } else if (checkPrefix(XSD_PREFIX)) {
     if (functionName == "integer" || functionName == "int") {

diff --git a/test/SparqlAntlrParserTest.cpp b/test/SparqlAntlrParserTest.cpp
@@ -19,6 +19,7 @@
 #include "engine/sparqlExpressions/CountStarExpression.h"
 #include "engine/sparqlExpressions/GroupConcatExpression.h"
 #include "engine/sparqlExpressions/LiteralExpression.h"
+#include "engine/sparqlExpressions/NaryExpression.h"
 #include "engine/sparqlExpressions/NowDatetimeExpression.h"
 #include "engine/sparqlExpressions/RandomExpression.h"
 #include "engine/sparqlExpressions/RegexExpression.h"
@@ -1669,6 +1670,9 @@ TEST(SparqlParser, FunctionCall) {
                      matchUnary(&makeCosExpression));
   expectFunctionCall(absl::StrCat(math, "tan>(?x)"),
                      matchUnary(&makeTanExpression));
+  expectFunctionCall(
+      absl::StrCat(math, "pow>(?a, ?b)"),
+      matchNary(&makePowExpression, Variable{"?a"}, Variable{"?b"}));
   expectFunctionCall(absl::StrCat(xsd, "int>(?x)"),
                      matchUnary(&makeConvertToIntExpression));
   expectFunctionCall(absl::StrCat(xsd, "integer>(?x)"),

diff --git a/test/SparqlExpressionTest.cpp b/test/SparqlExpressionTest.cpp
@@ -910,6 +910,9 @@ TEST(SparqlExpression, customNumericFunctions) {
   testUnaryExpression<makeTanExpression>(
       std::vector<Id>{I(0), D(1), D(2), D(-1)},
       std::vector<Id>{D(0), D(tan(1)), D(tan(2)), D(tan(-1))});
+  auto checkPow = std::bind_front(testNaryExpression, &makePowExpression);
+  checkPow(Ids{D(1), D(32), U, U}, Ids{I(5), D(2), U, D(0)},
+           IdOrLiteralOrIriVec{I(0), D(5), I(0), lit("abc")});
 }
 
 // ____________________________________________________________________________