Improve coverage

fintarin · Jul 18, 2023 · b834eae · b834eae
1 parent c3a03f3
commit b834eae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/fintamath/expressions/interfaces/IPolynomExpression.cpp b/src/fintamath/expressions/interfaces/IPolynomExpression.cpp
@@ -342,12 +342,8 @@ int IPolynomExpression::comparatorExpressionAndNonExpression(const std::shared_p
     case IOperator::Priority::Multiplication: {
       static const ArgumentPtr one = Integer(1).clone();
       ArgumentPtr rhsExpr = makeExpr(*lhsOper, rhs, one);
-
-      if (int comp = comparator(lhs, rhsExpr)) {
-        return isTermsOrderInversed() ? comp * -1 : comp;
-      }
-
-      break;
+      int comp = comparator(lhs, rhsExpr);
+      return isTermsOrderInversed() ? comp * -1 : comp;
     }
     default:
       break;

diff --git a/src/fintamath/expressions/polynomial/AddExpression.cpp b/src/fintamath/expressions/polynomial/AddExpression.cpp
@@ -187,7 +187,7 @@ ArgumentPtr AddExpression::simplifyMulLogarithms(const IFunction & /*func*/, con
     mulExpr = lhsExpr;
     logExpr = rhsExpr;
   }
-  else if (is<Mul>(rhsExpr->getFunction()) && is<Log>(lhsExpr->getFunction())) {
+  else if (is<Log>(lhsExpr->getFunction()) && is<Mul>(rhsExpr->getFunction())) {
     mulExpr = rhsExpr;
     logExpr = lhsExpr;
   }

diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp
@@ -494,6 +494,7 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("((1=2) -> (1=2) & ~(1=1)) !<-> ((1=1) <-> ~((1=2) | (1=1)))").toString(), "True");
   EXPECT_EQ(Expression("False|1=1").toString(), "True");
   EXPECT_EQ(Expression("1=1|False").toString(), "True");
+  EXPECT_EQ(Expression("a>b|a").toString(), "a - b > 0 | a");
 
   EXPECT_EQ(Expression("~(x = 1)").toString(), "x - 1 != 0");
   EXPECT_EQ(Expression("~(x != 1)").toString(), "x - 1 = 0");
@@ -635,8 +636,11 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("log(2.3,(E)/(20000.1EE)) + log(2.3,20000.1E)").toString(), "0");
   EXPECT_EQ(Expression("log(2, 3) + log(3, 4)").toString(), "log(3, 4) + log(2, 3)");
   EXPECT_EQ(Expression("x log(2, 3) + log(2, 5)").toString(), "log(2, 5 3^x)");
+  EXPECT_EQ(Expression("x log(2, 3) + log(2, 5a)").toString(), "log(2, 5 a 3^x)");
   EXPECT_EQ(Expression("log(2, 3) + 3log(3, 4)").toString(), "3 log(3, 4) + log(2, 3)");
   EXPECT_EQ(Expression("3log(2x, 3) + log(3, 4)").toString(), "3 log(2 x, 3) + log(3, 4)");
+  EXPECT_EQ(Expression("3log(2x, 3) + 4log(3, 4)").toString(), "3 log(2 x, 3) + 4 log(3, 4)");
+  EXPECT_EQ(Expression("3log(2x, 3) + 5log(2x, 4)").toString(), "log(2 x, 27648)");
 
   EXPECT_EQ(Expression("sin(asin(x))").toString(), "x");
   EXPECT_EQ(Expression("cos(acos(x))").toString(), "x");