MAINT: Cleanup and propagate correct exceptions

scipy · Aug 5, 2023 · 31d630f · 31d630f
1 parent 4256875
commit 31d630f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Highs.h b/src/Highs.h
@@ -22,6 +22,7 @@
 #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"
 

diff --git a/src/presolve/HPresolve.cpp b/src/presolve/HPresolve.cpp
@@ -3997,10 +3997,8 @@ HPresolve::Result HPresolve::presolve(HighsPostsolveStack& postsolve_stack) {
     try {
       HPRESOLVE_CHECKED_CALL(initialRowAndColPresolve(postsolve_stack));
     } catch (const DataStackOverflow& e) {
-      highsLogUser(options->log_options, HighsLogType::kInfo,
-                   "Problem is too large to be presolved\n");
       // Here we re-throw the error
-      throw;
+      throw PresolveTooLarge(e.what());
     }
 
     HighsInt numParallelRowColCalls = 0;

diff --git a/src/presolve/HighsPostsolveStack.h b/src/presolve/HighsPostsolveStack.h
@@ -380,7 +380,7 @@ class HighsPostsolveStack {
       reductionAdded(ReductionType::kFixedCol);
     } catch (const DataStackOverflow& e) {
       std::cerr << "Memory allocation failed while processing fixedColAtLower: "
-                << e.what() << std::endl;
+                << std::endl;
       // Rethrow.
       throw;
     }