diff --git a/README.md b/README.md index e599f8ae6..ecee3a3c0 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ Install simply with `pip install cpmpy` CPMpy can translate to a wide variety of constraint solving paradigms, including both commercial and open-source solvers. * **CP Solvers**: OR-Tools (default), IBM CP Optimizer (license required), Choco, Glasgow GCS, Pumpkin, MiniZinc+solvers -* **ILP Solvers**: Gurobi (license required) +* **ILP Solvers**: Gurobi (license required), CPLEX (license required) +* **GO Solvers**: Hexaly (license required) * **SMT Solvers**: Z3 * **PB Solvers**: Exact, Pindakaas * **SAT Solvers**: PySAT+solvers, PySDD diff --git a/cpmpy/solvers/hexaly.py b/cpmpy/solvers/hexaly.py index e6d670209..300de0f2d 100644 --- a/cpmpy/solvers/hexaly.py +++ b/cpmpy/solvers/hexaly.py @@ -6,8 +6,7 @@ """ Interface to Hexaly's API - - Hexaly is a local search solver with support for global constraints. + Hexaly is a global optimization solver that supports nonlinear and a few global constraints. Always use :func:`cp.SolverLookup.get("hexaly") ` to instantiate the solver object. @@ -21,7 +20,7 @@ $ pip install hexaly -i https://pip.hexaly.com - The Hexaly local solver requires an active licence (for example a free academic license) + It also requires to install the Hexaly Optimizer with a Hexaly license (for example a free academic license) You can read more about available licences at https://www.hexaly.com/ See detailed installation instructions at: diff --git a/docs/index.rst b/docs/index.rst index 1cabdd9d9..076375b90 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -60,6 +60,11 @@ Supported solvers - SAT ASAT ISAT - OPT IOPT - pip - + * - :doc:`Hexaly ` + - Global Opt. + - SAT ALLSAT - OPT IOPT + - pip + local + (aca.) licence + - * - :doc:`Gurobi ` - ILP - SAT - OPT IOPT - PAR @@ -76,27 +81,21 @@ Supported solvers - pip >3.10 (Linux, Win) - Manual installation on Mac possible * - :doc:`Pindakaas ` - - Pseudo-Boolean + - SAT Encoder - SAT - local install (git + pip > 3.10) - - Encodes to SAT + - * - :doc:`PySAT ` - SAT - SAT ASAT ISAT - pip - * - :doc:`PySDD ` - - SAT Counter + - Decis. Diagram - SAT ISAT ALLSAT - KC - pip - only Boolean variables (CPMpy transformation incomplete) - * - :doc:`Hexaly ` - - Local search - - SAT ALLSAT - OPT IOPT - - pip + local + (aca.) licence - - - Native capability abbreviations: * SAT: Satisfaction, ASAT: Satisfaction under Assumptions+core extraction, ISAT: Incremental Satisfaction, ALLSAT: All solution enumeration * OPT: Optimisation, IOPT: Incremental optimisation