Changeset 784 for stable/0.4


Ignore:
Timestamp:
Oct 30, 2011 3:00:54 PM (8 years ago)
Author:
stefan
Message:

fixes to parameter docu

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/heuristics/CouenneIterativeRounding.cpp

    r692 r784  
    11711171       "to find feasible solutions for the problem. "
    11721172       "The heuristic may take some time, but usually finds good solutions. "
    1173        "Recommended if you want good upper bounds and have Cplex."
     1173       "Recommended if you want good upper bounds and have Cplex. "
    11741174       "Not recommended if you do not have Cplex");
    11751175
     
    11781178       "Specify the maximum time allowed for the Iterative Rounding heuristic",
    11791179       -1, "Maximum CPU time employed by the Iterative Rounding heuristic; "
    1180        "if no solution found in this time, failure is reported."
     1180       "if no solution found in this time, failure is reported. "
    11811181       "This overrides the CPU time set by Aggressiveness if positive.");
    11821182
     
    11951195       0, 2, 1,
    11961196       "Set the aggressiveness of the heuristic; i.e., how many iterations "
    1197        "should be run, and with which parameters. The maximum time can be"
    1198        "overridden by setting the _time and _time_firstcall options."
     1197       "should be run, and with which parameters. The maximum time can be "
     1198       "overridden by setting the _time and _time_firstcall options. "
    11991199       "0 = non aggressive, 1 = standard (default), 2 = aggressive.");
    12001200
     
    12031203       "Max number of points rounded at the beginning of Iterative Rounding",
    12041204       1, 5,
    1205        "Number of different points (obtained solving a log-barrier problem)"
    1206        "that the heuristic will try to round at most, during its execution"
     1205       "Number of different points (obtained solving a log-barrier problem) "
     1206       "that the heuristic will try to round at most, during its execution "
    12071207       "at the root node (i.e. the F-IR heuristic). Default 5.");
    12081208
     
    12111211       "Omega parameter of the Iterative Rounding heuristic",
    12121212       0, true, 1, true, 0.2,
    1213        "Set the omega parameter of the heuristic, which represents a"
    1214        "multiplicative factor for the minimum log-barrier parameter"
    1215        "of the NLP which is solved to obtain feasible points. This"
    1216        "corresponds to \\omega' in the paper. Default 0.2.");
     1213       "Set the omega parameter of the heuristic, which represents a "
     1214       "multiplicative factor for the minimum log-barrier parameter "
     1215       "of the NLP which is solved to obtain feasible points. This "
     1216       "corresponds to $\\omega'$ in the paper. Default 0.2.");
    12171217
    12181218    roptions -> AddLowerBoundedIntegerOption
     
    12201220       "Base rhs of the local branching constraint for Iterative Rounding",
    12211221       0, 15,
    1222        "Base rhs for the local branching constraint that defines a"
    1223        "neighbourhood of the local incumbent. The base rhs is modified by"
    1224        "the algorithm according to variable bounds. This corresponds to"
     1222       "Base rhs for the local branching constraint that defines a "
     1223       "neighbourhood of the local incumbent. The base rhs is modified by "
     1224       "the algorithm according to variable bounds. This corresponds to "
    12251225       "k' in the paper. Default 15.");
    12261226
Note: See TracChangeset for help on using the changeset viewer.