adding AMPL MP NL file reader

coin-or · Apr 18, 2024 · 216087e · 216087e
1 parent f7a84e8
commit 216087e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ option(Ipopt "Link to IPOPT libraries" ON)
 
 option(MP "Link to AMPL MP libraries" OFF)
 
-option(CoinUtils "Link to CoinUtils libraries" ON)
+option(CoinUtils "Link to CoinUtils libraries" OFF)
 
 # Find XLNT (optional)
 option(Xlnt "Link to XLNT libraries" OFF)
@@ -195,7 +195,7 @@ set(THIRDPARTY_INSTALL_PATH ${THIRDPARTY_BASE_PATH})
 
 if(NOT WIN32)
 #CoinUtils
-if (CoinUtils)
+if (CoinUtils or MP)
 include(ExternalProject)
 #CoinUtils
 message(STATUS "Enable CoinUtils")

diff --git a/examples/Gravity_test.cpp b/examples/Gravity_test.cpp
@@ -26,8 +26,11 @@ using namespace gravity;
 #ifdef USE_MP
 TEST_CASE("testing readNL() function") {
     Model<> M;
-    string NL_file = string(prj_dir)+"/data_sets/NL/ex4.nl";
+    string NL_file = string(prj_dir)+"/data_sets/NL/hvycrash.nl";
     int status = M.readNL(NL_file);
+    solver<> GRB(M,gurobi);
+    double solver_time_start = get_wall_time();
+    GRB.run();
     CHECK(status==0);
     CHECK(M.get_nb_vars()==36);
     CHECK(M.get_nb_cons()==30);

diff --git a/src/GurobiProgram.cpp b/src/GurobiProgram.cpp
@@ -1046,7 +1046,10 @@ void GurobiProgram::write_NLCstr(const string &fname){
             assert(sense==GRB_EQUAL);/* Check what to do with inequalities */
             nb_inst = c->get_nb_inst();
             for (size_t i = 0; i< nb_inst; i++){
-                file <<  " " << c->get_name()+"("+c->_indices->_keys->at(i)+"):\n";
+                if(c->_indices)
+                    file <<  " " << c->get_name()+"("+c->_indices->_keys->at(i)+"):\n";
+                else
+                    file <<  " " << c->get_name()+"("+to_string(i)+"):\n";
                 file << " zero(0) = NL :\n";
                 int parent_id = -1;
                 file << c->getNLexpr(-1,parent_id,i);