Skip to content

Commit

Permalink
XPRESS: simplify lim: option names
Browse files Browse the repository at this point in the history
  • Loading branch information
Gleb Belov committed Aug 18, 2023
1 parent 92df88d commit 99f1015
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions solvers/xpress/xpressbackend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1190,14 +1190,14 @@ void XpressmpBackend::InitCustomOptions() {
"\n.. value-table::\n",
XPRS_SLEEPONTHREADWAIT, values_sleeponthreadwait, -1);

AddSolverOption("lim:lpiterlimit lpiterlimit",
AddSolverOption("lim:iter lpiterlimit iterlim",
"The maximum number of iterations that will be performed "
"by primal simplex or dual simplex before the optimization "
"process terminates. For MIP problems, this is the maximum "
"total number of iterations over all nodes.",
XPRS_LPITERLIMIT, 2147483645, INT_MAX);

AddSolverOption("lim:lprefineiterlimit lprefineiterlimit",
AddSolverOption("lim:lprefineiter lprefineiterlimit",
"This specifies the simplex iteration limit the solution "
"refiner can spend in attempting to increase the accuracy "
"of an LP solution; default=-1 (automatic).",
Expand Down Expand Up @@ -1270,15 +1270,15 @@ void XpressmpBackend::InitCustomOptions() {
"solution pool is allowed to keep the n best solutions.",
storedOptions_.nbest_);

AddSolverOption("lim:maxmipsol maxmipsol",
AddSolverOption("lim:mipsol maxmipsol",
"Limit on the number of MIP solutions to be found (default no limit).",
XPRS_MAXMIPSOL, 0, INT_MAX);

AddSolverOption("lim:nodes nodelim nodelimit maxnode",
"Maximum MIP nodes to explore (default: 2147483647).",
XPRS_MAXNODE, 2147483647, INT_MAX);

AddSolverOption("lim:maxstalltime maxstalltime",
AddSolverOption("lim:stalltime maxstalltime",
"Maximum time in seconds that the MIP Optimizer will continue to search "
"for improving solution after finding a new incumbent, default=0 (no limit)",
XPRS_MAXSTALLTIME, 0.0, Infinity());
Expand Down Expand Up @@ -1665,7 +1665,7 @@ AddSolverOption("alg:resourcestrategy resourcestrategy",
"Limit on threads used during crossover; default -1 (determined by "
"bar:threads).", XPRS_CROSSOVERTHREADS, -1, INT_MAX);

AddSolverOption("lim:crossoveriterlim bar:crossoveriterlim crossoveriterlim crossoveritlim",
AddSolverOption("lim:crossoveriter bar:crossoveriterlim crossoveriterlim crossoveritlim",
"Limit on crossover iterations after the barrier "
"algorithm; default = 2147483645", XPRS_CROSSOVERITERLIMIT, 1, INT_MAX);

Expand Down Expand Up @@ -1702,7 +1702,7 @@ AddSolverOption("alg:resourcestrategy resourcestrategy",
"algorithm for solving a QP: stop when the limit is hit "
"default = 15", XPRS_BARINDEFLIMIT, 0, INT_MAX);

AddSolverOption("lim:bariterlim bar:iterlim bariterlim",
AddSolverOption("lim:bariter bar:iterlim bariterlim",
"Limit on the number of barrier iterations (default 500).",
XPRS_BARITERLIMIT, 1, INT_MAX);

Expand Down

0 comments on commit 99f1015

Please sign in to comment.