Changeset 477 for branches/devel/Cbc/src/CbcNode.cpp

Timestamp:

Nov 3, 2006 3:48:00 PM (14 years ago)

Author:

forrest

Message:

for nonlinear and start moving to OsiTree?
afor n

File:

• branches/devel/Cbc/src/CbcNode.cpp (modified) (2 diffs)

branches/devel/Cbc/src/CbcNode.cpp

@@ -624 +624 @@
   for (i=0;i<numberChangedBounds_;i++) {
     int variable = variables_[i];
+    int k = variable&0x7fffffff;
     if ((variable&0x80000000)==0) {
       // lower bound changing
-      solver->setColLower(variable,newBounds_[i]);
+#ifndef NDEBUG
+      double oldValue = solver->getColLower()[k];
+      assert (newBounds_[i]>oldValue-1.0e-8);
+      if (newBounds_[i]<oldValue+1.0e-8)
+        printf("bad null lower change for column %d - bound %g\n",k,oldValue);
+#endif
+      solver->setColLower(k,newBounds_[i]);
     } else {
       // upper bound changing
-      solver->setColUpper(variable&0x7fffffff,newBounds_[i]);
+#ifndef NDEBUG
+      double oldValue = solver->getColUpper()[k];
+      assert (newBounds_[i]<oldValue+1.0e-8);
+      if (newBounds_[i]>oldValue-1.0e-8)
+        printf("bad null upper change for column %d - bound %g\n",k,oldValue);
+#endif
+      solver->setColUpper(k,newBounds_[i]);
     }
   }
@@ -3167 +3180 @@
                   dynamic_cast <CbcBranchingObject *>(branch_) ;
                 assert (branchObj);
-                branchObj->way(preferredWay);
+                //branchObj->way(preferredWay);
+                branchObj->way(betterWay);
               }
               if (couldChooseFirst)