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/CbcSolver3.cpp

    r1574 r1902  
    246246    assert(!modelPtr_->specialOptions());
    247247    int saveOptions = modelPtr_->specialOptions();
    248     int startFinishOptions;
    249248    bool takeHint;
    250249    OsiHintStrength strength;
    251     bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
    252     assert (gotHint);
     250    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
    253251    if (strength!=OsiHintIgnore&&takeHint) {
    254252      // could do something - think about it
     
    256254    }
    257255    if((specialOptions_&1)==0) {
    258       startFinishOptions=0;
    259256      modelPtr_->setSpecialOptions(saveOptions|(64|1024));
    260257    } else {
    261       startFinishOptions=1+2+4;
    262258      if((specialOptions_&4)==0)
    263259        modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));
Note: See TracChangeset for help on using the changeset viewer.