From 47320007aa6f697e821afd91b80585cebeaecc45 Mon Sep 17 00:00:00 2001 From: Hassan Date: Wed, 17 Jan 2018 16:18:51 -0700 Subject: [PATCH] preparing for new release --- examples/MINLP/Power/SOCOPF/SOCOPF_main.cpp | 2 +- examples/NLP/Ising/Ising_main.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/MINLP/Power/SOCOPF/SOCOPF_main.cpp b/examples/MINLP/Power/SOCOPF/SOCOPF_main.cpp index 438765e12..554771e63 100644 --- 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 index f79855e81..37aee9f09 100644 --- 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;