mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-25 15:23:41 +00:00
Code Activity

start porting grobner basis functionality

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-09-05 15:17:30 -07:00
parent 248e3e092a
commit 7386b7d68d
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/smt/theory_arith_nl.h
View file

@ -2233,7 +2233,7 @@ void theory_arith<Ext>::update_statistics(grobner & gb) {
} }
template<typename Ext> template<typename Ext>
void theory_arith<Ext>::set_gb_exhausted(bool r) { void theory_arith<Ext>::set_gb_exhausted() {
IF_VERBOSE(3, verbose_stream() << "Grobner basis computation interrupted. Increase threshold using NL_ARITH_GB_THRESHOLD=<limit>\n";); IF_VERBOSE(3, verbose_stream() << "Grobner basis computation interrupted. Increase threshold using NL_ARITH_GB_THRESHOLD=<limit>\n";);
get_context().push_trail(value_trail<context, bool>(m_nl_gb_exhausted)); get_context().push_trail(value_trail<context, bool>(m_nl_gb_exhausted));
m_nl_gb_exhausted = true; m_nl_gb_exhausted = true;
@ -2305,6 +2305,19 @@ typename theory_arith<Ext>::gb_result theory_arith<Ext>::scan_for_linear(ptr_vec
return result; return result;
} }
template<typename Ext>
bool theory_arith<Ext>::compute_basis_loop(grobner & gb) {
while (gb.get_num_new_equations() < m_params.m_nl_arith_gb_threshold) {
if (get_context().get_cancel_flag()) {
return false;
}
if (gb.compute_basis_step())
return true;
}
return false;
}
/** /**
\brief Compute Grobner basis, return true if a conflict or new fixed variables were detected. \brief Compute Grobner basis, return true if a conflict or new fixed variables were detected.
*/ */
@ -2321,17 +2334,11 @@ typename theory_arith<Ext>::gb_result theory_arith<Ext>::compute_grobner(svector
while (true) { while (true) {
TRACE("non_linear_gb", tout << "before:\n"; gb.display(tout);); TRACE("non_linear_gb", tout << "before:\n"; gb.display(tout););
bool r = false;
gb.compute_basis_init(); gb.compute_basis_init();
while (!r && gb.get_num_new_equations() < m_params.m_nl_arith_gb_threshold) { bool r = compute_basis_loop(gb);
if (get_context().get_cancel_flag()) {
return GB_FAIL;
}
r = gb.compute_basis_step();
}
update_statistics(gb); update_statistics(gb);
if (!r && !warn) { if (!r && !warn) {
set_gb_exhausted(r); set_gb_exhausted();
warn = true; warn = true;
} }
if (get_context().get_cancel_flag()) { if (get_context().get_cancel_flag()) {