Making small change in calling convention for improved performance (?…

…) and re-running Cython to incorporate changes
coin-or · Feb 10, 2021 · dfce351 · dfce351
1 parent 909253a
commit dfce351
Show file tree

Hide file tree

Showing 4 changed files with 889 additions and 832 deletions.
diff --git a/cylp/cpp/ICbcModel.cpp b/cylp/cpp/ICbcModel.cpp
@@ -31,10 +31,13 @@ int ICbcModel::cbcMain(){
         // initialize
         int returnCode = -1;
 	int logLevel = this->logLevel();
-        CbcMain0(*this);
         const char* argv[] = {"ICbcModel", "-solve","-quit"};
-        // Solve ICbcModel and quit
+        //CbcMain0(*this);
+	//this->setLogLevel(logLevel);
+        //return CbcMain1(3, argv, *this);
+        //const char* argv = "-solve -quit";
+        CbcSolverUsefulData solverData;
+        CbcMain0(*this, solverData);
 	this->setLogLevel(logLevel);
-        returnCode = CbcMain1 (3, argv, *this);
-        return returnCode;
+        return CbcMain1(3, argv, *this, NULL, solverData);
 }