Ignore:
Timestamp:
Nov 3, 2006 3:48:00 PM (13 years ago)
Author:
forrest
Message:

for nonlinear and start moving to OsiTree?
afor n

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcNode.cpp

    r473 r477  
    624624  for (i=0;i<numberChangedBounds_;i++) {
    625625    int variable = variables_[i];
     626    int k = variable&0x7fffffff;
    626627    if ((variable&0x80000000)==0) {
    627628      // lower bound changing
    628       solver->setColLower(variable,newBounds_[i]);
     629#ifndef NDEBUG
     630      double oldValue = solver->getColLower()[k];
     631      assert (newBounds_[i]>oldValue-1.0e-8);
     632      if (newBounds_[i]<oldValue+1.0e-8)
     633        printf("bad null lower change for column %d - bound %g\n",k,oldValue);
     634#endif
     635      solver->setColLower(k,newBounds_[i]);
    629636    } else {
    630637      // upper bound changing
    631       solver->setColUpper(variable&0x7fffffff,newBounds_[i]);
     638#ifndef NDEBUG
     639      double oldValue = solver->getColUpper()[k];
     640      assert (newBounds_[i]<oldValue+1.0e-8);
     641      if (newBounds_[i]>oldValue-1.0e-8)
     642        printf("bad null upper change for column %d - bound %g\n",k,oldValue);
     643#endif
     644      solver->setColUpper(k,newBounds_[i]);
    632645    }
    633646  }
     
    31673180                  dynamic_cast <CbcBranchingObject *>(branch_) ;
    31683181                assert (branchObj);
    3169                 branchObj->way(preferredWay);
     3182                //branchObj->way(preferredWay);
     3183                branchObj->way(betterWay);
    31703184              }
    31713185              if (couldChooseFirst)
Note: See TracChangeset for help on using the changeset viewer.