Changeset 1544


Ignore:
Timestamp:
Jan 19, 2010 6:18:50 PM (10 years ago)
Author:
pbonami
Message:

Changes to options reports

Location:
trunk/Bonmin/src/Algorithms/Branching
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Algorithms/Branching/BonChooseVariable.cpp

    r1505 r1544  
    164164        "least-fractional", "Sort by increasing integer infeasibility","");
    165165
    166     roptions->setOptionExtraInfo("candidate_sort_criterion",31);
     166    roptions->setOptionExtraInfo("candidate_sort_criterion",63);
    167167
    168168    roptions->AddBoundedNumberOption("setup_pseudo_frac", "Proportion of strong branching list that has to be taken from most-integer-infeasible list.",
    169169        0., false, 1., false, 0.5);
    170     roptions->setOptionExtraInfo("setup_pseudo_frac",31);
     170    roptions->setOptionExtraInfo("setup_pseudo_frac",63);
    171171    roptions->AddBoundedNumberOption("maxmin_crit_no_sol", "Weight towards minimum in of lower and upper branching estimates when no solution has been found yet.",
    172172        0., false, 1., false, 0.7);
    173     roptions->setOptionExtraInfo("maxmin_crit_no_sol",31);
     173    roptions->setOptionExtraInfo("maxmin_crit_no_sol",63);
    174174    roptions->AddBoundedNumberOption("maxmin_crit_have_sol", "Weight towards minimum in of lower and upper branching estimates when a solution has been found.",
    175175        0., false, 1., false, 0.1);
    176     roptions->setOptionExtraInfo("maxmin_crit_have_sol",31);
     176    roptions->setOptionExtraInfo("maxmin_crit_have_sol",63);
    177177    roptions->AddLowerBoundedIntegerOption("number_before_trust_list",
    178178        "Set the number of branches on a variable before its pseudo costs are to be believed during setup of strong branching candidate list.",
    179179        -1, 0, "The default value is that of \"number_before_trust\"");
    180     roptions->setOptionExtraInfo("number_before_trust_list",31);
     180    roptions->setOptionExtraInfo("number_before_trust_list",63);
    181181    roptions->AddLowerBoundedIntegerOption("number_strong_branch_root",
    182182        "Maximum number of variables considered for strong branching in root node.",
    183183        0, COIN_INT_MAX, "");
    184     roptions->setOptionExtraInfo("number_strong_branch_root",31);
     184    roptions->setOptionExtraInfo("number_strong_branch_root",63);
    185185
    186186    roptions->AddLowerBoundedIntegerOption("min_number_strong_branch", "Sets minimum number of variables for strong branching (overriding trust)",
    187187        0, 0,"");
    188     roptions->setOptionExtraInfo("min_number_strong_branch",31);
     188    roptions->setOptionExtraInfo("min_number_strong_branch",63);
    189189    roptions->AddStringOption2("trust_strong_branching_for_pseudo_cost",
    190190                               "Whether or not to trust strong branching results for updating pseudo costs.",
     
    194194                               ""
    195195                               );
    196     roptions->setOptionExtraInfo("trust_strong_branching_for_pseudo_cost", 31);
     196    roptions->setOptionExtraInfo("trust_strong_branching_for_pseudo_cost", 63);
    197197
    198198    roptions->AddLowerBoundedIntegerOption("number_look_ahead", "Sets limit of look-ahead strong-branching trials",
  • trunk/Bonmin/src/Algorithms/Branching/BonLpBranchingSolver.cpp

    r1407 r1544  
    221221     0,0,
    222222     "");
    223     roptions->setOptionExtraInfo("ecp_max_rounds_strong",15);
     223    roptions->setOptionExtraInfo("ecp_max_rounds_strong",63);
    224224    roptions->AddLowerBoundedNumberOption
    225225    ("ecp_abs_tol_strong",
     
    227227     0,false,1e-6,
    228228     "");
    229     roptions->setOptionExtraInfo("ecp_abs_tol_strong",15);
     229    roptions->setOptionExtraInfo("ecp_abs_tol_strong",63);
    230230    roptions->AddLowerBoundedNumberOption
    231231    ("ecp_rel_tol_strong",
     
    233233     0,false,1e-1,
    234234     "");
    235     roptions->setOptionExtraInfo("ecp_rel_tol_strong",15);
     235    roptions->setOptionExtraInfo("ecp_rel_tol_strong",63);
    236236    roptions->AddStringOption2
    237237    ("lp_strong_warmstart_method",
     
    241241     "Clone", "Clone optimal problem of node",
    242242     "(Advanced stuff)");
    243     roptions->setOptionExtraInfo("lp_strong_warmstart_method",15);
     243    roptions->setOptionExtraInfo("lp_strong_warmstart_method",63);
    244244  }
    245245
Note: See TracChangeset for help on using the changeset viewer.