Changeset 100


Ignore:
Timestamp:
Oct 31, 2006 10:30:02 AM (12 years ago)
Author:
pbonami
Message:

Make var selection option

Location:
branches/devel/Bonmin/src/CbcBonmin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/CbcBonmin/BonCbc.cpp

    r98 r100  
    388388    CbcBranchUserDecision branch;
    389389
     390
     391    if(par.varSelection == 3){
    390392    // AW: Try to set new chooseVariable object
    391     BonChooseVariable chooseVariable(nlpSolver);
    392     chooseVariable.setNumberStrong(model.numberStrong());
    393     branch.setChooseMethod(chooseVariable);
     393      BonChooseVariable chooseVariable(nlpSolver);
     394      chooseVariable.setNumberStrong(model.numberStrong());
     395      branch.setChooseMethod(chooseVariable);}
    394396
    395397    model.setBranchingMethod(&branch);
  • branches/devel/Bonmin/src/CbcBonmin/BonCbcParam.cpp

    r99 r100  
    4444    // Branch & bound setting
    4545    success &= Options->GetEnumValue("nodeselect_stra",nodeSelection,"bonmin.");
    46     success &= Options->GetEnumValue("varseselect_stra",varSelection,"bonmin.");
     46    success &= Options->GetEnumValue("varselect_stra",varSelection,"bonmin.");
    4747    success &= Options->GetIntegerValue("number_strong_branch",numberStrong,"bonmin.");
    4848    success &= Options->GetIntegerValue("number_before_trust", minReliability,"bonmin.");
Note: See TracChangeset for help on using the changeset viewer.