Additions with ComplexInf

fintarin · Jul 28, 2023 · 6e761be · 6e761be
1 parent 5fca39f
commit 6e761be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/fintamath/expressions/polynomial/AddExpression.cpp b/src/fintamath/expressions/polynomial/AddExpression.cpp
@@ -109,11 +109,11 @@ ArgumentPtr AddExpression::simplifyConst(const IFunction & /*func*/, const Argum
     return Undefined().clone();
   }
 
-  if (is<Inf>(lhsChild) || is<NegInf>(lhsChild)) {
+  if (is<Inf>(lhsChild) || is<NegInf>(lhsChild) || is<ComplexInf>(lhsChild)) {
     return lhsChild;
   }
 
-  if (is<Inf>(rhsChild) || is<NegInf>(rhsChild)) {
+  if (is<Inf>(rhsChild) || is<NegInf>(rhsChild) || is<ComplexInf>(rhsChild)) {
     return rhsChild;
   }
 

diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp
@@ -690,6 +690,8 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("-10 - Inf").toString(), "-Inf");
   EXPECT_EQ(Expression("a + Inf").toString(), "Inf");
   EXPECT_EQ(Expression("-a - Inf").toString(), "-Inf");
+  EXPECT_EQ(Expression("a + ComplexInf").toString(), "ComplexInf");
+  EXPECT_EQ(Expression("a - ComplexInf").toString(), "ComplexInf");
   EXPECT_EQ(Expression("10 * Inf").toString(), "Inf");
   EXPECT_EQ(Expression("-10 * Inf").toString(), "-Inf");
   EXPECT_EQ(Expression("-2/3 * Inf").toString(), "-Inf");
@@ -729,6 +731,8 @@ TEST(ExpressionTests, stringConstructorTest) {
   EXPECT_EQ(Expression("ComplexInf + ComplexInf").toString(), "Undefined");
   EXPECT_EQ(Expression("ComplexInf + Inf").toString(), "Undefined");
   EXPECT_EQ(Expression("ComplexInf - Inf").toString(), "Undefined");
+  EXPECT_EQ(Expression("Inf + ComplexInf").toString(), "Undefined");
+  EXPECT_EQ(Expression("-Inf + ComplexInf").toString(), "Undefined");
   EXPECT_EQ(Expression("0/0").toString(), "Undefined");
   EXPECT_EQ(Expression("Inf/Inf").toString(), "Undefined");
   EXPECT_EQ(Expression("0/Inf").toString(), "Undefined");