aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoqbot-app[bot]2021-01-28 20:25:52 +0000
committerGitHub2021-01-28 20:25:52 +0000
commit59dc4eb40e9512d95f73df7a6bc67edcb1907acd (patch)
tree1b20f9c404560774ed05aa7b8b34bcf6f1133f36
parenta54a5b83becd3ef7feef1352b56d10a3d74be85f (diff)
parenta3b78a289d5a061970136ce297b50ece1c13b0e4 (diff)
Merge PR #13781: [micromega] Deprecate hopefully useless options and flags
Reviewed-by: Zimmi48 Ack-by: jfehrle
-rw-r--r--doc/changelog/04-tactics/13781-deprecate_micromega_options.rst3
-rw-r--r--doc/sphinx/addendum/micromega.rst6
-rw-r--r--plugins/micromega/certificate.ml2
-rw-r--r--plugins/micromega/coq_micromega.ml6
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst b/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst
new file mode 100644
index 0000000000..e3375bd875
--- /dev/null
+++ b/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst
@@ -0,0 +1,3 @@
+- **Deprecated:**
+ The micromega option :flag:`Simplex`, which is currently set by default
+ (`#13781 <https://github.com/coq/coq/pull/13781>`_, by Frédéric Besson).
diff --git a/doc/sphinx/addendum/micromega.rst b/doc/sphinx/addendum/micromega.rst
index 3bd85d29c8..5d471c695c 100644
--- a/doc/sphinx/addendum/micromega.rst
+++ b/doc/sphinx/addendum/micromega.rst
@@ -31,9 +31,11 @@ tactics for solving arithmetic goals over :math:`\mathbb{Q}`,
.. flag:: Simplex
+ .. deprecated:: 8.14
+
This flag (set by default) instructs the decision procedures to
- use the Simplex method for solving linear goals. If it is not set,
- the decision procedures are using Fourier elimination.
+ use the Simplex method for solving linear goals instead of the
+ deprecated Fourier elimination.
.. opt:: Dump Arith
diff --git a/plugins/micromega/certificate.ml b/plugins/micromega/certificate.ml
index 74d5374193..ed608bb1df 100644
--- a/plugins/micromega/certificate.ml
+++ b/plugins/micromega/certificate.ml
@@ -28,7 +28,7 @@ open Q.Notations
open Mutils
let use_simplex =
- Goptions.declare_bool_option_and_ref ~depr:false ~key:["Simplex"] ~value:true
+ Goptions.declare_bool_option_and_ref ~depr:true ~key:["Simplex"] ~value:true
(* If set to some [file], arithmetic goals are dumped in [file].v *)
diff --git a/plugins/micromega/coq_micromega.ml b/plugins/micromega/coq_micromega.ml
index 5e138fa3d1..91f7e27911 100644
--- a/plugins/micromega/coq_micromega.ml
+++ b/plugins/micromega/coq_micromega.ml
@@ -38,14 +38,14 @@ let max_depth = max_int
(* Search limit for provers over Q R *)
let lra_proof_depth =
- declare_int_option_and_ref ~depr:false ~key:["Lra"; "Depth"] ~value:max_depth
+ declare_int_option_and_ref ~depr:true ~key:["Lra"; "Depth"] ~value:max_depth
(* Search limit for provers over Z *)
let lia_enum =
- declare_bool_option_and_ref ~depr:false ~key:["Lia"; "Enum"] ~value:true
+ declare_bool_option_and_ref ~depr:true ~key:["Lia"; "Enum"] ~value:true
let lia_proof_depth =
- declare_int_option_and_ref ~depr:false ~key:["Lia"; "Depth"] ~value:max_depth
+ declare_int_option_and_ref ~depr:true ~key:["Lia"; "Depth"] ~value:max_depth
let get_lia_option () =
(Certificate.use_simplex (), lia_enum (), lia_proof_depth ())