Fixing Ising default file and fixing warnings at compile time, curren…

…t commit will be used for darwin experiments
coin-or · Jan 22, 2018 · 5391096 · 5391096
1 parent b36358b
commit 5391096
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/examples/NLP/Ising/Ising_main.cpp b/examples/NLP/Ising/Ising_main.cpp
@@ -183,7 +183,7 @@ int main (int argc, char * argv[])
 {
     int output = 5;
     bool relax = false;
-    string fname = "../data_sets/Ising/samples_bin.csv", log_level="5";
+    string fname = "../data_sets/Ising/samples_bin_sml.csv", log_level="5";
     string path = argv[0];
     if (path.find("/bin")!=string::npos && path.find("/bin/ising")==string::npos) {//Not running from terminal
         fname = "../" + fname;

diff --git a/include/gravity/Node.h b/include/gravity/Node.h
@@ -65,7 +65,7 @@ class Node{
     std::vector<Arc*> get_in();
 
 
-    virtual vector<gravity::aux*> get_gens(){};
+    virtual vector<gravity::aux*> get_gens(){return vector<gravity::aux*>();};
 
     /* return its neighbours */
     std::set<Node*> get_neighbours();