Reversing change made in dfce35, since it doesn't seem to work with C…

…bc 2.9. Also bumping version for new release
coin-or · Apr 11, 2021 · 1769ca6 · 1769ca6
1 parent 1639aed
commit 1769ca6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cylp/VERSION b/cylp/VERSION
@@ -1 +1 @@
-0.91.3
+0.91.4
diff --git a/cylp/cpp/ICbcModel.cpp b/cylp/cpp/ICbcModel.cpp
@@ -32,12 +32,12 @@ int ICbcModel::cbcMain(){
         int returnCode = -1;
 	int logLevel = this->logLevel();
         const char* argv[] = {"ICbcModel", "-solve","-quit"};
-        //CbcMain0(*this);
-	//this->setLogLevel(logLevel);
-        //return CbcMain1(3, argv, *this);
-        //const char* argv = "-solve -quit";
-        CbcSolverUsefulData solverData;
-        CbcMain0(*this, solverData);
+        CbcMain0(*this);
 	this->setLogLevel(logLevel);
-        return CbcMain1(3, argv, *this, NULL, solverData);
+        return CbcMain1(3, argv, *this);
+        //const char* argv = "-solve -quit";
+        //CbcSolverUsefulData solverData;
+        //CbcMain0(*this, solverData);
+	//this->setLogLevel(logLevel);
+        //return CbcMain1(3, argv, *this, NULL, solverData);
 }