Renaming

fintarin · Apr 4, 2024 · 75deec2 · 75deec2
1 parent 517ed38
commit 75deec2
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 31 deletions.
diff --git a/include/fintamath/expressions/IExpression.hpp b/include/fintamath/expressions/IExpression.hpp
@@ -42,7 +42,7 @@ class IExpression : public IMathObject {
 
   virtual ArgumentPtr postSimplify() const;
 
-  virtual ArgumentPtr approximateSimplify() const;
+  virtual ArgumentPtr approximate() const;
 
   virtual ArgumentPtr setPrecision(unsigned precision, const Integer &maxInt) const;
 
@@ -52,7 +52,7 @@ class IExpression : public IMathObject {
 
   static void postSimplifyChild(ArgumentPtr &child);
 
-  static void approximateSimplifyChild(ArgumentPtr &child);
+  static void approximateChild(ArgumentPtr &child);
 
   static void setPrecisionChild(ArgumentPtr &child, unsigned precision, const Integer &maxInt);
 

diff --git a/src/fintamath/expressions/Expression.cpp b/src/fintamath/expressions/Expression.cpp
@@ -70,7 +70,7 @@ Expression approximate(const Expression &rhs, const unsigned precision) {
   });
 
   Expression approxExpr = rhs;
-  Expression::approximateSimplifyChild(approxExpr.child);
+  Expression::approximateChild(approxExpr.child);
   Expression::setPrecisionChild(approxExpr.child, precision, cache[precision]);
   approxExpr.updateStringMutable();
 

diff --git a/src/fintamath/expressions/IExpression.cpp b/src/fintamath/expressions/IExpression.cpp
@@ -133,12 +133,12 @@ void IExpression::postSimplifyChild(ArgumentPtr &child) {
   }
 }
 
-void IExpression::approximateSimplifyChild(ArgumentPtr &child) {
+void IExpression::approximateChild(ArgumentPtr &child) {
   if (const auto constChild = cast<IConstant>(child)) {
     child = (*constChild)();
   }
   else if (const auto exprChild = cast<IExpression>(child)) {
-    child = exprChild->approximateSimplify();
+    child = exprChild->approximate();
   }
 }
 
@@ -292,11 +292,11 @@ ArgumentPtr IExpression::postSimplify() const {
   return {};
 }
 
-ArgumentPtr IExpression::approximateSimplify() const {
+ArgumentPtr IExpression::approximate() const {
   ArgumentPtr simpl = simplify();
 
   if (!is<IExpression>(simpl)) {
-    approximateSimplifyChild(simpl);
+    approximateChild(simpl);
     return simpl;
   }
 
@@ -307,7 +307,7 @@ ArgumentPtr IExpression::approximateSimplify() const {
   size_t numberChildrenCount = 0;
 
   for (auto &child : approxChildren) {
-    approximateSimplifyChild(child);
+    approximateChild(child);
 
     if (const auto childNum = cast<INumber>(child)) {
       numberChildrenCount++;

diff --git a/src/fintamath/expressions/binary/CompExpr.cpp b/src/fintamath/expressions/binary/CompExpr.cpp
@@ -229,7 +229,7 @@ ArgumentPtr CompExpr::rateSimplify(const IFunction &func, const ArgumentPtr &lhs
   ArgumentPtr newLhs = makePolynom(Add{}, std::move(children));
   simplifyChild(newLhs);
 
-  approximateSimplifyChild(rate);
+  approximateChild(rate);
   if (isNegativeNumber(rate)) {
     return makeExpr(*cast<IFunction>(getOppositeFunction(func)), newLhs, rhs);
   }
@@ -243,7 +243,7 @@ ArgumentPtr CompExpr::approxSimplify(const IFunction &func, const ArgumentPtr &l
   }
 
   ArgumentPtr approxLhs = lhs;
-  approximateSimplifyChild(approxLhs);
+  approximateChild(approxLhs);
   if (!is<INumber>(approxLhs)) {
     return {};
   }

diff --git a/src/fintamath/expressions/binary/LogExpr.cpp b/src/fintamath/expressions/binary/LogExpr.cpp
@@ -46,21 +46,21 @@ const std::shared_ptr<IFunction> &LogExpr::getOutputFunction() const {
   return IBinaryExpression::getFunction();
 }
 
-ArgumentPtr LogExpr::approximateSimplify() const {
+ArgumentPtr LogExpr::approximate() const {
   if (*lhsChild == E{}) {
     const auto approxExpr = cast<LogExpr>(clone());
-    approximateSimplifyChild(approxExpr->rhsChild);
+    approximateChild(approxExpr->rhsChild);
 
     if (is<INumber>(approxExpr->rhsChild)) {
-      if (const auto res = cast<INumber>(approxExpr->IBinaryExpression::approximateSimplify())) {
+      if (const auto res = cast<INumber>(approxExpr->IBinaryExpression::approximate())) {
         return res;
       }
     }
 
     return approxExpr->simplify();
   }
 
-  return IBinaryExpression::approximateSimplify();
+  return IBinaryExpression::approximate();
 }
 
 ArgumentPtr LogExpr::setPrecision(const unsigned precision, const Integer &maxInt) const {

diff --git a/src/fintamath/expressions/binary/LogExpr.hpp b/src/fintamath/expressions/binary/LogExpr.hpp
@@ -22,7 +22,7 @@ class LogExpr final : public IBinaryExpressionCRTP<LogExpr> {
   const std::shared_ptr<IFunction> &getOutputFunction() const override;
 
 protected:
-  ArgumentPtr approximateSimplify() const override;
+  ArgumentPtr approximate() const override;
 
   ArgumentPtr setPrecision(unsigned precision, const Integer &maxInt) const override;
 

diff --git a/src/fintamath/expressions/binary/PowExpr.cpp b/src/fintamath/expressions/binary/PowExpr.cpp
@@ -96,19 +96,19 @@ const std::shared_ptr<IFunction> &PowExpr::getOutputFunction() const {
   return IBinaryExpression::getFunction();
 }
 
-ArgumentPtr PowExpr::approximateSimplify() const {
+ArgumentPtr PowExpr::approximate() const {
   if (const auto ratRhsChild = cast<Rational>(rhsChild); ratRhsChild && ratRhsChild->denominator() <= maxPreciseRoot) {
     auto approxExpr = cast<PowExpr>(clone());
-    approximateSimplifyChild(approxExpr->lhsChild);
+    approximateChild(approxExpr->lhsChild);
 
     if (is<INumber>(approxExpr->lhsChild)) {
-      return approxExpr->IBinaryExpression::approximateSimplify();
+      return approxExpr->IBinaryExpression::approximate();
     }
 
     return approxExpr;
   }
 
-  return IBinaryExpression::approximateSimplify();
+  return IBinaryExpression::approximate();
 }
 
 ArgumentPtr PowExpr::setPrecision(const unsigned precision, const Integer &maxInt) const {
@@ -251,7 +251,7 @@ ArgumentPtr PowExpr::constSimplify(const IFunction & /*func*/, const ArgumentPtr
 
     if (!containsVariable(lhs)) {
       ArgumentPtr approxLhs = lhs;
-      approximateSimplifyChild(approxLhs);
+      approximateChild(approxLhs);
 
       if (const auto lhsNum = cast<INumber>(approxLhs)) {
         if (lhsNum->isComplex()) {
@@ -300,7 +300,7 @@ ArgumentPtr PowExpr::constSimplify(const IFunction & /*func*/, const ArgumentPtr
   if (is<Inf>(lhs) || is<ComplexInf>(lhs)) {
     if (!containsVariable(rhs)) {
       ArgumentPtr approxRhs = rhs;
-      approximateSimplifyChild(approxRhs);
+      approximateChild(approxRhs);
 
       if (const auto rhsComplex = cast<Complex>(approxRhs)) {
         if (rhsComplex->real() == Integer(0)) {

diff --git a/src/fintamath/expressions/binary/PowExpr.hpp b/src/fintamath/expressions/binary/PowExpr.hpp
@@ -23,7 +23,7 @@ class PowExpr final : public IBinaryExpressionCRTP<PowExpr> {
   const std::shared_ptr<IFunction> &getOutputFunction() const override;
 
 protected:
-  ArgumentPtr approximateSimplify() const override;
+  ArgumentPtr approximate() const override;
 
   ArgumentPtr setPrecision(unsigned precision, const Integer &maxInt) const override;
 

diff --git a/src/fintamath/expressions/unary/FloorCeilExpr.cpp b/src/fintamath/expressions/unary/FloorCeilExpr.cpp
@@ -27,18 +27,18 @@ FloorCeilExpr::FloorCeilExpr(const IFunction &inFunc, ArgumentPtr inChild)
 FloorCeilExpr::SimplifyFunctionVector FloorCeilExpr::getFunctionsForPostSimplify() const {
   static const SimplifyFunctionVector simplifyFunctions = {
       &FloorCeilExpr::negSimplify,
-      &FloorCeilExpr::intApproximateSimplify,
+      &FloorCeilExpr::intapproximate,
   };
   return simplifyFunctions;
 }
 
-ArgumentPtr FloorCeilExpr::intApproximateSimplify(const IFunction &func, const ArgumentPtr &rhs) {
+ArgumentPtr FloorCeilExpr::intapproximate(const IFunction &func, const ArgumentPtr &rhs) {
   if (containsVariable(rhs)) {
     return {};
   }
 
   ArgumentPtr approx = rhs->clone();
-  approximateSimplifyChild(approx);
+  approximateChild(approx);
 
   if (auto res = cast<INumber>(callFunction(func, {approx}))) {
     return res;

diff --git a/src/fintamath/expressions/unary/FloorCeilExpr.hpp b/src/fintamath/expressions/unary/FloorCeilExpr.hpp
@@ -21,7 +21,7 @@ class FloorCeilExpr final : public IUnaryExpressionCRTP<FloorCeilExpr> {
   SimplifyFunctionVector getFunctionsForPostSimplify() const override;
 
 private:
-  static ArgumentPtr intApproximateSimplify(const IFunction &func, const ArgumentPtr &rhs);
+  static ArgumentPtr intapproximate(const IFunction &func, const ArgumentPtr &rhs);
 
   static ArgumentPtr negSimplify(const IFunction &func, const ArgumentPtr &rhs);
 

diff --git a/src/fintamath/expressions/unary/SignExpr.cpp b/src/fintamath/expressions/unary/SignExpr.cpp
@@ -26,7 +26,7 @@ SignExpr::SimplifyFunctionVector SignExpr::getFunctionsForPostSimplify() const {
   static const SimplifyFunctionVector simplifyFunctions = {
       &SignExpr::constSimplify,
       &SignExpr::negSimplify,
-      &SignExpr::intApproximateSimplify,
+      &SignExpr::intapproximate,
   };
   return simplifyFunctions;
 }
@@ -47,13 +47,13 @@ ArgumentPtr SignExpr::constSimplify(const IFunction & /*func*/, const ArgumentPt
   return {};
 }
 
-ArgumentPtr SignExpr::intApproximateSimplify(const IFunction &func, const ArgumentPtr &rhs) {
+ArgumentPtr SignExpr::intapproximate(const IFunction &func, const ArgumentPtr &rhs) {
   if (containsVariable(rhs)) {
     return {};
   }
 
   ArgumentPtr approx = rhs->clone();
-  approximateSimplifyChild(approx);
+  approximateChild(approx);
 
   if (const auto approxNum = cast<INumber>(approx); approxNum && !approxNum->isComplex()) {
     return callFunction(func, {approx});

diff --git a/src/fintamath/expressions/unary/SignExpr.hpp b/src/fintamath/expressions/unary/SignExpr.hpp
@@ -19,7 +19,7 @@ class SignExpr final : public IUnaryExpressionCRTP<SignExpr> {
 private:
   static ArgumentPtr constSimplify(const IFunction &func, const ArgumentPtr &rhs);
 
-  static ArgumentPtr intApproximateSimplify(const IFunction &func, const ArgumentPtr &rhs);
+  static ArgumentPtr intapproximate(const IFunction &func, const ArgumentPtr &rhs);
 
   static ArgumentPtr negSimplify(const IFunction &func, const ArgumentPtr &rhs);
 };

diff --git a/tests/src/expressions/IExpressionTests.cpp b/tests/src/expressions/IExpressionTests.cpp
@@ -42,7 +42,7 @@ class TestExpression final : public IExpressionCRTP<TestExpression> {
     return clone();
   }
 
-  ArgumentPtr approximateSimplify() const override {
+  ArgumentPtr approximate() const override {
     return clone();
   }
 };