ENH: Use minimal exceptions

No change in C-API, maps to existing errors
ERGO-Code · Oct 21, 2023 · 3a66980 · 3a66980
1 parent 7264b18
commit 3a66980
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/Highs.h b/src/Highs.h
@@ -21,9 +21,9 @@
 #include "lp_data/HighsRanging.h"
 #include "lp_data/HighsSolutionDebug.h"
 #include "model/HighsModel.h"
-#include "util/HighsExceptions.h"
 #include "presolve/ICrash.h"
 #include "presolve/PresolveComponent.h"
+#include "util/HighsExceptions.h"
 
 /**
  * @brief Return the version

diff --git a/src/presolve/HPresolve.cpp b/src/presolve/HPresolve.cpp
@@ -3685,10 +3685,18 @@ HPresolve::Result HPresolve::rowPresolve(HighsPostsolveStack& postsolve_stack,
               //	      assert(non_fractional);
               if (!non_fractional) return Result::kPrimalInfeasible;
             }
-            postsolve_stack.fixedColAtLower(nonzero.index(),
-                                            model->col_lower_[nonzero.index()],
-                                            model->col_cost_[nonzero.index()],
-                                            getColumnVector(nonzero.index()));
+            try {
+              postsolve_stack.fixedColAtLower(
+                  nonzero.index(), model->col_lower_[nonzero.index()],
+                  model->col_cost_[nonzero.index()],
+                  getColumnVector(nonzero.index()));
+            } catch (const DataStackOverflow& e) {
+              highsLogUser(options->log_options, HighsLogType::kError,
+                           "Problem too large for Presolve, try without\n");
+              highsLogUser(options->log_options, HighsLogType::kInfo,
+                           "Specific error raised:\n%s\n", e.what());
+              return Result::kPrimalInfeasible;
+            }
             if (model->col_upper_[nonzero.index()] >
                 model->col_lower_[nonzero.index()])
               changeColUpper(nonzero.index(),

diff --git a/src/util/HighsDataStack.h b/src/util/HighsDataStack.h
@@ -52,6 +52,7 @@ class HighsDataStack {
     }
     std::memcpy(data.data() + dataSize, &r, sizeof(T));
   }
+
   template <typename T,
             typename std::enable_if<IS_TRIVIALLY_COPYABLE(T), int>::type = 0>
   void pop(T& r) {

diff --git a/src/util/HighsExceptions.h b/src/util/HighsExceptions.h
@@ -2,7 +2,7 @@
 #include <stdexcept>
 
 class DataStackOverflow : public std::runtime_error {
-public:
-    explicit DataStackOverflow(const std::string& msg)
-        : std::runtime_error(msg) {}
+ public:
+  explicit DataStackOverflow(const std::string& msg)
+      : std::runtime_error(msg) {}
 };