update

AntaresSimulatorTeam · Feb 18, 2025 · d7f4d21 · d7f4d21
1 parent f695540
commit d7f4d21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/expressions/include/antares/expressions/visitors/EvalVisitor.h b/src/expressions/include/antares/expressions/visitors/EvalVisitor.h
@@ -71,29 +71,24 @@ class EvaluationResult
 
     struct SafeDivides
     {
-        double operator()(double lhs, double rhs) const
+        static constexpr double DEFAULT_THRESHOLD = 1e-16;
+
+        explicit SafeDivides(double threshold = DEFAULT_THRESHOLD):
+            threshold_(threshold)
         {
-            // if (rhs == 0.0)
-            // {
-            //     throw std::runtime_error("Division by zero in EvaluationResult.");
-            // }
-            double result{0.};
-            try
-            {
-                result = lhs / rhs;
+        }
 
-                if (!std::isfinite(result))
-                {
-                    throw EvalVisitorDivisionException(lhs, rhs, "is not a finite number");
-                }
-            }
-            catch (const std::exception& ex)
+        double operator()(double lhs, double rhs) const
+        {
+            if (std::abs(rhs) <= threshold_)
             {
-                throw EvalVisitorDivisionException(lhs, rhs, ex.what());
+                throw EvalVisitorDivisionException(lhs, rhs, "Division by zero");
             }
-
-            return result;
+            return lhs / rhs;
         }
+
+    private:
+        double threshold_;
     };
 
     EvaluationResult operator/(const EvaluationResult& right) const

diff --git a/src/solver/optim-model-filler/LinearExpression.cpp b/src/solver/optim-model-filler/LinearExpression.cpp
@@ -42,7 +42,6 @@ struct IdentityFunction
  * value. For every key: value = left_value + rhs_multiplier * right_value
  * @param left The left hand side map
  * @param right The right hand side map
- * @param rhs_multiplier The multiplier to apply to the right hand side map
  * @return The map resulting from the operation
  */
 template<typename Key, typename Value, typename UnaryOp = IdentityFunction<Value>>