Root simplification

fintarin · Jul 3, 2023 · f03a2cc · f03a2cc
1 parent 6d377e0
commit f03a2cc
Show file tree

Hide file tree

Showing 12 changed files with 361 additions and 157 deletions.
diff --git a/include/fintamath/functions/IFunction.hpp b/include/fintamath/functions/IFunction.hpp
@@ -65,8 +65,7 @@ class IFunction : public IMathObject {
 
   static std::unique_ptr<IMathObject> makeExprChecked(const IFunction &function, const ArgumentsRefVector &args);
 
-  // TODO: uncomment
-  // static std::unique_ptr<IMathObject> makeExpr(const IFunction &function, const ArgumentsRefVector &args);
+  static std::unique_ptr<IMathObject> makeExpr(const IFunction &function, const ArgumentsPtrVector &args);
 
   static bool isExpression(const ArgumentRef &arg);
 

diff --git a/include/fintamath/functions/powers/Root.hpp b/include/fintamath/functions/powers/Root.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "fintamath/functions/IFunction.hpp"
+#include "fintamath/numbers/INumber.hpp"
+
+namespace fintamath {
+
+class Root : public IFunctionCRTP<INumber, Root, INumber, INumber> {
+public:
+  Root() = default;
+
+  std::string toString() const override {
+    return "root";
+  }
+
+protected:
+  std::unique_ptr<IMathObject> call(const ArgumentsRefVector &argsVect) const override;
+};
+
+}
diff --git a/include/fintamath/numbers/IntegerFunctions.hpp b/include/fintamath/numbers/IntegerFunctions.hpp
@@ -48,6 +48,8 @@ Integer factorial(const Integer &rhs);
 
 Integer factorial(const Integer &rhs, size_t order);
 
+std::map<Integer, Integer> factors(Integer rhs, Integer limit = -1);
+
 Integer combinations(const Integer &totalNumber, const Integer &choosedNumber);
 
 Integer multinomialCoefficient(const Integer &totalNumber, const std::vector<Integer> &groupNumbers);

diff --git a/src/fintamath/config/ExpressionConfig.cpp b/src/fintamath/config/ExpressionConfig.cpp
@@ -57,6 +57,7 @@
 #include "fintamath/functions/other/Rad.hpp"
 #include "fintamath/functions/powers/Exp.hpp"
 #include "fintamath/functions/powers/Pow.hpp"
+#include "fintamath/functions/powers/Root.hpp"
 #include "fintamath/functions/powers/Sqrt.hpp"
 #include "fintamath/functions/trigonometry/Acos.hpp"
 #include "fintamath/functions/trigonometry/Acot.hpp"
@@ -308,6 +309,11 @@ struct ExpressionConfig {
       return makeExpr(Pow(), args.front(), std::make_shared<Rational>(1, 2));
     });
 
+    // TODO! uncomment
+    // Expression::registerFunctionExpressionMaker<Root>([](const ArgumentsPtrVector &args) {
+    //   return makeExpr(Pow(), args.front(), makeExpr(Div(), std::make_shared<Integer>(1), args.back()));
+    // });
+
     Expression::registerFunctionExpressionMaker<Sin>([](const ArgumentsPtrVector &args) {
       return std::make_shared<TrigonometryExpression>(Sin(), args.front());
     });

diff --git a/src/fintamath/config/FunctionConfig.cpp b/src/fintamath/config/FunctionConfig.cpp
@@ -9,10 +9,9 @@ std::unique_ptr<IMathObject> IFunction::makeExprChecked(const IFunction &functio
   return fintamath::makeExprChecked(function, args);
 }
 
-// TODO: uncomment
-// std::unique_ptr<IMathObject> IFunction::makeExpr(const IFunction &function, const ArgumentsRefVector &args) {
-//   return fintamath::makeExpr(function, args);
-// }
+std::unique_ptr<IMathObject> IFunction::makeExpr(const IFunction &function, const ArgumentsPtrVector &args) {
+  return fintamath::makeExpr(function, args)->clone();
+}
 
 bool IFunction::isExpression(const ArgumentRef &arg) {
   return is<IExpression>(arg);

diff --git a/src/fintamath/config/ParserConfig.cpp b/src/fintamath/config/ParserConfig.cpp
@@ -49,6 +49,7 @@
 #include "fintamath/functions/other/Rad.hpp"
 #include "fintamath/functions/powers/Exp.hpp"
 #include "fintamath/functions/powers/Pow.hpp"
+#include "fintamath/functions/powers/Root.hpp"
 #include "fintamath/functions/powers/Sqrt.hpp"
 #include "fintamath/functions/trigonometry/Acos.hpp"
 #include "fintamath/functions/trigonometry/Acot.hpp"
@@ -172,6 +173,7 @@ struct ParserConfig {
     IFunction::registerType<Lg>();
     IFunction::registerType<Exp>();
     IFunction::registerType<Sqrt>();
+    IFunction::registerType<Root>();
     IFunction::registerType<Sin>();
     IFunction::registerType<Cos>();
     IFunction::registerType<Tan>();