Changeset 1031


Ignore:
Timestamp:
Jul 27, 2008 10:01:12 PM (11 years ago)
Author:
ladanyi
Message:

Updated BSP to current Clp/stable/1.8 and Cbc/stable/2.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/BSP/Cbc/src/CbcSolver.cpp

    r1024 r1031  
    509509  parameters_[whichParam(COMBINE,numberParameters_,parameters_)].setCurrentOption("on");
    510510  parameters_[whichParam(RINS,numberParameters_,parameters_)].setCurrentOption("off");
     511  parameters_[whichParam(DINS,numberParameters_,parameters_)].setCurrentOption("off");
    511512  parameters_[whichParam(RENS,numberParameters_,parameters_)].setCurrentOption("off");
    512513  parameters_[whichParam(LOCALTREE,numberParameters_,parameters_)].setCurrentOption("off");
     
    32063207  parameters[whichParam(COMBINE,numberParameters,parameters)].setCurrentOption("on");
    32073208  parameters[whichParam(RINS,numberParameters,parameters)].setCurrentOption("off");
     3209  parameters[whichParam(DINS,numberParameters,parameters)].setCurrentOption("off");
    32083210  parameters[whichParam(RENS,numberParameters,parameters)].setCurrentOption("off");
    32093211  parameters[whichParam(LOCALTREE,numberParameters,parameters)].setCurrentOption("off");
     
    32343236  int useRINS = parameters_[whichParam(RINS,numberParameters_,parameters_)].currentOptionAsInteger();
    32353237  int useRENS = parameters_[whichParam(RENS,numberParameters_,parameters_)].currentOptionAsInteger();
     3238  int useDINS = parameters_[whichParam(DINS,numberParameters_,parameters_)].currentOptionAsInteger();
    32363239  int useDIVING2 = parameters_[whichParam(DIVINGS,numberParameters_,parameters_)].currentOptionAsInteger();
    32373240  // FPump done first as it only works if no solution
     
    33783381      heuristic5.setDecayFactor(1.5);
    33793382    model->addHeuristic(&heuristic5) ;
     3383    anyToDo=true;
     3384  }
     3385  if (useDINS>=kType) {
     3386    CbcHeuristicDINS heuristic5a(*model);
     3387    heuristic5a.setHeuristicName("DINS");
     3388    heuristic5a.setFractionSmall(0.6);
     3389    if (useDINS==1)
     3390      heuristic5a.setDecayFactor(5.0);
     3391    else
     3392      heuristic5a.setDecayFactor(1.5);
     3393    heuristic5a.setNumberNodes(1000);
     3394    model->addHeuristic(&heuristic5a) ;
    33803395    anyToDo=true;
    33813396  }
     
    46804695              break;
    46814696            case RINS:
     4697              break;
     4698            case DINS:
    46824699              break;
    46834700            case RENS:
Note: See TracChangeset for help on using the changeset viewer.