Changeset 1746

Timestamp:

Oct 20, 2011 6:18:37 AM (9 years ago)

Author:

forrest

Message:

fix when branching on satisfied variables

File:

• stable/2.7/Cbc/src/CbcNode.cpp (modified) (2 diffs)

stable/2.7/Cbc/src/CbcNode.cpp

@@ -2873 +2873 @@
                                     && objectiveChange > 1.0e-5) {
                                 double value = saveSolution[iColumn];
-                                double down = value - floor(value);
+                                double down = value - floor(value-integerTolerance);
                                 double changePer = objectiveChange / (down + 1.0e-7);
                                 double distance = (cutoff - objectiveValue_) / changePer;
@@ -3019 +3019 @@
                                     && objectiveChange > 1.0e-5) {
                                 double value = saveSolution[iColumn];
-                                double up = ceil(value) - value;
+                                double up = ceil(value+integerTolerance) - value;
                                 double changePer = objectiveChange / (up + 1.0e-7);
                                 double distance = (cutoff - objectiveValue_) / changePer;