Merge pull request NeuralNetworkVerification#35 from NeuralNetworkVer…

…ification/master Set default Gurobi option to non-incremental LP relaxation
guyam2 · Jun 23, 2020 · 8485859 · 8485859
2 parents 3edf8b1 + 2f3c64e
commit 8485859
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             break;
         default:
-            throw NLRError( NLRError::LAYER_TYPE_NOT_SUPPORTED, "MILPFormulator" );
+            throw NLRError( NLRError::LAYER_TYPE_NOT_SUPPORTED, "LPFormulator" );
             break;
         }
     }
@@ Expand Down @@