Changeset 2043 for trunk


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

minor changes for SOS etc

Location:
trunk/Cbc/src
Files:
3 edited

Legend:

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

    r2042 r2043  
    741741    int iColumn = variable_;
    742742    if (way_ < 0) {
    743 #ifdef CBC_DEBUG
     743#ifndef NDEBUG
    744744        { double olb, oub ;
    745745            olb = model_->solver()->getColLower()[iColumn] ;
    746746            oub = model_->solver()->getColUpper()[iColumn] ;
     747#ifdef CBC_DEBUG
    747748            printf("branching down on var %d: [%g,%g] => [%g,%g]\n",
    748749                   iColumn, olb, oub, down_[0], down_[1]) ;
     750#endif
     751            assert (olb<down_[0]+1.0e-7&&oub>down_[1]-1.0e-7);
    749752        }
    750753#endif
     
    753756        way_ = 1;
    754757    } else {
    755 #ifdef CBC_DEBUG
     758#ifndef NDEBUG
    756759        { double olb, oub ;
    757760            olb = model_->solver()->getColLower()[iColumn] ;
    758761            oub = model_->solver()->getColUpper()[iColumn] ;
     762#ifdef CBC_DEBUG
    759763            printf("branching up on var %d: [%g,%g] => [%g,%g]\n",
    760764                   iColumn, olb, oub, up_[0], up_[1]) ;
     765#endif
     766            assert (olb<up_[0]+1.0e-7&&oub>up_[1]-1.0e-7);
    761767        }
    762768#endif
  • trunk/Cbc/src/CbcModel.cpp

    r2041 r2043  
    21932193        }
    21942194        if (numberOdd) {
    2195             if (numberHeuristics_) {
     2195          if (numberHeuristics_ && (specialOptions_&1024)==0 ) {
    21962196                int k = 0;
    21972197                for (int i = 0; i < numberHeuristics_; i++) {
  • 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.