mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

Make Groebner basis computation interruptable. Exponsed in issue #269

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-10-28 11:39:59 -07:00
parent 2a95a77706
commit 6b82b949cf
5 changed files with 52 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/smt/smt_model_checker.cpp
View file

@ -176,10 +176,11 @@ namespace smt {
bindings.set(num_decls - i - 1, sk_value);
}
TRACE("model_checker", tout << q->get_qid() << " found (use_inv: " << use_inv << ") new instance:\n";
TRACE("model_checker", tout << q->get_qid() << " found (use_inv: " << use_inv << ") new instance: ";
for (unsigned i = 0; i < num_decls; i++) {
tout << mk_ismt2_pp(bindings[i], m_manager) << "\n";
});
tout << mk_ismt2_pp(bindings[i], m_manager) << " ";
}
tout << "\n";);
for (unsigned i = 0; i < num_decls; i++)
m_new_instances_bindings.push_back(bindings[i]);

2
src/smt/smt_model_finder.cpp
View file

@ -149,7 +149,7 @@ namespace smt {
SASSERT(!contains_model_value(t));
unsigned gen = (*it).m_value;
expr * t_val = ev.eval(t, true);
TRACE("model_finder", tout << mk_pp(t, m_manager) << "\n";);
TRACE("model_finder", tout << mk_pp(t, m_manager) << " " << mk_pp(t_val, m_manager) << "\n";);
expr * old_t = 0;
if (m_inv.find(t_val, old_t)) {

10
src/smt/theory_arith_nl.h
View file

@ -2227,7 +2227,15 @@ namespace smt {
while (true) {
TRACE("non_linear_gb", tout << "before:\n"; gb.display(tout););
bool r = gb.compute_basis(m_params.m_nl_arith_gb_threshold);
bool r = false;
gb.compute_basis_init();
while (!r && gb.get_num_new_equations() < m_params.m_nl_arith_gb_threshold) {
if (get_context().get_cancel_flag()) {
warn = true;
break;
}
r = gb.compute_basis_step();
}
m_stats.m_gb_simplify += gb.m_stats.m_simplify;
m_stats.m_gb_superpose += gb.m_stats.m_superpose;
m_stats.m_gb_num_processed += gb.m_stats.m_num_processed;