Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/examples/CbcSolverLongThin.cpp

    r1793 r1902  
    473473    assert(!modelPtr_->specialOptions());
    474474    int saveOptions = modelPtr_->specialOptions();
    475     int startFinishOptions;
    476475    bool takeHint;
    477476    OsiHintStrength strength;
    478     bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
    479     assert (gotHint);
     477    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
    480478    if (strength!=OsiHintIgnore&&takeHint) {
    481479      // could do something - think about it
     
    483481    }
    484482    if((specialOptions_&1)==0) {
    485       startFinishOptions=0;
    486483      modelPtr_->setSpecialOptions(saveOptions|(64|1024));
    487484    } else {
    488       startFinishOptions=1+2+4;
    489485      if((specialOptions_&4)==0)
    490486        modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));
Note: See TracChangeset for help on using the changeset viewer.