Skip to content

Commit 440c4b8

Browse files
committed
Update reference documentation.
1 parent 62f2a86 commit 440c4b8

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

ortools/math_opt/cpp/model.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,8 @@ class Model {
481481
// The `weights` are an implementation detail in the solver used to order the
482482
// `expressions`; see the Gurobi documentation for more detail:
483483
// https://www.gurobi.com/documentation/9.5/refman/constraints.html#subsubsection:SOSConstraints
484+
// For Xpress see
485+
// https://www.fico.com/fico-xpress-optimization/docs/latest/solver/optimizer/HTML/XPRSaddsets.html
484486
//
485487
// These `weights` must either be empty or the same length as `expressions`.
486488
// If it is empty, default weights of 1, 2, ... will be used.
@@ -540,6 +542,8 @@ class Model {
540542
// The `weights` are an implementation detail in the solver used to order the
541543
// `expressions`; see the Gurobi documentation for more detail:
542544
// https://www.gurobi.com/documentation/9.5/refman/constraints.html#subsubsection:SOSConstraints
545+
// For Xpress see
546+
// https://www.fico.com/fico-xpress-optimization/docs/latest/solver/optimizer/HTML/XPRSaddsets.html
543547
//
544548
// These `weights` must either be empty or the same length as `expressions`.
545549
// If it is empty, default weights of 1, 2, ... will be used.

ortools/math_opt/cpp/parameters.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ struct SolveParameters {
351351
// Solvers will typically not return more solutions than the solution limit,
352352
// but this is not enforced by MathOpt, see also b/214041169.
353353
//
354-
// Currently supported for Gurobi and SCIP, and for CP-SAT only with value 1.
354+
// Currently supported for Gurobi, Xpress and SCIP, and for CP-SAT only with
355+
// value 1.
355356
std::optional<int32_t> solution_limit;
356357

357358
// If unset, use the solver default. If set, it must be >= 1.

ortools/math_opt/solvers/xpress_solver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
namespace operations_research::math_opt {
4343

4444
// Interface to FICO XPRESS solver
45-
// Largely inspired by the Gurobi interface
4645
class XpressSolver : public SolverInterface {
4746
public:
4847
// Creates the XPRESS solver and loads the model into it

0 commit comments

Comments
 (0)