Changeset 2315 for stable

Timestamp:

Jan 3, 2017 10:54:29 AM (3 years ago)

Author:

forrest

Message:

for mipstart

Location:

stable/2.9/Cbc/src

Files:

• CbcModel.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (1 diff)

stable/2.9/Cbc/src/CbcModel.cpp

@@ -2846 +2846 @@
     }
     // See if we can add integers
-    if (noObjects && numberIntegers_ < solver_->getNumCols() && (specialOptions_&65536) != 0 && !parentModel_)
-        AddIntegers();
+    // taken out in stable as causes problems
+    if (noObjects && numberIntegers_ < solver_->getNumCols() && (specialOptions_&65536) != 0 && !parentModel_ && false) 
+      AddIntegers();
     /*
       Do an initial round of cut generation for the root node. Depending on the

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -3974 +3974 @@
                                 double obj;
                                 int status = computeCompleteSolution( &tempModel, colNames, mipStartBefore, &x[0], obj );
-                                // set cutoff 
+                                // set cutoff ( a trifle high) 
                                 if (!status) {
-                                  babModel_->setCutoff(CoinMin(babModel_->getCutoff(),obj+1.0e-4));
+                                  double newCutoff = CoinMin(babModel_->getCutoff(),obj+1.0e-4);
                                   babModel_->setBestSolution( &x[0], static_cast<int>(x.size()), obj, false );
+                                  babModel_->setCutoff(newCutoff);
                                   babModel_->setSolutionCount(1);
-                                  model_.setCutoff(CoinMin(model_.getCutoff(),obj+1.0e-4));
                                   model_.setBestSolution( &x[0], static_cast<int>(x.size()), obj, false );
+                                  model_.setCutoff(newCutoff);
                                   model_.setSolutionCount(1);
                                 }