Changeset 95 for trunk/CbcHeuristic.cpp

Timestamp:

Mar 31, 2005 11:28:33 AM (16 years ago)

Author:

forrest

Message:

fix minor bug

File:

• trunk/CbcHeuristic.cpp (modified) (1 diff)

trunk/CbcHeuristic.cpp

@@ -568 +568 @@
               assert (value<0.0);
               double gap = rowActivity[iRow]-rowUpper[iRow];
-              if (gap+value*distance<0.0) 
-                distance = -gap/value;
+              if (gap+value*distance<0.0) {
+                // If integer then has to move by 1
+                if (!isInteger)
+                  distance = -gap/value;
+                else
+                  distance = CoinMax(-gap/value,1.0);
+              }
             } else if (rowActivity[iRow]<rowLower[iRow]-primalTolerance) {
               // infeasible below
               assert (value>0.0);
               double gap = rowActivity[iRow]-rowLower[iRow];
-              if (gap+value*distance>0.0) 
-                distance = -gap/value;
+              if (gap+value*distance>0.0) {
+                // If integer then has to move by 1
+                if (!isInteger)
+                  distance = -gap/value;
+                else
+                  distance = CoinMax(-gap/value,1.0);
+              }
             } else {
               // feasible