Improve coverage & fixes

fintarin · Aug 26, 2023 · 07bc0c2 · 07bc0c2
1 parent d6c6524
commit 07bc0c2
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 26 deletions.
diff --git a/include/fintamath/expressions/interfaces/IPolynomExpression.hpp b/include/fintamath/expressions/interfaces/IPolynomExpression.hpp
@@ -43,7 +43,7 @@ class IPolynomExpression : public IExpression {
 
   virtual SimplifyFunctionsVector getFunctionsForPostSimplify() const;
 
-  virtual std::string childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const;
+  virtual std::string childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const;
 
   /**
    * @brief

diff --git a/src/fintamath/expressions/binary/CompExpression.cpp b/src/fintamath/expressions/binary/CompExpression.cpp
@@ -55,7 +55,8 @@ ArgumentPtr CompExpression::preSimplify() const {
     if (!simplExpr->isSolution &&
         (!is<Integer>(rhsChild) || *rhsChild != Integer(0))) {
 
-      if (*func != Eqv() && *func != Neqv() &&
+      if (*func != Eqv() &&
+          *func != Neqv() &&
           (hasComplex(lhsChild) || hasComplex(rhsChild))) {
 
         return simpl;
@@ -153,6 +154,13 @@ ArgumentPtr CompExpression::coeffSimplify(const IFunction &func, const ArgumentP
     return {};
   }
 
+  if (func != Eqv() &&
+      func != Neqv() &&
+      (hasComplex(lhs) || hasComplex(rhs))) {
+
+    return {};
+  }
+
   ArgumentsPtrVector dividendPolynom;
   ArgumentPtr polynomFirstChild;
 

diff --git a/src/fintamath/expressions/interfaces/IPolynomExpression.cpp b/src/fintamath/expressions/interfaces/IPolynomExpression.cpp
@@ -20,16 +20,17 @@ ArgumentsPtrVector IPolynomExpression::getChildren() const {
 }
 
 std::string IPolynomExpression::toString() const {
-  if (!is<IOperator>(func)) {
+  const auto oper = cast<IOperator>(func);
+  if (!oper) {
     return functionToString(*func, children);
   }
 
   std::string result;
 
-  result += childToString(children.front(), {});
+  result += childToString(*oper, children.front(), {});
 
   for (size_t i = 1; i < children.size(); i++) {
-    result += childToString(children[i], children[i - 1]);
+    result += childToString(*oper, children[i], children[i - 1]);
   }
 
   return result;
@@ -180,15 +181,8 @@ ArgumentPtr IPolynomExpression::preciseSimplify() const {
   return preciseExpr;
 }
 
-std::string IPolynomExpression::childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
-  std::string childStr;
-  if (const auto oper = cast<IOperator>(func)) {
-    childStr = operatorChildToString(*oper, inChild);
-  }
-  else {
-    childStr = inChild->toString();
-  }
-
+std::string IPolynomExpression::childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
+  std::string childStr = operatorChildToString(oper, inChild);
   return prevChild ? (putInSpaces(func->toString()) + childStr) : childStr;
 }
 

diff --git a/src/fintamath/expressions/polynomial/AddExpression.cpp b/src/fintamath/expressions/polynomial/AddExpression.cpp
@@ -22,8 +22,8 @@ AddExpression::AddExpression(const ArgumentsPtrVector &inChildren)
     : IPolynomExpressionCRTP(Add(), inChildren) {
 }
 
-std::string AddExpression::childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
-  std::string result = operatorChildToString(Add(), inChild);
+std::string AddExpression::childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
+  std::string result = operatorChildToString(oper, inChild);
   bool isChildNegated = false;
 
   if (result.size() > 1 &&
@@ -39,7 +39,7 @@ std::string AddExpression::childToString(const ArgumentPtr &inChild, const Argum
     funcStr = Sub().toString();
   }
   else if (prevChild) {
-    funcStr = Add().toString();
+    funcStr = oper.toString();
   }
 
   if (!funcStr.empty()) {

diff --git a/src/fintamath/expressions/polynomial/AddExpression.hpp b/src/fintamath/expressions/polynomial/AddExpression.hpp
@@ -17,7 +17,7 @@ class AddExpression : public IPolynomExpressionCRTP<AddExpression> {
 
   SimplifyFunctionsVector getFunctionsForPostSimplify() const override;
 
-  std::string childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
+  std::string childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
 
   /**
    * @brief

diff --git a/src/fintamath/expressions/polynomial/MulExpression.cpp b/src/fintamath/expressions/polynomial/MulExpression.cpp
@@ -50,22 +50,22 @@ std::string MulExpression::toString() const {
   return IPolynomExpression::toString();
 }
 
-std::string MulExpression::childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
+std::string MulExpression::childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
   if (!prevChild && *inChild == Integer(-1)) {
     return Neg().toString();
   }
 
   std::string operStr;
   if (prevChild && *prevChild != Integer(-1)) {
     if (is<INumber>(inChild) && is<INumber>(prevChild)) {
-      operStr = "*";
+      operStr = oper.toString();
     }
     else {
       operStr = " ";
     }
   }
 
-  return operStr + operatorChildToString(Mul(), inChild);
+  return operStr + operatorChildToString(oper, inChild);
 }
 
 MulExpression::SimplifyFunctionsVector MulExpression::getFunctionsForPreSimplify() const {

diff --git a/src/fintamath/expressions/polynomial/MulExpression.hpp b/src/fintamath/expressions/polynomial/MulExpression.hpp
@@ -14,7 +14,7 @@ class MulExpression : public IPolynomExpressionCRTP<MulExpression> {
   }
 
 protected:
-  std::string childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
+  std::string childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
 
   SimplifyFunctionsVector getFunctionsForPreSimplify() const override;
 

diff --git a/src/fintamath/expressions/polynomial/OrExpression.cpp b/src/fintamath/expressions/polynomial/OrExpression.cpp
@@ -11,8 +11,8 @@ OrExpression::OrExpression(const ArgumentsPtrVector &inChildren)
     : IPolynomExpressionCRTP(Or(), inChildren) {
 }
 
-std::string OrExpression::childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
-  std::string result = operatorChildToString(Or(), inChild);
+std::string OrExpression::childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
+  std::string result = operatorChildToString(oper, inChild);
 
   if (const auto &childExpr = cast<IExpression>(inChild);
       childExpr && is<And>(childExpr->getFunction())) {

diff --git a/src/fintamath/expressions/polynomial/OrExpression.hpp b/src/fintamath/expressions/polynomial/OrExpression.hpp
@@ -13,7 +13,7 @@ class OrExpression : public IPolynomExpressionCRTP<OrExpression> {
   }
 
 protected:
-  std::string childToString(const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
+  std::string childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const override;
 
   ArgumentPtr postSimplify() const override;
 

diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp
@@ -978,26 +978,31 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("I = I").toString(), "True");
   EXPECT_EQ(Expression("I = 2 I").toString(), "False");
   EXPECT_EQ(Expression("I = I x").toString(), "x - 1 = 0");
+  EXPECT_EQ(Expression("I x = I").toString(), "x - 1 = 0");
 
   EXPECT_EQ(Expression("I != I").toString(), "False");
   EXPECT_EQ(Expression("I != 2 I").toString(), "True");
   EXPECT_EQ(Expression("I != I x").toString(), "x - 1 != 0");
+  EXPECT_EQ(Expression("I x != I").toString(), "x - 1 != 0");
 
   EXPECT_EQ(Expression("I < I").toString(), "I < I");
   EXPECT_EQ(Expression("I < 2 I").toString(), "I < 2 I");
   EXPECT_EQ(Expression("I < I x").toString(), "I < I x");
+  EXPECT_EQ(Expression("I x < I").toString(), "I x < I");
 
   EXPECT_EQ(Expression("I > I").toString(), "I > I");
   EXPECT_EQ(Expression("I > 2 I").toString(), "I > 2 I");
-  EXPECT_EQ(Expression("I > I x").toString(), "I > I x");
+  EXPECT_EQ(Expression("I x > I").toString(), "I x > I");
 
   EXPECT_EQ(Expression("I <= I").toString(), "I <= I");
   EXPECT_EQ(Expression("I <= 2 I").toString(), "I <= 2 I");
   EXPECT_EQ(Expression("I <= I x").toString(), "I <= I x");
+  EXPECT_EQ(Expression("I x <= I").toString(), "I x <= I");
 
   EXPECT_EQ(Expression("I >= I").toString(), "I >= I");
   EXPECT_EQ(Expression("I >= 2 I").toString(), "I >= 2 I");
   EXPECT_EQ(Expression("I >= I x").toString(), "I >= I x");
+  EXPECT_EQ(Expression("I x >= I").toString(), "I x >= I");
 
   EXPECT_EQ(Expression("x (2 + I)").toString(), "(2 + I) x");                         // TODO! simplify
   EXPECT_EQ(Expression("sqrt(3) (2/3 + 1/2 I)").toString(), "(2/3 + 1/2 I) sqrt(3)"); // TODO! simplify

diff --git a/tests/src/functions/hyperbolic/AcoshTests.cpp b/tests/src/functions/hyperbolic/AcoshTests.cpp
@@ -39,6 +39,8 @@ TEST(AcoshTests, callTest) {
 
   EXPECT_EQ(f(Complex(1, 1))->toString(), "acosh(1 + I)");
 
+  EXPECT_EQ(f(Integer(-2))->toString(), "acosh(-2)");
+
   EXPECT_EQ(f(Variable("a"))->toString(), "acosh(a)");
 
   EXPECT_THROW(f(), InvalidInputFunctionException);

diff --git a/tests/src/functions/hyperbolic/AcothTests.cpp b/tests/src/functions/hyperbolic/AcothTests.cpp
@@ -39,6 +39,8 @@ TEST(AcothTests, callTest) {
 
   EXPECT_EQ(f(Complex(1, 1))->toString(), "acoth(1 + I)");
 
+  EXPECT_EQ(f(Real("0.5"))->toString(), "acoth(0.5)");
+
   EXPECT_EQ(f(Variable("a"))->toString(), "acoth(a)");
 
   EXPECT_THROW(f(), InvalidInputFunctionException);

diff --git a/tests/src/functions/logarithms/LogTests.cpp b/tests/src/functions/logarithms/LogTests.cpp
@@ -74,6 +74,7 @@ TEST(LogTests, callTest) {
 
   EXPECT_EQ(f(Integer(-10), Integer(10))->toString(), "log(-10, 10)");
   EXPECT_EQ(f(Integer(10), Integer(-10))->toString(), "log(10, -10)");
+  EXPECT_EQ(f(Real("-10.2"), Integer(-10))->toString(), "log(-10.2, -10)");
 
   EXPECT_EQ(f(Variable("a"), Variable("b"))->toString(), "log(a, b)");