Fix constants

fintarin · Jul 5, 2023 · 560b115 · 560b115
1 parent 2cce30e
commit 560b115
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/include/fintamath/expressions/IExpression.hpp b/include/fintamath/expressions/IExpression.hpp
@@ -57,11 +57,10 @@ class IExpression : public IArithmetic {
 
   static void preciseSimplifyChild(ArgumentPtr &child);
 
-  static ArgumentPtr callFunction(const IFunction &func, const ArgumentsPtrVector &argPtrs);
-
-private:
   static void simplifyConstant(ArgumentPtr &child);
 
+  static ArgumentPtr callFunction(const IFunction &func, const ArgumentsPtrVector &argPtrs);
+
 private:
   static Parser::Vector<std::unique_ptr<IExpression>, const std::string &> &getParser();
 };

diff --git a/src/fintamath/expressions/IExpression.cpp b/src/fintamath/expressions/IExpression.cpp
@@ -89,6 +89,8 @@ void IExpression::simplifyChild(ArgumentPtr &child) {
       child = simplObj;
     }
   }
+
+  simplifyConstant(child);
 }
 
 void IExpression::preSimplifyChild(ArgumentPtr &child) {
@@ -97,8 +99,6 @@ void IExpression::preSimplifyChild(ArgumentPtr &child) {
       child = simplObj;
     }
   }
-
-  simplifyConstant(child);
 }
 
 void IExpression::postSimplifyChild(ArgumentPtr &child) {
@@ -107,8 +107,6 @@ void IExpression::postSimplifyChild(ArgumentPtr &child) {
       child = simplObj;
     }
   }
-
-  simplifyConstant(child);
 }
 
 void IExpression::preciseSimplifyChild(ArgumentPtr &child) {

diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp
@@ -130,6 +130,8 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("2^(2/3) 1/7^(2/3) 3^(3/4)").toString(),
             "(root(27, 4) root(4, 3))/root(49, 3)"); // TODO! root(27, 4) root(4/49, 3)
 
+  EXPECT_EQ(Expression("Deg").toString(), "1/180 Pi");
+  EXPECT_EQ(Expression("60Deg").toString(), "1/3 Pi");
   EXPECT_EQ(Expression("E").toString(), "E");
   EXPECT_EQ(Expression("Pi").toString(), "Pi");
   EXPECT_EQ(Expression("E^101-E^101").toString(), "0");