Changeset 308 for trunk


Ignore:
Timestamp:
Apr 25, 2006 4:52:27 AM (14 years ago)
Author:
forrest
Message:

for bonmin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r307 r308  
    41954195    {
    41964196      double objValue = solver_->getObjValue();
    4197       //int numberGlobalBefore = globalCuts_.sizeRowCuts();
     4197      int numberGlobalBefore = globalCuts_.sizeRowCuts();
    41984198      // SOLUTION2 so won't up cutoff or print message
    41994199      setBestSolution(CBC_SOLUTION2, objValue,
    42004200                      solver_->getColSolution(),0);
    4201 #if 0
    42024201      int numberGlobalAfter = globalCuts_.sizeRowCuts();
    42034202      int numberToAdd = numberGlobalAfter - numberGlobalBefore;
     
    42394238        }
    42404239      }
    4241 #endif
    42424240    }
    42434241  }
     
    59435941    CoinWarmStart * saveWs;
    59445942    // if(how!=CBC_SOLUTION) return;
    5945     if(how==CBC_ROUNDING||true)//We don't want to make any change to solver_
     5943    if(how==CBC_ROUNDING)//We don't want to make any change to solver_
    59465944      //take a snapshot of current state
    59475945      {     
     
    59625960   
    59635961    //If it was an heuristic solution we have to clean up the solver
    5964     if (how==CBC_ROUNDING||true)
     5962    if (how==CBC_ROUNDING)
    59655963      {
    59665964        //delete the cuts
Note: See TracChangeset for help on using the changeset viewer.