mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-31 08:23:17 +00:00
Code Activity

build dependencies, invariant annotation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-12-18 13:48:27 -08:00
parent 5e0799225d
commit 469f618742
6 changed files with 108 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/math/dd/dd_pdd.cpp
View file

@ -35,7 +35,7 @@ namespace dd {
imk_val(rational::zero()); // becomes pdd_zero
imk_val(rational::one()); // becomes pdd_one
for (unsigned i = 2; i <= pdd_no_op + 2; ++i) {
m_nodes.push_back(pdd_node(0,0,0));
m_nodes.push_back(pdd_node(0,0,0,0));
m_nodes.back().m_refcount = max_rc;
m_nodes.back().m_index = m_nodes.size()-1;
}
@ -388,6 +388,9 @@ namespace dd {
}
}
double pdd_manager::tree_size(pdd const& p) const { return tree_size(p.root); }
void pdd_manager::push(PDD b) {
m_pdd_stack.push_back(b);
}
@ -440,7 +443,7 @@ namespace dd {
if (is_zero(h)) return l;
SASSERT(is_val(l) || level(l) <= lvl);
SASSERT(is_val(h) || level(h) <= lvl);
pdd_node n(lvl, l, h);
pdd_node n(lvl, l, h, tree_size(l) + tree_size(h) + 1);
return insert_node(n);
}
@ -500,7 +503,7 @@ namespace dd {
return pdd(m_var2pdd[i], this);
}
unsigned pdd_manager::pdd_size(pdd const& b) {
unsigned pdd_manager::dag_size(pdd const& b) {
init_mark();
set_mark(0);
set_mark(1);
@ -527,6 +530,31 @@ namespace dd {
return sz;
}
unsigned pdd_manager::degree(pdd const& b) {
init_mark();
m_degree.reserve(m_nodes.size());
m_todo.push_back(b.root);
while (!m_todo.empty()) {
PDD r = m_todo.back();
if (is_marked(r)) {
m_todo.pop_back();
}
else if (is_val(r)) {
m_degree[r] = 0;
set_mark(r);
}
else if (!is_marked(lo(r)) || !is_marked(hi(r))) {
m_todo.push_back(lo(r));
m_todo.push_back(hi(r));
}
else {
m_degree[r] = std::max(m_degree[lo(r)], m_degree[hi(r)]+1);
set_mark(r);
}
}
return m_degree[b.root];
}
void pdd_manager::alloc_free_nodes(unsigned n) {
for (unsigned i = 0; i < n; ++i) {
m_free_nodes.push_back(m_nodes.size());

21
src/math/dd/dd_pdd.h
View file

@ -56,27 +56,30 @@ namespace dd {
};
struct pdd_node {
pdd_node(unsigned level, PDD lo, PDD hi):
pdd_node(unsigned level, PDD lo, PDD hi, double tree_size):
m_refcount(0),
m_level(level),
m_lo(lo),
m_hi(hi),
m_index(0)
m_index(0),
m_tree_size(tree_size)
{}
pdd_node(unsigned value):
m_refcount(0),
m_level(0),
m_lo(value),
m_hi(0),
m_index(0)
m_index(0),
m_tree_size(1)
{}
pdd_node(): m_refcount(0), m_level(0), m_lo(0), m_hi(0), m_index(0) {}
pdd_node(): m_refcount(0), m_level(0), m_lo(0), m_hi(0), m_index(0), m_tree_size(0) {}
unsigned m_refcount : 10;
unsigned m_level : 22;
PDD m_lo;
PDD m_hi;
unsigned m_index;
double m_tree_size;
unsigned hash() const { return mk_mix(m_level, m_lo, m_hi); }
bool is_internal() const { return m_lo == 0 && m_hi == 0; }
void set_internal() { m_lo = 0; m_hi = 0; }
@ -142,6 +145,7 @@ namespace dd {
mutable svector<unsigned> m_mark;
mutable unsigned m_mark_level;
mutable svector<PDD> m_todo;
mutable unsigned_vector m_degree;
bool m_disable_gc;
bool m_is_new_node;
unsigned m_max_num_pdd_nodes;
@ -186,8 +190,10 @@ namespace dd {
inline void inc_ref(PDD b) { if (m_nodes[b].m_refcount != max_rc) m_nodes[b].m_refcount++; SASSERT(!m_free_nodes.contains(b)); }
inline void dec_ref(PDD b) { if (m_nodes[b].m_refcount != max_rc) m_nodes[b].m_refcount--; SASSERT(!m_free_nodes.contains(b)); }
inline PDD level2pdd(unsigned l) const { return m_var2pdd[m_level2var[l]]; }
inline double tree_size(PDD p) const { return m_nodes[p].m_tree_size; }
unsigned pdd_size(pdd const& b);
unsigned dag_size(pdd const& b);
unsigned degree(pdd const& p);
void try_gc();
void reserve_var(unsigned v);
@ -231,6 +237,7 @@ namespace dd {
bool try_spoly(pdd const& a, pdd const& b, pdd& r);
bool lt(pdd const& a, pdd const& b);
bool different_leading_term(pdd const& a, pdd const& b);
double tree_size(pdd const& p) const;
std::ostream& display(std::ostream& out);
std::ostream& display(std::ostream& out, pdd const& b);
@ -269,7 +276,9 @@ namespace dd {
bool operator!=(pdd const& other) const { return root != other.root; }
bool operator<(pdd const& b) const { return m->lt(*this, b); }
unsigned size() const { return m->pdd_size(*this); }
unsigned dag_size() const { return m->dag_size(*this); }
double tree_size() const { return m->tree_size(*this); }
unsigned degree() const { return m->degree(*this); }
};
inline pdd operator*(rational const& r, pdd const& b) { return b * r; }