Changeset 1009


Ignore:
Timestamp:
Jul 16, 2008 6:14:09 PM (11 years ago)
Author:
forrest
Message:

fix bug in restart code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r1003 r1009  
    17511751     // Use numberNodes to say how many are original rows
    17521752     heuristic.setNumberNodes(continuousSolver_->getNumRows());
     1753#ifdef COIN_DEVELOP
    17531754     if (continuousSolver_->getNumRows()<
    17541755         solver_->getNumRows())
    17551756       printf("%d rows added ZZZZZ\n",
    17561757              solver_->getNumRows()-continuousSolver_->getNumRows());
     1758#endif
    17571759     int returnCode= heuristic.smallBranchAndBound(saveSolver,
    17581760                                                   -1,newSolution,
     
    23192321        int numberFixed = 0 ;
    23202322        int numberFixed2=0;
     2323#ifdef COIN_DEVELOP
    23212324        printf("gap %g\n",gap);
     2325#endif
    23222326        for (int i = 0 ; i < numberIntegers_ ; i++) {
    23232327          int iColumn = integerVariable_[i] ;
     
    23602364      if (tryNewSearch) {
    23612365        // back to solver without cuts?
    2362 #if 1
     2366#if 0
    23632367        OsiSolverInterface * solver2 = continuousSolver_->clone();
    23642368#else
     
    23822386        heuristic.setFractionSmall(0.6);
    23832387        heuristic.setFeasibilityPumpOptions(1008013);
     2388        // Use numberNodes to say how many are original rows
     2389        heuristic.setNumberNodes(continuousSolver_->getNumRows());
     2390#ifdef COIN_DEVELOP
     2391        if (continuousSolver_->getNumRows()<
     2392            solver_->getNumRows())
     2393          printf("%d rows added ZZZZZ\n",
     2394                 solver_->getNumRows()-continuousSolver_->getNumRows());
     2395#endif
    23842396        int returnCode= heuristic.smallBranchAndBound(saveSolver,
    23852397                                                      -1,newSolution,
Note: See TracChangeset for help on using the changeset viewer.