mirror of
https://github.com/Z3Prover/z3
synced 2025-06-08 23:23:23 +00:00
use member variable rather that static
This commit is contained in:
parent
64152c338d
commit
b968898b7e
2 changed files with 5 additions and 4 deletions
|
@ -192,10 +192,9 @@ namespace polysat {
|
||||||
void solver::propagate() {
|
void solver::propagate() {
|
||||||
if (!can_propagate())
|
if (!can_propagate())
|
||||||
return;
|
return;
|
||||||
static bool propagating = false;
|
if (m_propagating)
|
||||||
if (propagating)
|
|
||||||
return;
|
return;
|
||||||
propagating = true;
|
m_propagating = true;
|
||||||
push_qhead();
|
push_qhead();
|
||||||
while (can_propagate()) {
|
while (can_propagate()) {
|
||||||
auto const& item = m_search[m_qhead++];
|
auto const& item = m_search[m_qhead++];
|
||||||
|
@ -207,6 +206,7 @@ namespace polysat {
|
||||||
linear_propagate();
|
linear_propagate();
|
||||||
SASSERT(wlist_invariant());
|
SASSERT(wlist_invariant());
|
||||||
SASSERT(assignment_invariant());
|
SASSERT(assignment_invariant());
|
||||||
|
m_propagating = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -104,8 +104,9 @@ namespace polysat {
|
||||||
vector<justification> m_justification; // justification for variable assignment
|
vector<justification> m_justification; // justification for variable assignment
|
||||||
vector<signed_constraints> m_pwatch; // watch list datastructure into constraints.
|
vector<signed_constraints> m_pwatch; // watch list datastructure into constraints.
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
std::optional<pvar> m_locked_wlist; // restrict watch list modification while it is begin propagated
|
std::optional<pvar> m_locked_wlist; // restrict watch list modification while it is being propagated
|
||||||
#endif
|
#endif
|
||||||
|
bool m_propagating = false; // set to true during propagation
|
||||||
|
|
||||||
unsigned_vector m_activity;
|
unsigned_vector m_activity;
|
||||||
vector<pdd> m_vars;
|
vector<pdd> m_vars;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue