Changeset 867 for stable/0.4


Ignore:
Timestamp:
Jul 3, 2012 12:58:04 PM (8 years ago)
Author:
stefan
Message:

fixes to options docu: xpress-mp is apparently another option for lp_solver; remove redundant statement of default value; add missing setting of registering category

Location:
stable/0.4/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/branch/CouenneChooseVariable.cpp

    r808 r867  
    203203    sprintf (optname,  "branch_pt_select_%s", br_ops [i].c_str ());
    204204    sprintf (optname2, "branch_lp_clamp_%s",  br_ops [i].c_str ());
    205     sprintf (description, "Chooses branching point selection strategy for operator %s",
     205    sprintf (description, "Chooses branching point selection strategy for operator %s.",
    206206             br_ops [i].c_str ());
    207207
     
    223223    roptions -> AddBoundedNumberOption
    224224      (optname2,
    225        "Defines safe interval percentage [0,0.5] for using LP point as a branching point",
     225       "Defines safe interval percentage [0,0.5] for using LP point as a branching point.",
    226226       0.,false,
    227227       0.5,false,
    228        0.2,
    229        "Default value is 0.2.");
     228       0.2);
    230229  }
    231230
     
    236235     0.,false,
    237236     1.,false,
    238      default_alpha,
    239      "Default value is 0.25.");
     237     default_alpha);
    240238
    241239  roptions -> AddBoundedNumberOption
    242240    ("branch_lp_clamp",
    243      "Defines safe interval percentage for using LP point as a branching point",
     241     "Defines safe interval percentage for using LP point as a branching point.",
    244242     0.,false,
    245243     1.,false,
    246      0.2,
    247      "Default value is 0.2.");
     244     0.2);
    248245
    249246  roptions -> AddLowerBoundedIntegerOption
  • stable/0.4/Couenne/src/main/BonCouenneSetup.cpp

    r854 r867  
    893893                                "no", "");
    894894
    895   roptions -> AddStringOption4 ("lp_solver",
     895  roptions -> AddStringOption5 ("lp_solver",
    896896                                "Linear Programming solver for the linearization",
    897897                                "clp",
    898                                 "clp",    "Use the Coin-OR Open Source solver CLP",
     898                                "clp",    "Use the COIN-OR Open Source solver CLP",
    899899                                "cplex",  "Use the commercial solver Cplex (license is needed)",
    900900                                "gurobi", "Use the commercial solver Gurobi (license is needed)",
    901                                 "soplex", "Use the freely available Soplex");
     901                                "soplex", "Use the freely available Soplex",
     902                               "xpress-mp", "Use the commercial solver Xpress MP (license is needed)"
     903                                );
    902904
    903905#define addLevOption(optname,comment) roptions -> AddBoundedIntegerOption (optname, comment, -2, J_LAST_LEVEL-1, J_NONE, "")
  • stable/0.4/Couenne/src/problem/problem.cpp

    r752 r867  
    400400/// Add list of options to be read from file
    401401void CouenneProblem::registerOptions (Ipopt::SmartPtr <Bonmin::RegisteredOptions> roptions) {
     402
     403  roptions -> SetRegisteringCategory ("Couenne options", Bonmin::RegisteredOptions::CouenneCategory);
    402404
    403405  roptions -> AddNumberOption
Note: See TracChangeset for help on using the changeset viewer.