mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

nla review (#4321)

Browse source 
* simplify the nla_solver interface

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* more simplifications

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* init m_use_nra_model

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* work on NSB comments

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* work on NSB comments

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Lev Nachmanson 2020-05-13 13:52:42 -07:00 • committed by GitHub
parent 16aec328f1
commit 6b28973799
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 71 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/math/lp/nla_core.cpp
View file

@ -1476,21 +1476,16 @@ lbool core::check(vector<lemma>& l_vec) {
patch_monomials_with_real_vars();
if (m_to_refine.is_empty()) { return l_true; }
init_search();
set_use_nra_model(false);
if (need_to_call_algebraic_methods() && m_horner.horner_lemmas())
goto finish_up;
if (!done()) {
clear_and_resize_active_var_set(); // NSB code review: why is this independent of whether Grobner is run?
if (m_nla_settings.run_grobner()) {
if (need_to_call_algebraic_methods()) {
if (!m_horner.horner_lemmas() && m_nla_settings.run_grobner() && !done()) {
clear_and_resize_active_var_set();
find_nl_cluster();
run_grobner();
run_grobner();
}
}
TRACE("nla_solver_details", print_terms(tout); tout << m_lar_solver.constraints(););
if (!done())
m_basics.basic_lemma(true);
@ -1511,6 +1506,7 @@ lbool core::check(vector<lemma>& l_vec) {
m_tangents.tangent_lemma();
}
if (!m_reslim.inc())
return l_undef;