Ignore:
Timestamp:
Jul 1, 2014 9:03:51 AM (7 years ago)
Author:
forrest
Message:

minor changes for SOS etc

File:
1 edited

Legend:

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

    r2041 r2043  
    25692569                            probingAction = action;
    25702570                            knapsackAction = action;
    2571                             zerohalfAction = action;
    25722571                            cliqueAction = action;
    25732572                            flowAction = action;
     
    25822581                            parameters_[whichParam(CBC_PARAM_STR_MIXEDCUTS, numberParameters_, parameters_)].setCurrentOption(action);
    25832582                            parameters_[whichParam(CBC_PARAM_STR_TWOMIRCUTS, numberParameters_, parameters_)].setCurrentOption(action);
    2584                             parameters_[whichParam(CBC_PARAM_STR_ZEROHALFCUTS, numberParameters_, parameters_)].setCurrentOption(action);
    25852583                            if (!action) {
     2584                                zerohalfAction = action;
     2585                                parameters_[whichParam(CBC_PARAM_STR_ZEROHALFCUTS, numberParameters_, parameters_)].setCurrentOption(action);
    25862586                                redsplitAction = action;
    25872587                                parameters_[whichParam(CBC_PARAM_STR_REDSPLITCUTS, numberParameters_, parameters_)].setCurrentOption(action);
Note: See TracChangeset for help on using the changeset viewer.