From 641f783cb50c7dd24e23bb44b2fcfb46d0356598 Mon Sep 17 00:00:00 2001 From: BESSON Frederic Date: Fri, 22 Jan 2021 22:13:22 +0100 Subject: [micromega] Deprecate hopefully useless options and flags The goal is to eventually only use the Simplex solver and remove all the code needed for fourier elimination. --- doc/sphinx/addendum/micromega.rst | 6 ++++-- plugins/micromega/certificate.ml | 2 +- plugins/micromega/coq_micromega.ml | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/sphinx/addendum/micromega.rst b/doc/sphinx/addendum/micromega.rst index 3bd85d29c8..474dac3615 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. + If it is not set, the decision procedures are using 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 ()) -- cgit v1.2.3 From 45f3e5fcda47733a3f0bab42469244f1cbfa9d9b Mon Sep 17 00:00:00 2001 From: BESSON Frederic Date: Fri, 22 Jan 2021 22:24:12 +0100 Subject: changelog --- doc/changelog/04-tactics/13781-deprecate_micromega_options.rst | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/changelog/04-tactics/13781-deprecate_micromega_options.rst 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..5f71203140 --- /dev/null +++ b/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst @@ -0,0 +1,3 @@ +- **Deprecated:** + The micromega option :flag:`Simplex` is deprecated. It is already set by default and will be removed. + (`#13781 `_, by Frédéric Besson). -- cgit v1.2.3 From b8561224dc91ae7236173022676a907ea93a1ef9 Mon Sep 17 00:00:00 2001 From: Frédéric Besson Date: Mon, 25 Jan 2021 10:16:27 +0100 Subject: Update doc/sphinx/addendum/micromega.rst Co-authored-by: Jim Fehrle --- doc/sphinx/addendum/micromega.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx/addendum/micromega.rst b/doc/sphinx/addendum/micromega.rst index 474dac3615..5d471c695c 100644 --- a/doc/sphinx/addendum/micromega.rst +++ b/doc/sphinx/addendum/micromega.rst @@ -34,8 +34,8 @@ tactics for solving arithmetic goals over :math:`\mathbb{Q}`, .. 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 the *deprecated* Fourier elimination. + use the Simplex method for solving linear goals instead of the + deprecated Fourier elimination. .. opt:: Dump Arith -- cgit v1.2.3 From a3b78a289d5a061970136ce297b50ece1c13b0e4 Mon Sep 17 00:00:00 2001 From: Frédéric Besson Date: Mon, 25 Jan 2021 10:18:32 +0100 Subject: Update doc/changelog/04-tactics/13781-deprecate_micromega_options.rst Co-authored-by: Jim Fehrle --- doc/changelog/04-tactics/13781-deprecate_micromega_options.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst b/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst index 5f71203140..e3375bd875 100644 --- a/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst +++ b/doc/changelog/04-tactics/13781-deprecate_micromega_options.rst @@ -1,3 +1,3 @@ - **Deprecated:** - The micromega option :flag:`Simplex` is deprecated. It is already set by default and will be removed. + The micromega option :flag:`Simplex`, which is currently set by default (`#13781 `_, by Frédéric Besson). -- cgit v1.2.3