update expected help text

conjure-cp · Nov 8, 2023 · 3a35696 · 3a35696
1 parent f2525f2
commit 3a35696
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/conjure-help.html b/docs/conjure-help.html
@@ -135,7 +135,7 @@
 <tr><td colspan='3'>Options for other tools:</td></tr>
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--savilerow-options=ITEM</td><td style='padding-left:2ex;'>Options passed to Savile Row.</td></tr>
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--solver-options=ITEM</td><td style='padding-left:2ex;'>Options passed to the backend solver.</td></tr>
-<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--solver=ITEM</td><td style='padding-left:2ex;'>Backend solver. Possible values:<br /> - minion (CP solver)<br /> - gecode (CP solver)<br /> - chuffed (CP solver)<br /> - glucose (SAT solver)<br /> - glucose-syrup (SAT solver)<br /> - lingeling/plingeling/treengeling (SAT solver)<br /> - cadical (SAT solver)<br /> - kissat (SAT solver)<br /> - minisat (SAT solver)<br /> - bc_minisat_all (AllSAT solver, only works with --number-of-solutions=all)<br /> - nbc_minisat_all (AllSAT solver, only works with --number-of-solutions=all)<br /> - open-wbo (MaxSAT solver, only works with optimisation problems)<br /> - coin-or (MIP solver, implemented via MiniZinc)<br /> - cplex (MIP solver, implemented via MiniZinc)<br /> - boolector (SMT solver, supported logics: bv)<br /> - yices (SMT solver, supported logics: bv, lia, idl)<br /> - z3 (SMT solver, supported logics: bv, lia, nia, idl)<br />Default: minion<br /><br />Default logic for SMT solvers is bitvector (bv).<br />Append a dash and the name of a logic to the solver name to choose a different logic. For example yices-idl.</td></tr>
+<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--solver=ITEM</td><td style='padding-left:2ex;'>Backend solver. Possible values:<br /> - minion (CP solver)<br /> - gecode (CP solver)<br /> - chuffed (CP solver)<br /> - or-tools (CP solver)<br /> - glucose (SAT solver)<br /> - glucose-syrup (SAT solver)<br /> - lingeling/plingeling/treengeling (SAT solver)<br /> - cadical (SAT solver)<br /> - kissat (SAT solver)<br /> - minisat (SAT solver)<br /> - bc_minisat_all (AllSAT solver, only works with --number-of-solutions=all)<br /> - nbc_minisat_all (AllSAT solver, only works with --number-of-solutions=all)<br /> - open-wbo (MaxSAT solver, only works with optimisation problems)<br /> - coin-or (MIP solver, implemented via MiniZinc)<br /> - cplex (MIP solver, implemented via MiniZinc)<br /> - boolector (SMT solver, supported logics: bv)<br /> - yices (SMT solver, supported logics: bv, lia, idl)<br /> - z3 (SMT solver, supported logics: bv, lia, nia, idl)<br />Default: minion<br /><br />Default logic for SMT solvers is bitvector (bv).<br />Append a dash and the name of a logic to the solver name to choose a different logic. For example yices-idl.</td></tr>
 <tr><td colspan='3'>&nbsp;</tr>
 <tr><td colspan='3'>conjure ide [OPTIONS] ESSENCE_FILE</td></tr>
 <tr><td colspan='3' style='padding-left:2ex;'>IDE support features for Conjure.<br />Not intended for direct use.</td></tr>

diff --git a/docs/conjure-help.txt b/docs/conjure-help.txt
@@ -262,6 +262,7 @@
                                                - minion (CP solver)
                                                - gecode (CP solver)
                                                - chuffed (CP solver)
+                                               - or-tools (CP solver)
                                                - glucose (SAT solver)
                                                - glucose-syrup (SAT solver)
                                                - lingeling/plingeling/treengeling (SAT solver)