a

fintarin · Mar 3, 2024 · dd31d81 · dd31d81
1 parent c8b28e1
commit dd31d81
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/src/fintamath/expressions/ExpressionComparator.cpp b/src/fintamath/expressions/ExpressionComparator.cpp
@@ -264,7 +264,7 @@ Ordering compareExpressions(const std::shared_ptr<const IExpression> &lhs,
   const auto lhsOper = cast<IOperator>(lhs->getFunction());
   const auto rhsOper = cast<IOperator>(rhs->getFunction());
 
-  if ((lhsOper != nullptr) != (rhsOper != nullptr)) {
+  if (static_cast<bool>(lhsOper) != static_cast<bool>(rhsOper)) {
     return compareFunctions(lhs->getFunction(), rhs->getFunction(), options);
   }
 

diff --git a/src/fintamath/expressions/polynomial/AndExpr.cpp b/src/fintamath/expressions/polynomial/AndExpr.cpp
@@ -8,6 +8,7 @@
 #include "fintamath/functions/FunctionArguments.hpp"
 #include "fintamath/functions/IFunction.hpp"
 #include "fintamath/functions/logic/And.hpp"
+#include "fintamath/functions/logic/AndOper.hpp"
 #include "fintamath/functions/logic/Not.hpp"
 #include "fintamath/functions/logic/Or.hpp"
 #include "fintamath/literals/Boolean.hpp"
@@ -18,6 +19,11 @@ AndExpr::AndExpr(ArgumentPtrVector inChildren)
     : IPolynomExpressionCRTP(And{}, std::move(inChildren)) {
 }
 
+const std::shared_ptr<IFunction> &AndExpr::getOutputFunction() const {
+  static const std::shared_ptr<IFunction> oper = std::make_shared<AndOper>();
+  return oper;
+}
+
 AndExpr::SimplifyFunctionVector AndExpr::getFunctionsForPreSimplify() const {
   static const SimplifyFunctionVector simplifyFunctions = {
       &AndExpr::boolSimplify,

diff --git a/src/fintamath/expressions/polynomial/AndExpr.hpp b/src/fintamath/expressions/polynomial/AndExpr.hpp
@@ -11,6 +11,8 @@ class AndExpr final : public IPolynomExpressionCRTP<AndExpr> {
 public:
   explicit AndExpr(ArgumentPtrVector inChildren);
 
+  const std::shared_ptr<IFunction> &getOutputFunction() const override;
+
   static constexpr MathObjectType getTypeStatic() {
     return {MathObjectType::AndExpr, "AndExpr"};
   }

diff --git a/src/fintamath/expressions/polynomial/MulExpr.cpp b/src/fintamath/expressions/polynomial/MulExpr.cpp
@@ -36,6 +36,11 @@ MulExpr::MulExpr(ArgumentPtrVector inChildren)
     : IPolynomExpressionCRTP(Mul{}, std::move(inChildren)) {
 }
 
+const std::shared_ptr<IFunction> &MulExpr::getOutputFunction() const {
+  static const std::shared_ptr<IFunction> oper = std::make_shared<MulOper>();
+  return oper;
+}
+
 std::string MulExpr::toString() const {
   auto [childNumerator, childDenominator] = splitRational(children.front());
 
@@ -86,11 +91,6 @@ std::string MulExpr::childToString(const IOperator &oper, const ArgumentPtr &inC
   return operStr + operatorChildToString(oper, inChild);
 }
 
-const std::shared_ptr<IFunction> &MulExpr::getOutputFunction() const {
-  static const std::shared_ptr<IFunction> oper = std::make_shared<MulOper>();
-  return oper;
-}
-
 MulExpr::SimplifyFunctionVector MulExpr::getFunctionsForPreSimplify() const {
   static const SimplifyFunctionVector simplifyFunctions = {
       &MulExpr::rationalSimplify,

diff --git a/src/fintamath/expressions/polynomial/OrExpr.cpp b/src/fintamath/expressions/polynomial/OrExpr.cpp
@@ -14,6 +14,7 @@
 #include "fintamath/functions/logic/And.hpp"
 #include "fintamath/functions/logic/Not.hpp"
 #include "fintamath/functions/logic/Or.hpp"
+#include "fintamath/functions/logic/OrOper.hpp"
 #include "fintamath/literals/Boolean.hpp"
 
 namespace fintamath {
@@ -24,6 +25,11 @@ OrExpr::OrExpr(ArgumentPtrVector inChildren)
     : IPolynomExpressionCRTP(Or{}, std::move(inChildren)) {
 }
 
+const std::shared_ptr<IFunction> &OrExpr::getOutputFunction() const {
+  static const std::shared_ptr<IFunction> oper = std::make_shared<OrOper>();
+  return oper;
+}
+
 std::string OrExpr::childToString(const IOperator &oper, const ArgumentPtr &inChild, const ArgumentPtr &prevChild) const {
   std::string result = operatorChildToString(oper, inChild);
 

diff --git a/src/fintamath/expressions/polynomial/OrExpr.hpp b/src/fintamath/expressions/polynomial/OrExpr.hpp
@@ -13,6 +13,8 @@ class OrExpr final : public IPolynomExpressionCRTP<OrExpr> {
 public:
   explicit OrExpr(ArgumentPtrVector inChildren);
 
+  const std::shared_ptr<IFunction> &getOutputFunction() const override;
+
   static constexpr MathObjectType getTypeStatic() {
     return {MathObjectType::OrExpr, "OrExpr"};
   }