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

Timestamp:

Dec 3, 2012 12:30:04 PM (8 years ago)

Author:

stefan

Message:

remove ifdef for KEEP_POSTPROCESS, its always on in Cgl trunk and 0.58

File:

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

trunk/Cbc/src/CbcSolver.cpp

@@ -295 +295 @@
     return *this;
 }
-#ifdef KEEP_POSTPROCESS
+
 static void putBackOtherSolutions(CbcModel * presolvedModel, CbcModel * model,
                            CglPreProcess * preProcess)
@@ -319 +319 @@
   }
 }
-#endif
 
 /*
@@ -5922 +5921 @@
                                     lpSolver->setSpecialOptions(lpSolver->specialOptions() | IN_BRANCH_AND_BOUND); // say is Cbc (and in branch and bound)
 #endif
-#ifdef KEEP_POSTPROCESS
-                                    // put back any saved solutions
-                                    putBackOtherSolutions(babModel_,&model_,&process);
-#endif
+                                    // put back any saved solutions
+                                    putBackOtherSolutions(babModel_,&model_,&process);
                                     process.postProcess(*babModel_->solver());
 #ifdef COIN_DEVELOP