diff --git a/doc/source/drivers.rst b/doc/source/drivers.rst index 7f6fdf627..a060f0b8f 100644 --- a/doc/source/drivers.rst +++ b/doc/source/drivers.rst @@ -20,11 +20,10 @@ For example, ``max(a, b)`` is translated into a constraint which is in turn reformulated for MIP or passed to the solver natively (e.g., Gurobi: `GRBaddgenconstrMax`). -A recent extension to MP allows passing expression trees +A late-2024 extension to MP allows passing expression trees to solvers, see :ref:`supported-constraints`. -There are several implementations, see :ref:`modeling-overview`. -See also the :ref:`modeling-guide`. +The implemented drivers are listed in :ref:`modeling-overview`. .. _expression-solvers: diff --git a/doc/source/modeling-overview.rst b/doc/source/modeling-overview.rst index dc7a2bfba..3ca31056e 100644 --- a/doc/source/modeling-overview.rst +++ b/doc/source/modeling-overview.rst @@ -1,7 +1,7 @@ .. _modeling-overview: -Modeling overview ------------------ +Modeling overview and implemented solvers +------------------------------------------ AMPL's newly extended C++ solver interface library, MP, is publicly @@ -61,7 +61,7 @@ for the following categories of operators and expressions: - Set membership operator: ``in`` Modeling details and examples are given in the :ref:`expressions_supported` section below. -Technical details and tools are in the :ref:`modeling-tools` section. +Technical details, configuration settings, and tools are in the :ref:`modeling-tools` section. See also the individual solvers' documentation at `AMPL Development `_ for more details of solver-specific features: diff --git a/doc/source/modeling-tools.rst b/doc/source/modeling-tools.rst index 1d26366d2..f1b7d56dd 100644 --- a/doc/source/modeling-tools.rst +++ b/doc/source/modeling-tools.rst @@ -9,10 +9,10 @@ This section highlights some tools aiding modeling and solving. .. _supported-constraints: -Supported constructs and configuring the reformulations +Reformulation settings *************************************************************** -This sections gives a technical list of accepted constraints +This sections gives a technical list of solver-side constraints and expressions, as well as control options for their reformulations. @@ -60,8 +60,8 @@ For that, declare all contraints as natively accepted by the solver: set :ref:`MP solver option ` ``acc:_all=2``. Vice versa, to force full linearization, set ``acc:_all=0``. -Alternatively, to disable specific -reformulations, declare them as natively accepted individually: +For individual constraint types, to disable reformulations, +declare them as natively accepted: e.g., ``acc:alldiff=2``. Or, to apply MP reformulation, despite the solver natively accepting the construct, set the option to 0: ``acc:or=0``. @@ -102,7 +102,7 @@ value 0 uses flat constraints (again, those which are natively supported; corresponds to value 2 or 0 in the individual options.) -Finally, the kinds of reformulations which are applied when needed, +Finally, some kinds of reformulations which are applied when needed, along with corresponding configuration settings, are described in :ref:`expressions_supported`.