Commit d4ad1599 authored by Martin Marinov's avatar Martin Marinov

Re-throw the PROGRESS_ABORTED exception in catch() handlers that can intercept it.

parent 506acf23
...@@ -203,10 +203,12 @@ MISolver::solve_cplex( ...@@ -203,10 +203,12 @@ MISolver::solve_cplex(
} }
catch (IloException& e) catch (IloException& e)
{ {
PROGRESS_RESUME_ABORT; // resume a processed abort request
DEB_warning(2, "CPLEX Concert exception caught: " << e.getMessage() ) DEB_warning(2, "CPLEX Concert exception caught: " << e.getMessage() )
} }
catch (...) catch (...)
{ {
PROGRESS_RESUME_ABORT; // resume a processed abort request
DEB_warning(1, "CPLEX Unknown exception caught" ) DEB_warning(1, "CPLEX Unknown exception caught" )
} }
...@@ -836,10 +838,12 @@ MISolver::solve_gurobi( ...@@ -836,10 +838,12 @@ MISolver::solve_gurobi(
} }
catch(GRBException& e) catch(GRBException& e)
{ {
PROGRESS_RESUME_ABORT; // resume a processed abort request
DEB_warning(2, "Error code = " << e.getErrorCode() << "[" << e.getMessage() << "]\n") DEB_warning(2, "Error code = " << e.getErrorCode() << "[" << e.getMessage() << "]\n")
} }
catch(...) catch(...)
{ {
PROGRESS_RESUME_ABORT; // resume a processed abort request
DEB_warning(1, "Exception during optimization") DEB_warning(1, "Exception during optimization")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment