mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15: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

49
src/math/grobner/grobner.cpp
View file

@ -923,30 +923,39 @@ void grobner::superpose(equation * eq) {
}
}
bool grobner::compute_basis(unsigned threshold) {
void grobner::compute_basis_init() {
m_stats.m_compute_basis++;
m_num_new_equations = 0;
while (m_num_new_equations < threshold) {
equation * eq = pick_next();
if (!eq)
return true;
m_stats.m_num_processed++;
}
bool grobner::compute_basis_step() {
equation * eq = pick_next();
if (!eq)
return true;
m_stats.m_num_processed++;
#ifdef PROFILE_GB
if (m_stats.m_num_processed % 100 == 0) {
verbose_stream() << "[grobner] " << m_processed.size() << " " << m_to_process.size() << "\n";
}
if (m_stats.m_num_processed % 100 == 0) {
verbose_stream() << "[grobner] " << m_processed.size() << " " << m_to_process.size() << "\n";
}
#endif
equation * new_eq = simplify_using_processed(eq);
if (new_eq != 0 && eq != new_eq) {
// equation was updated using non destructive updates
m_equations_to_unfreeze.push_back(eq);
eq = new_eq;
}
simplify_processed(eq);
superpose(eq);
m_processed.insert(eq);
simplify_to_process(eq);
TRACE("grobner", tout << "end of iteration:\n"; display(tout););
equation * new_eq = simplify_using_processed(eq);
if (new_eq != 0 && eq != new_eq) {
// equation was updated using non destructive updates
m_equations_to_unfreeze.push_back(eq);
eq = new_eq;
}
simplify_processed(eq);
superpose(eq);
m_processed.insert(eq);
simplify_to_process(eq);
TRACE("grobner", tout << "end of iteration:\n"; display(tout););
return false;
}
bool grobner::compute_basis(unsigned threshold) {
compute_basis_init();
while (m_num_new_equations < threshold) {
if (compute_basis_step()) return true;
}
return false;
}

9
src/math/grobner/grobner.h
View file

@ -251,6 +251,15 @@ public:
*/
bool compute_basis(unsigned threshold);
/**
\brief Compute one step Grobner basis.
Return true if there is no new equation to take.
*/
void compute_basis_init();
bool compute_basis_step();
unsigned get_num_new_equations() { return m_num_new_equations; }
/**
\brief Return true if an inconsistency was detected.
*/