remove legacy solve_eqs_tactic entirely

also, bug fixes to elim_unconstrained (elim_uncnstr2) which is to replace legacy tactic for eliminating unconstrained constants.

src/tactic/core/CMakeLists.txt

@@ -18,7 +18,6 @@ z3_add_component(core_tactics
     propagate_values_tactic.cpp
     reduce_args_tactic.cpp
     simplify_tactic.cpp
-    solve_eqs_tactic.cpp
     special_relations_tactic.cpp
     split_clause_tactic.cpp
     symmetry_reduce_tactic.cpp
@@ -48,7 +47,6 @@ z3_add_component(core_tactics
     reduce_args_tactic.h
     simplify_tactic.h
     solve_eqs_tactic.h
-    solve_eqs2_tactic.h
     special_relations_tactic.h
     split_clause_tactic.h
     symmetry_reduce_tactic.h

src/tactic/core/elim_uncnstr2_tactic.h

@@ -30,7 +30,7 @@ public:
 };
 
 inline tactic * mk_elim_uncnstr2_tactic(ast_manager & m, params_ref const & p = params_ref()) {
-    return alloc(dependent_expr_state_tactic, m, p, alloc(elim_uncnstr2_tactic_factory), "elim-unconstr2");
+    return alloc(dependent_expr_state_tactic, m, p, alloc(elim_uncnstr2_tactic_factory), "elim-uncnstr2");
 }
 
 

src/tactic/core/solve_eqs2_tactic.h

@@ -1,47 +0,0 @@
-/*++
-Copyright (c) 2022 Microsoft Corporation
-
-Module Name:
-
-    solve_eqs2_tactic.h
-
-Abstract:
-
-    Tactic for solving variables
-
-Author:
-
-    Nikolaj Bjorner (nbjorner) 2022-10-30
-
---*/
-#pragma once
-
-#include "util/params.h"
-#include "tactic/tactic.h"
-#include "tactic/dependent_expr_state_tactic.h"
-#include "ast/simplifiers/solve_eqs.h"
-
-
-class solve_eqs2_tactic_factory : public dependent_expr_simplifier_factory {
-public:
-    dependent_expr_simplifier* mk(ast_manager& m, params_ref const& p, dependent_expr_state& s) override {
-        return alloc(euf::solve_eqs, m, s);
-    }
-};
-
-inline tactic * mk_solve_eqs2_tactic(ast_manager& m, params_ref const& p = params_ref()) {
-    return alloc(dependent_expr_state_tactic, m, p, alloc(solve_eqs2_tactic_factory), "solve-eqs");
-}
-
-#if 1
-inline tactic * mk_solve_eqs_tactic(ast_manager & m, params_ref const & p = params_ref()) {
-    return mk_solve_eqs2_tactic(m, p);
-}
-#endif
-
-
-/*
-  ADD_TACTIC("solve-eqs2", "solve for variables.", "mk_solve_eqs2_tactic(m, p)")
-*/
-
-

src/tactic/core/solve_eqs_tactic.h

@@ -1,37 +1,47 @@
 /*++
-Copyright (c) 2011 Microsoft Corporation
+Copyright (c) 2022 Microsoft Corporation
 
 Module Name:
 
-    solve_eqs_tactic.h
+    solve_eqs2_tactic.h
 
 Abstract:
 
-    Tactic for solving equations and performing gaussian elimination.
+    Tactic for solving variables
 
 Author:
 
-    Leonardo de Moura (leonardo) 2011-12-29.
-
-Revision History:
+    Nikolaj Bjorner (nbjorner) 2022-10-30
 
 --*/
 #pragma once
 
 #include "util/params.h"
-class ast_manager;
-class tactic;
+#include "tactic/tactic.h"
+#include "tactic/dependent_expr_state_tactic.h"
+#include "ast/simplifiers/solve_eqs.h"
 
-tactic * mk_solve_eqs1_tactic(ast_manager & m, params_ref const & p = params_ref());
 
-#if 0
+class solve_eqs2_tactic_factory : public dependent_expr_simplifier_factory {
+public:
+    dependent_expr_simplifier* mk(ast_manager& m, params_ref const& p, dependent_expr_state& s) override {
+        return alloc(euf::solve_eqs, m, s);
+    }
+};
+
+inline tactic * mk_solve_eqs2_tactic(ast_manager& m, params_ref const& p = params_ref()) {
+    return alloc(dependent_expr_state_tactic, m, p, alloc(solve_eqs2_tactic_factory), "solve-eqs");
+}
+
+#if 1
 inline tactic * mk_solve_eqs_tactic(ast_manager & m, params_ref const & p = params_ref()) {
-    return mk_solve_eqs1_tactic(m, p);
+    return mk_solve_eqs2_tactic(m, p);
 }
 #endif
 
+
 /*
-  ADD_TACTIC("solve-eqs", "eliminate variables by solving equations.", "mk_solve_eqs1_tactic(m, p)")
+  ADD_TACTIC("solve-eqs", "solve for variables.", "mk_solve_eqs2_tactic(m, p)")
 */
 
 

src/tactic/dependent_expr_state_tactic.h

@@ -81,6 +81,11 @@ public:
         m_simp->updt_params(m_params);
     }
 
+    void collect_param_descrs(param_descrs& r) override {
+        init();
+        m_simp->collect_param_descrs(r);
+    }
+
     tactic * translate(ast_manager & m) override {
         return alloc(dependent_expr_state_tactic, m, m_params, m_factory.get(), name());
     }

src/tactic/sls/sls_tactic.cpp

@@ -18,7 +18,6 @@ Notes:
 --*/
 #include "ast/normal_forms/nnf.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/bv/bv_size_reduction_tactic.h"
 #include "tactic/bv/max_bv_sharing_tactic.h"
 #include "tactic/core/simplify_tactic.h"

src/tactic/smtlogics/qfaufbv_tactic.cpp

@@ -17,7 +17,6 @@ Notes:
 
 --*/
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/bv/bit_blaster_tactic.h"

src/tactic/smtlogics/qfauflia_tactic.cpp

@@ -21,7 +21,6 @@ Notes:
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/arith/propagate_ineqs_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "tactic/smtlogics/smt_tactic.h"
 

src/tactic/smtlogics/qfbv_tactic.cpp

@@ -20,7 +20,6 @@ Notes:
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "tactic/bv/bit_blaster_tactic.h"
 #include "tactic/bv/bv1_blaster_tactic.h"

src/tactic/smtlogics/qfidl_tactic.cpp

@@ -21,7 +21,6 @@ Notes:
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/arith/propagate_ineqs_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "tactic/arith/normalize_bounds_tactic.h"
 #include "tactic/arith/fix_dl_var_tactic.h"

src/tactic/smtlogics/qflia_tactic.cpp

@@ -22,7 +22,6 @@ Notes:
 #include "tactic/arith/propagate_ineqs_tactic.h"
 #include "tactic/arith/normalize_bounds_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "tactic/arith/add_bounds_tactic.h"
 #include "tactic/arith/pb2bv_tactic.h"

src/tactic/smtlogics/qfuf_tactic.cpp

@@ -21,7 +21,6 @@ Notes:
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/symmetry_reduce_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/smtlogics/smt_tactic.h"
 

src/tactic/smtlogics/qfufbv_tactic.cpp

@@ -21,7 +21,6 @@ Notes:
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "tactic/bv/max_bv_sharing_tactic.h"
 #include "tactic/bv/bv_size_reduction_tactic.h"

src/tactic/smtlogics/quant_tactics.cpp

@@ -20,7 +20,6 @@ Revision History:
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/elim_uncnstr_tactic.h"
 #include "qe/lite/qe_lite.h"
 #include "qe/qsat.h"

src/tactic/ufbv/ufbv_tactic.cpp

@@ -20,7 +20,6 @@ Notes:
 #include "tactic/core/simplify_tactic.h"
 #include "tactic/core/propagate_values_tactic.h"
 #include "tactic/core/solve_eqs_tactic.h"
-#include "tactic/core/solve_eqs2_tactic.h"
 #include "tactic/core/distribute_forall_tactic.h"
 #include "tactic/core/der_tactic.h"
 #include "tactic/core/reduce_args_tactic.h"