Fix precise of complex numbers

fintarin · Aug 26, 2023 · f65e47f · f65e47f
1 parent de7c14b
commit f65e47f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/fintamath/expressions/IExpression.cpp b/src/fintamath/expressions/IExpression.cpp
@@ -6,6 +6,7 @@
 #include "fintamath/literals/Variable.hpp"
 #include "fintamath/literals/constants/IConstant.hpp"
 #include "fintamath/literals/constants/Undefined.hpp"
+#include "fintamath/numbers/Complex.hpp"
 #include "fintamath/numbers/INumber.hpp"
 #include "fintamath/numbers/Real.hpp"
 
@@ -115,7 +116,13 @@ void IExpression::preciseSimplifyChild(ArgumentPtr &child) {
     child = exprChild->preciseSimplify();
   }
   else if (const auto numChild = cast<INumber>(child)) {
-    child = convert<Real>(*numChild);
+    // TODO! use multimethod
+    if (const auto complexChild = cast<Complex>(numChild)) {
+      child = Complex(*convert<Real>(complexChild->real()), *convert<Real>(complexChild->imag())).clone();
+    }
+    else {
+      child = convert<Real>(*numChild);
+    }
   }
   else if (const auto constChild = cast<IConstant>(child)) {
     child = (*constChild)();

diff --git a/src/fintamath/numbers/Complex.cpp b/src/fintamath/numbers/Complex.cpp
@@ -74,7 +74,7 @@ std::string Complex::toString() const {
       isImNeg = true;
     }
 
-    if (imStr == "1") {
+    if (*im == Integer(1) || *im == Integer(-1)) {
       imStr.clear();
     }
     else {

diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp
@@ -1598,6 +1598,19 @@ TEST(ExpressionTests, preciseTest) {
   EXPECT_EQ(Expression("(1/1000000000000000000000000000000000000000)!!").precise().toString(), "(1.0*10^-39)!!");
   EXPECT_EQ(Expression("(-1)!!").precise().toString(), "(-1.0)!!");
 
+  EXPECT_EQ(Expression("I").precise().toString(), "I");
+  EXPECT_EQ(Expression("5 + I").precise().toString(), "5.0 + I");
+  EXPECT_EQ(Expression("5 I").precise().toString(), "5.0 I");
+  EXPECT_EQ(Expression("5 + 5 I").precise().toString(), "5.0 + 5.0 I");
+  EXPECT_EQ(Expression("5/I").precise().toString(), "-5.0 I");
+  EXPECT_EQ(Expression("E/I").precise().toString(), "-2.7182818284590452353602874713526624977572470936999595749669676277240766303535476 I");
+  EXPECT_EQ(Expression("-I").precise().toString(), "-I");
+  EXPECT_EQ(Expression("5 - I").precise().toString(), "5.0 - I");
+  EXPECT_EQ(Expression("5 -I").precise().toString(), "5.0 - I");
+  EXPECT_EQ(Expression("5 - 5 I").precise().toString(), "5.0 - 5.0 I");
+  EXPECT_EQ(Expression("5/-I").precise().toString(), "5.0 I");
+  EXPECT_EQ(Expression("E/-I").precise().toString(), "2.7182818284590452353602874713526624977572470936999595749669676277240766303535476 I");
+
   EXPECT_EQ(Expression("10^10000").precise(8).toString(), "1.0*10^10000");
   EXPECT_EQ(Expression("x+E").precise(8).toString(), "x + 2.7182818");
   EXPECT_EQ(Expression("x^(100!)").precise(8).toString(), "x^(9.3326215*10^157)");