From 2f3c64eddde2b9751013e7e6c9c3e77656aaf09c Mon Sep 17 00:00:00 2001 From: Guy Katz Date: Tue, 23 Jun 2020 08:09:50 +0300 Subject: [PATCH] Set default Gurobi option to non-incremental LP relaxation --- src/configuration/GlobalConfiguration.cpp | 2 +- src/nlr/LPFormulator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configuration/GlobalConfiguration.cpp b/src/configuration/GlobalConfiguration.cpp index c535fd57c..d0b34c999 100644 --- a/src/configuration/GlobalConfiguration.cpp +++ b/src/configuration/GlobalConfiguration.cpp @@ -77,7 +77,7 @@ const GlobalConfiguration::ExplicitBasisBoundTighteningType GlobalConfiguration: const bool GlobalConfiguration::EXPLICIT_BOUND_TIGHTENING_UNTIL_SATURATION = false; const GlobalConfiguration::MILPSolverBoundTighteningType GlobalConfiguration::MILP_SOLVER_BOUND_TIGHTENING_TYPE = - GlobalConfiguration::MILP_ENCODING_INCREMENTAL; + GlobalConfiguration::LP_RELAXATION; const unsigned GlobalConfiguration::REFACTORIZATION_THRESHOLD = 100; const GlobalConfiguration::BasisFactorizationType GlobalConfiguration::BASIS_FACTORIZATION_TYPE = diff --git a/src/nlr/LPFormulator.cpp b/src/nlr/LPFormulator.cpp index 00a174902..9d5495bdb 100644 --- a/src/nlr/LPFormulator.cpp +++ b/src/nlr/LPFormulator.cpp @@ -315,7 +315,7 @@ void LPFormulator::addLayerToModel( GurobiWrapper &gurobi, const Layer *layer ) break; default: - throw NLRError( NLRError::LAYER_TYPE_NOT_SUPPORTED, "MILPFormulator" ); + throw NLRError( NLRError::LAYER_TYPE_NOT_SUPPORTED, "LPFormulator" ); break; } }