preparing for new release

coin-or · Jan 17, 2018 · 4732000 · 4732000
1 parent e76c76e
commit 4732000
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/examples/MINLP/Power/SOCOPF/SOCOPF_main.cpp b/examples/MINLP/Power/SOCOPF/SOCOPF_main.cpp
@@ -23,7 +23,7 @@ using namespace gravity;
 int main (int argc, char * argv[])
 {
     int output = 0;
-    bool relax = false, use_cplex = true, use_gurobi = false;
+    bool relax = false, use_cplex = false, use_gurobi = false;
     double tol = 1e-6;
     double solver_time_end, total_time_end, solve_time, total_time;
     string mehrotra = "no";

diff --git a/examples/NLP/Ising/Ising_main.cpp b/examples/NLP/Ising/Ising_main.cpp
@@ -183,8 +183,7 @@ int main (int argc, char * argv[])
 {
     int log_lev = 0;
     bool relax = false;
-    string fname = "../data_sets/Ising/samples_bin.csv";
-    fname = "/Users/hlh/Dropbox/Work/Dev/Allinsights/Gravity/data_sets/Ising/samples_bin_med.csv";
+    string fname = "../data_sets/Ising/samples_bin_sml.csv";    
     string path = argv[0];
     if (path.find("/bin")!=string::npos && path.find("/bin/ising")==string::npos) {//Not running from terminal
 //        fname = "../" + fname;