Add new functions and rework operators

fintarin · Feb 24, 2024 · 3c7dc43 · 3c7dc43
1 parent df8c9d6
commit 3c7dc43
Show file tree

Hide file tree

Showing 49 changed files with 545 additions and 325 deletions.
diff --git a/include/fintamath/core/MathObjectType.hpp b/include/fintamath/core/MathObjectType.hpp
@@ -79,15 +79,22 @@ struct MathObjectType final {
 
     IFunction = 11000,
 
-    Abs,
-    Log,
-    Ln,
-    Lb,
-    Lg,
+    Add,
+    Sub,
+    Mul,
+    Div,
+    Frac,
+    FracMixed,
+    Neg,
+    Pow,
     Exp,
     Sqr,
     Sqrt,
     Root,
+    Log,
+    Ln,
+    Lb,
+    Lg,
     Sin,
     Cos,
     Tan,
@@ -113,27 +120,14 @@ struct MathObjectType final {
     Acoth,
     Asech,
     Acsch,
+    Abs,
+    Factorial,
+    Floor,
+    Ceil,
     Min,
     Max,
     Derivative,
     Integral,
-    Frac,
-    FracMixed,
-    PowFunction,
-    Floor,
-    Ceil,
-
-    IOperator = 12000,
-
-    Add,
-    Sub,
-    Mul,
-    Div,
-    Neg,
-    UnaryPlus,
-    Factorial,
-    Percent,
-    Pow,
     Eqv,
     Neqv,
     Less,
@@ -146,10 +140,34 @@ struct MathObjectType final {
     Impl,
     Equiv,
     Nequiv,
-    Index,
-    Deg,
-    Comma,
-    Mod,
+
+    IOperator = 12000,
+
+    AddOper,
+    SubOper,
+    MulOper,
+    DivOper,
+    NegOper,
+    PlusOper,
+    PowOper,
+    FactorialOper,
+    PercentOper,
+    DegOper,
+    ModOper,
+    EqvOper,
+    NeqvOper,
+    LessOper,
+    MoreOper,
+    LessEqvOper,
+    MoreEqvOper,
+    NotOper,
+    AndOper,
+    OrOper,
+    ImplOper,
+    EquivOper,
+    NequivOper,
+    IndexOper,
+    CommaOper,
 
     None = std::numeric_limits<size_t>::max(),
   };

diff --git a/include/fintamath/expressions/ExpressionUtils.hpp b/include/fintamath/expressions/ExpressionUtils.hpp
@@ -76,6 +76,8 @@ std::pair<ArgumentPtr, ArgumentPtr> splitRational(const ArgumentPtr &arg);
 
 ArgumentPtr negate(const ArgumentPtr &arg);
 
+ArgumentPtr invert(const ArgumentPtr &arg);
+
 ArgumentPtr makePolynom(const IFunction &func, ArgumentPtrVector &&args);
 
 ArgumentPtr makePolynom(const IFunction &func, const ArgumentPtrVector &args);

diff --git a/include/fintamath/functions/arithmetic/Add.hpp b/include/fintamath/functions/arithmetic/Add.hpp
@@ -8,11 +8,32 @@
 #include "fintamath/core/MathObjectType.hpp"
 #include "fintamath/functions/FunctionArguments.hpp"
 #include "fintamath/functions/FunctionUtils.hpp"
+#include "fintamath/functions/IFunction.hpp"
 #include "fintamath/functions/IOperator.hpp"
 
 namespace fintamath {
 
-class Add final : public IOperatorCRTP<IArithmetic, Add, IArithmetic, IArithmetic> {
+class Add final : public IFunctionCRTP<IArithmetic, Add, IArithmetic> {
+public:
+  std::string toString() const override {
+    return "add";
+  }
+
+  static constexpr bool isVariadicStatic() {
+    return true;
+  }
+
+  static constexpr MathObjectType getTypeStatic() {
+    return {MathObjectType::Add, "Add"};
+  }
+
+protected:
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+};
+
+FINTAMATH_FUNCTION_EXPRESSION(Add, addExpr);
+
+class AddOper final : public IOperatorCRTP<IArithmetic, AddOper, IArithmetic, IArithmetic> {
 public:
   std::string toString() const override {
     return "+";
@@ -27,13 +48,13 @@ class Add final : public IOperatorCRTP<IArithmetic, Add, IArithmetic, IArithmeti
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Add, "Add"};
+    return {MathObjectType::AddOper, "AddOper"};
   }
 
 protected:
-  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override{
+    return Add{}(argVect);
+  }
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Add, addExpr);
-
 }
diff --git a/include/fintamath/functions/arithmetic/Div.hpp b/include/fintamath/functions/arithmetic/Div.hpp
@@ -8,14 +8,31 @@
 #include "fintamath/core/MathObjectType.hpp"
 #include "fintamath/functions/FunctionArguments.hpp"
 #include "fintamath/functions/FunctionUtils.hpp"
+#include "fintamath/functions/IFunction.hpp"
 #include "fintamath/functions/IOperator.hpp"
 
 namespace fintamath {
 
 class Integer;
 class INumber;
 
-class Div final : public IOperatorCRTP<IArithmetic, Div, IArithmetic, IArithmetic> {
+class Div final : public IFunctionCRTP<IArithmetic, Div, IArithmetic, IArithmetic> {
+public:
+  std::string toString() const override {
+    return "div";
+  }
+
+  static constexpr MathObjectType getTypeStatic() {
+    return {MathObjectType::Div, "Div"};
+  }
+
+protected:
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+};
+
+FINTAMATH_FUNCTION_EXPRESSION(Div, divExpr);
+
+class DivOper final : public IOperatorCRTP<IArithmetic, DivOper, IArithmetic, IArithmetic> {
 public:
   std::string toString() const override {
     return "/";
@@ -26,13 +43,13 @@ class Div final : public IOperatorCRTP<IArithmetic, Div, IArithmetic, IArithmeti
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Div, "Div"};
+    return {MathObjectType::DivOper, "DivOper"};
   }
 
 protected:
-  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override {
+    return Div{}(argVect);
+  }
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Div, divExpr);
-
 }
diff --git a/include/fintamath/functions/arithmetic/Mul.hpp b/include/fintamath/functions/arithmetic/Mul.hpp
@@ -8,11 +8,32 @@
 #include "fintamath/core/MathObjectType.hpp"
 #include "fintamath/functions/FunctionArguments.hpp"
 #include "fintamath/functions/FunctionUtils.hpp"
+#include "fintamath/functions/IFunction.hpp"
 #include "fintamath/functions/IOperator.hpp"
 
 namespace fintamath {
 
-class Mul final : public IOperatorCRTP<IArithmetic, Mul, IArithmetic, IArithmetic> {
+class Mul final : public IFunctionCRTP<IArithmetic, Mul, IArithmetic> {
+public:
+  std::string toString() const override {
+    return "mul";
+  }
+
+  static constexpr bool isVariadicStatic() {
+    return true;
+  }
+
+  static constexpr MathObjectType getTypeStatic() {
+    return {MathObjectType::Mul, "Mul"};
+  }
+
+protected:
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+};
+
+FINTAMATH_FUNCTION_EXPRESSION(Mul, mulExpr);
+
+class MulOper final : public IOperatorCRTP<IArithmetic, MulOper, IArithmetic, IArithmetic> {
 public:
   std::string toString() const override {
     return "*";
@@ -27,13 +48,13 @@ class Mul final : public IOperatorCRTP<IArithmetic, Mul, IArithmetic, IArithmeti
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Mul, "Mul"};
+    return {MathObjectType::MulOper, "MulOper"};
   }
 
 protected:
-  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override {
+    return Mul{}(argVect);
+  }
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Mul, mulExpr);
-
 }
diff --git a/...tamath/functions/arithmetic/UnaryPlus.hpp → ...ntamath/functions/arithmetic/PlusOper.hpp b/...tamath/functions/arithmetic/UnaryPlus.hpp → ...ntamath/functions/arithmetic/PlusOper.hpp
@@ -11,7 +11,7 @@
 
 namespace fintamath {
 
-class UnaryPlus final : public IOperatorCRTP<IArithmetic, UnaryPlus, IArithmetic> {
+class PlusOper final : public IOperatorCRTP<IArithmetic, PlusOper, IArithmetic> {
 public:
   std::string toString() const override {
     return "+";
@@ -22,7 +22,7 @@ class UnaryPlus final : public IOperatorCRTP<IArithmetic, UnaryPlus, IArithmetic
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::UnaryPlus, "UnaryPlus"};
+    return {MathObjectType::PlusOper, "PlusOper"};
   }
 
 protected:

diff --git a/include/fintamath/functions/ntheory/Mod.hpp b/include/fintamath/functions/ntheory/Mod.hpp
@@ -23,7 +23,7 @@ class Mod final : public IOperatorCRTP<INumber, Mod, INumber, INumber> {
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Mod, "Mod"};
+    return {MathObjectType::ModOper, "ModOper"};
   }
 
 protected:

diff --git a/include/fintamath/functions/other/Comma.hpp b/include/fintamath/functions/other/Comma.hpp
@@ -26,13 +26,11 @@ class Comma final : public IOperatorCRTP<IMathObject, Comma, IMathObject, IMathO
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Comma, "Comma"};
+    return {MathObjectType::CommaOper, "CommaOper"};
   }
 
 protected:
   std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Comma, commaExpr);
-
 }
diff --git a/include/fintamath/functions/other/Deg.hpp b/include/fintamath/functions/other/Deg.hpp
@@ -23,13 +23,11 @@ class Deg final : public IOperatorCRTP<INumber, Deg, INumber> {
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Deg, "Deg"};
+    return {MathObjectType::DegOper, "DegOper"};
   }
 
 protected:
   std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Deg, degExpr);
-
 }
diff --git a/include/fintamath/functions/other/Index.hpp b/include/fintamath/functions/other/Index.hpp
@@ -24,13 +24,11 @@ class Index final : public IOperatorCRTP<Variable, Index, Variable, Integer> {
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Index, "Index"};
+    return {MathObjectType::IndexOper, "IndexOper"};
   }
 
 protected:
   std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Index, indexExpr);
-
 }
diff --git a/include/fintamath/functions/other/Percent.hpp b/include/fintamath/functions/other/Percent.hpp
@@ -23,13 +23,11 @@ class Percent final : public IOperatorCRTP<INumber, Percent, INumber> {
   }
 
   static constexpr MathObjectType getTypeStatic() {
-    return {MathObjectType::Percent, "Percent"};
+    return {MathObjectType::PercentOper, "PercentOper"};
   }
 
 protected:
   std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override;
 };
 
-FINTAMATH_FUNCTION_EXPRESSION(Percent, percentExpr);
-
 }
diff --git a/include/fintamath/functions/powers/Pow.hpp b/include/fintamath/functions/powers/Pow.hpp
@@ -17,14 +17,10 @@ class Rational;
 class Real;
 class Complex;
 
-class Pow final : public IOperatorCRTP<INumber, Pow, INumber, INumber> {
+class Pow final : public IFunctionCRTP<INumber, Pow, INumber, INumber> {
 public:
   std::string toString() const override {
-    return "^";
-  }
-
-  static constexpr Priority getPriorityStatic() {
-    return Priority::Exponentiation;
+    return "pow";
   }
 
   static constexpr MathObjectType getTypeStatic() {
@@ -48,4 +44,24 @@ class Pow final : public IOperatorCRTP<INumber, Pow, INumber, INumber> {
 
 FINTAMATH_FUNCTION_EXPRESSION(Pow, powExpr);
 
+class PowOper final : public IOperatorCRTP<IArithmetic, PowOper, IArithmetic, IArithmetic> {
+public:
+  std::string toString() const override {
+    return "^";
+  }
+
+  static constexpr Priority getPriorityStatic() {
+    return Priority::Exponentiation;
+  }
+
+  static constexpr MathObjectType getTypeStatic() {
+    return {MathObjectType::PowOper, "PowOper"};
+  }
+
+protected:
+  std::unique_ptr<IMathObject> call(const ArgumentRefVector &argVect) const override {
+    return Pow{}(argVect);
+  }
+};
+
 }