Changeset 1094 for stable


Ignore:
Timestamp:
Oct 29, 2008 11:42:07 AM (11 years ago)
Author:
forrest
Message:

for nonlinear

Location:
stable/2.2/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.2/Cbc/src/CbcModel.cpp

    r1068 r1094  
    97789778      object_[i]->feasibleRegion(solver_,&usefulInfo);
    97799779      // If relaxed then leave bounds on basic variables
    9780     if (fixVariables==-1) {
     9780    if (fixVariables==-1&&(specialOptions_&16)==0) {
    97819781      CoinWarmStartBasis * basis = dynamic_cast<CoinWarmStartBasis*>(saveSolver->getWarmStart()) ;
    97829782      assert(basis != NULL);
  • stable/2.2/Cbc/src/CbcNode.cpp

    r1060 r1094  
    30873087          solver->markHotStart();
    30883088        }
    3089         assert (auxiliaryInfo->warmStart());
    30903089        doneHotStart=true;
    30913090        xMark++;
     
    31393138          solver->markHotStart();
    31403139          doneHotStart=true;
    3141           assert (auxiliaryInfo->warmStart());
    31423140          xMark++;
    31433141          //if (solver->isProvenPrimalInfeasible())
     
    31533151        // Mark hot start
    31543152        doneHotStart=true;
    3155         assert (auxiliaryInfo->warmStart());
    31563153        solver->markHotStart();
    31573154        xMark++;
     
    34583455            // Mark hot start
    34593456            doneHotStart=true;
    3460             assert (auxiliaryInfo->warmStart());
    34613457            solver->markHotStart();
    34623458            xMark++;
Note: See TracChangeset for help on using the changeset viewer.