mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-22 07:10:34 +00:00
Code Activity

apply formatting

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-10-12 01:00:41 +02:00
parent e4cc27810f
commit e95162b054
1 changed files with 206 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/util/search_tree.h
View file

@ -35,25 +35,32 @@ namespace search_tree {
enum class status { open, closed, active };
template<typename Config>
class node {
template <typename Config> class node {
typedef typename Config::literal literal;
literal m_literal;
node *m_left = nullptr, *m_right = nullptr, *m_parent = nullptr;
status m_status;
vector<literal> m_core;
public:
node(literal const& l, node* parent) :
m_literal(l), m_parent(parent), m_status(status::open) {}
node(literal const &l, node *parent) : m_literal(l), m_parent(parent), m_status(status::open) {}
~node() {
dealloc(m_left);
dealloc(m_right);
}
status get_status() const { return m_status; }
void set_status(status s) { m_status = s; }
literal const& get_literal() const { return m_literal; }
bool literal_is_null() const { return Config::is_null(m_literal); }
status get_status() const {
return m_status;
}
void set_status(status s) {
m_status = s;
}
literal const &get_literal() const {
return m_literal;
}
bool literal_is_null() const {
return Config::is_null(m_literal);
}
void split(literal const &a, literal const &b) {
SASSERT(!Config::literal_is_null(a));
SASSERT(!Config::literal_is_null(b));
@ -66,9 +73,15 @@ namespace search_tree {
m_status = status::open;
}
node* left() const { return m_left; }
node* right() const { return m_right; }
node* parent() const { return m_parent; }
node *left() const {
return m_left;
}
node *right() const {
return m_right;
}
node *parent() const {
return m_parent;
}
node *find_active_node() {
if (m_status == status::active)
@ -98,16 +111,21 @@ namespace search_tree {
m_right->display(out, indent + 2);
}
bool has_core() const { return !m_core.empty(); }
bool has_core() const {
return !m_core.empty();
}
void set_core(vector<literal> const &core) {
m_core = core;
}
vector<literal> const & get_core() const { return m_core; }
void clear_core() { m_core.clear(); }
vector<literal> const &get_core() const {
return m_core;
}
void clear_core() {
m_core.clear();
}
};
template<typename Config>
class tree {
template <typename Config> class tree {
typedef typename Config::literal literal;
scoped_ptr<node<Config>> m_root = nullptr;
literal m_null_literal;
@ -148,13 +166,15 @@ namespace search_tree {
}
// Invariants:
// Cores labeling nodes are subsets of the literals on the path to the node and the (external) assumption literals.
// If a parent is open, then the one of the children is open.
// Cores labeling nodes are subsets of the literals on the path to the node and the (external) assumption
// literals. If a parent is open, then the one of the children is open.
void close_with_core(node<Config> *n, vector<literal> const &C) {
if (!n || n->get_status() == status::closed)
return;
node<Config> *p = n->parent();
if (p && any_of(C, [](auto const& l) { return l == n->get_literal(); }})) {
if (p && any_of(C, [](auto const& l) {
return l == n->get_literal(); }
})) {
close_with_core(p, C);
return;
}
@ -168,7 +188,8 @@ namespace search_tree {
}
// Given complementary sibling nodes for literals x and ¬x, sibling resolvent = (core_left ∪ core_right) \ {x, ¬x}
vector<literal> compute_sibling_resolvent(node<Config>* left, node<Config>* right) {
vector<literal>
compute_sibling_resolvent(node<Config> *left, node<Config> *right) {
vector<literal> res;
auto &core_l = left->get_core();
@ -233,8 +254,8 @@ namespace search_tree {
SASSERT(n != m_root.get());
// all literals in conflict are on the path from root to n
// remove assumptions from conflict to ensure this.
DEBUG_CODE(
auto on_path = [&](literal const& a) {
DEBUG_CODE(auto on_path =
[&](literal const &a) {
node<Config> *p = n;
while (p) {
if (p->get_literal() == a)
@ -243,8 +264,7 @@ namespace search_tree {
}
return false;
};
SASSERT(all_of(conflict, [&](auto const& a) { return on_path(a); }));
);
SASSERT(all_of(conflict, [&](auto const &a) { return on_path(a); })););
while (n) {
if (any_of(conflict, [&](auto const &a) { return a == n->get_literal(); })) {
@ -273,8 +293,8 @@ namespace search_tree {
auto p = n->parent();
while (p) {
if (p->left() && p->left()->get_status() == status::closed &&
p->right() && p->right()->get_status() == status::closed) {
if (p->left() && p->left()->get_status() == status::closed && p->right() &&
p->right()->get_status() == status::closed) {
p->set_status(status::closed);
n = p;
p = n->parent();