Changeset 824 for trunk/Cbc/src/CbcSolver.cpp

Timestamp:

Oct 12, 2007 11:55:57 AM (13 years ago)

Author:

forrest

Message:

for unit test return code

File:

• trunk/Cbc/src/CbcSolver.cpp (modified) (3 diffs)

trunk/Cbc/src/CbcSolver.cpp

@@ -730 +730 @@
   return new CbcStopNow(*this);
 }
+//#undef NEW_STYLE_SOLVER
 //#define NEW_STYLE_SOLVER
 //#undef COIN_HAS_ASL
@@ -3300 +3301 @@
 } 
 
-void CbcClpUnitTest (const CbcModel & saveModel,
+int CbcClpUnitTest (const CbcModel & saveModel,
                      std::string& dirMiplib, bool unitTestOnly);
 #ifdef NEW_STYLE_SOLVER
@@ -7027 +7028 @@
                 */
                 int extra1 = parameters_[whichParam(EXTRA1,numberParameters_,parameters_)].intValue();
-                CbcClpUnitTest(model_, dirMiplib, extra1==1);
+                int returnCode=CbcClpUnitTest(model_, dirMiplib, extra1==1);
                 babModel_=NULL;
-                return 777;
+                return returnCode;
               } else {
                 strengthenedModel = babModel_->strengthenedModel();