Changeset 2040 for trunk/Cbc/src/CbcNode.cpp

Timestamp:

Jun 20, 2014 8:44:51 AM (5 years ago)

Author:

forrest

Message:

fixes for odd SOS

File:

• trunk/Cbc/src/CbcNode.cpp (modified) (7 diffs)

trunk/Cbc/src/CbcNode.cpp

@@ -2823 +2823 @@
                 int preferredWay;
                 double infeasibility = object->infeasibility(&usefulInfo, preferredWay);
+                bool feasibleSolution=false;
+                double predictedChange=0.0;
                 // may have become feasible
                 if (!infeasibility) {
@@ -2913 +2915 @@
                     */
                     choice.possibleBranch->way(-1) ;
-                    choice.possibleBranch->branch() ;
+                    predictedChange = choice.possibleBranch->branch() ;
                     solver->solveFromHotStart() ;
                     bool needHotStartUpdate = false;
@@ -2962 +2964 @@
 #endif
                     }
+                    // say infeasible if branch says so
+                    if (predictedChange==COIN_DBL_MAX)
+                      iStatus=1;
                     if (iStatus != 2 && solver->getIterationCount() >
                             realMaxHotIterations)
@@ -3007 +3012 @@
 #endif
                             // See if integer solution
-                            if (model->feasibleSolution(choice.numIntInfeasDown,
-                                                        choice.numObjInfeasDown)
+                            feasibleSolution = 
+                              model->feasibleSolution(choice.numIntInfeasDown,
+                                                      choice.numObjInfeasDown);
+                            if (feasibleSolution 
                                     && model->problemFeasibility()->feasible(model, -1) >= 0) {
                                 if (auxiliaryInfo->solutionAddsCuts()) {
@@ -3099 +3106 @@
 
                     // repeat the whole exercise, forcing the variable up
-                    choice.possibleBranch->branch();
+                    predictedChange=choice.possibleBranch->branch();
                     solver->solveFromHotStart() ;
                     numberStrongDone++;
@@ -3147 +3154 @@
 #endif
                     }
+                    // say infeasible if branch says so
+                    if (predictedChange==COIN_DBL_MAX)
+                      iStatus=1;
                     if (iStatus != 2 && solver->getIterationCount() >
                             realMaxHotIterations)
@@ -3191 +3201 @@
 #endif
                             // See if integer solution
-                            if (model->feasibleSolution(choice.numIntInfeasUp,
-                                                        choice.numObjInfeasUp)
+                            feasibleSolution = 
+                              model->feasibleSolution(choice.numIntInfeasUp,
+                                                      choice.numObjInfeasUp);
+                            if (feasibleSolution 
                                     && model->problemFeasibility()->feasible(model, -1) >= 0) {
 #ifdef BONMIN