mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-04 05:11:21 +00:00
Code Activity

tidy

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-03-25 04:43:47 -07:00
parent f83b32e6c3
commit 31969b5037
2 changed files with 53 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

103
src/smt/theory_special_relations.cpp
View file

@ -28,8 +28,6 @@ Notes:
#include "ast/reg_decl_plugins.h" #include "ast/reg_decl_plugins.h"
#include "ast/ast_pp.h" #include "ast/ast_pp.h"
static constexpr bool HYBRID_SEARCH = false;
namespace smt { namespace smt {
void theory_special_relations::relation::push() { void theory_special_relations::relation::push() {
@ -63,9 +61,7 @@ namespace smt {
ensure_var(v2); ensure_var(v2);
literal_vector ls; literal_vector ls;
ls.push_back(l); ls.push_back(l);
return return m_graph.add_non_strict_edge(v1, v2, ls) && m_graph.add_non_strict_edge(v2, v1, ls);
m_graph.enable_edge(m_graph.add_edge(v1, v2, s_integer(1), ls)) &&
m_graph.enable_edge(m_graph.add_edge(v2, v1, s_integer(1), ls));
} }
theory_special_relations::theory_special_relations(ast_manager& m): theory_special_relations::theory_special_relations(ast_manager& m):
@ -81,22 +77,13 @@ namespace smt {
return alloc(theory_special_relations, new_ctx->get_manager()); return alloc(theory_special_relations, new_ctx->get_manager());
} }
static void populate_k_vars(int v, int k, u_map<ptr_vector<expr>>& map, int& curr_id, ast_manager& m, sort* int_sort) {
int need = !map.contains(v) ? k : k - map[v].size();
for (auto i = 0; i < need; ++i) {
auto *fd = m.mk_const_decl(symbol(curr_id++), int_sort);
map[v].push_back(m.mk_app(fd, unsigned(0), nullptr));
}
}
bool theory_special_relations::internalize_atom(app * atm, bool gate_ctx) { bool theory_special_relations::internalize_atom(app * atm, bool gate_ctx) {
TRACE("special_relations", tout << mk_pp(atm, get_manager()) << "\n";);
SASSERT(m_util.is_special_relation(atm)); SASSERT(m_util.is_special_relation(atm));
relation* r = 0; relation* r = 0;
if (!m_relations.find(atm->get_decl(), r)) { if (!m_relations.find(atm->get_decl(), r)) {
//todo: push pop may get misaligned if the following alloc happens after push
r = alloc(relation, m_util.get_property(atm), atm->get_decl()); r = alloc(relation, m_util.get_property(atm), atm->get_decl());
m_relations.insert(atm->get_decl(), r); m_relations.insert(atm->get_decl(), r);
for (unsigned i = 0; i < m_atoms_lim.size(); ++i) r->push();
} }
context& ctx = get_context(); context& ctx = get_context();
expr* arg0 = atm->get_arg(0); expr* arg0 = atm->get_arg(0);
@ -107,7 +94,7 @@ namespace smt {
ctx.set_var_theory(v, get_id()); ctx.set_var_theory(v, get_id());
atom* a = alloc(atom, v, *r, v0, v1); atom* a = alloc(atom, v, *r, v0, v1);
m_atoms.push_back(a); m_atoms.push_back(a);
TRACE("sr", tout << "INTER : " << a->v1() << ' ' << a->v2() << ' ' << gate_ctx << "\n";); TRACE("special_relations", tout << mk_pp(atm, get_manager()) << " : " << a->v1() << ' ' << a->v2() << ' ' << gate_ctx << "\n";);
m_bool_var2atom.insert(v, a); m_bool_var2atom.insert(v, a);
return true; return true;
} }
@ -222,42 +209,39 @@ namespace smt {
lbool theory_special_relations::final_check_to(relation& r) { lbool theory_special_relations::final_check_to(relation& r) {
uint_set visited, target; uint_set visited, target;
lbool res = l_true; for (atom* ap : r.m_asserted_atoms) {
for (unsigned i = 0; res == l_true && i < r.m_asserted_atoms.size(); ++i) { atom& a = *ap;
atom& a = *r.m_asserted_atoms[i]; if (a.phase() || r.m_uf.find(a.v1()) != r.m_uf.find(a.v2())) {
if (!a.phase() && r.m_uf.find(a.v1()) == r.m_uf.find(a.v2())) { continue;
target.reset(); }
theory_var w; target.reset();
// v2 !<= v1 is asserted theory_var w;
target.insert(a.v2()); // v2 !<= v1 is asserted
if (r.m_graph.reachable(a.v1(), visited, target, w)) { target.insert(a.v2());
// we already have v1 <= v2 if (r.m_graph.reachable(a.v1(), visited, target, w)) {
continue; // we already have v1 <= v2
continue;
}
target.reset();
if (r.m_graph.reachable(a.v2(), target, visited, w)) {
// there is a common successor
// v1 <= w
// v2 <= w
// v1 !<= v2
// -> v1 <= w & v2 <= w & v1 !<= v2 -> v2 <= v1
unsigned timestamp = r.m_graph.get_timestamp();
r.m_explanation.reset();
r.m_graph.find_shortest_reachable_path(a.v1(), w, timestamp, r);
r.m_graph.find_shortest_reachable_path(a.v2(), w, timestamp, r);
r.m_explanation.push_back(a.explanation());
literal_vector const& lits = r.m_explanation;
if (!r.m_graph.add_non_strict_edge(a.v2(), a.v1(), lits)) {
set_neg_cycle_conflict(r);
return l_false;
} }
target.reset();
if (r.m_graph.reachable(a.v2(), target, visited, w)) {
// there is a common successor
// v1 <= w
// v2 <= w
// v1 !<= v2
// -> v1 <= w & v2 <= w & v1 !<= v2 -> v2 <= v1
unsigned timestamp = r.m_graph.get_timestamp();
r.m_explanation.reset();
r.m_graph.find_shortest_reachable_path(a.v1(), w, timestamp, r);
r.m_graph.find_shortest_reachable_path(a.v2(), w, timestamp, r);
r.m_explanation.push_back(a.explanation());
literal_vector const& lits = r.m_explanation;
if (!r.m_graph.enable_edge(r.m_graph.add_edge(a.v2(), a.v1(), s_integer(0), lits))) {
set_neg_cycle_conflict(r);
res = l_false;
}
}
// TODO: check if algorithm correctly produces all constraints.
// e.g., if we add an edge, do we have to repeat the loop?
//
} }
} }
return res; return l_true;
} }
lbool theory_special_relations::enable(atom& a) { lbool theory_special_relations::enable(atom& a) {
@ -289,12 +273,6 @@ namespace smt {
} }
lbool theory_special_relations::final_check(relation& r) { lbool theory_special_relations::final_check(relation& r) {
// timer m_timer_fc; //for debugging
// static unsigned call_count = 0;
// static double total_call_times = 0.0;
// m_timer_fc.start();
// call_count++;
lbool res = propagate(r); lbool res = propagate(r);
if (res != l_true) return res; if (res != l_true) return res;
switch (r.m_property) { switch (r.m_property) {
@ -446,6 +424,7 @@ namespace smt {
} }
unsigned new_lvl = m_atoms_lim.size() - num_scopes; unsigned new_lvl = m_atoms_lim.size() - num_scopes;
del_atoms(m_atoms_lim[new_lvl]); del_atoms(m_atoms_lim[new_lvl]);
m_atoms_lim.shrink(new_lvl);
} }
void theory_special_relations::del_atoms(unsigned old_size) { void theory_special_relations::del_atoms(unsigned old_size) {
@ -453,7 +432,7 @@ namespace smt {
atoms::iterator it = m_atoms.end(); atoms::iterator it = m_atoms.end();
while (it != begin) { while (it != begin) {
--it; --it;
atom * a = *it; atom* a = *it;
m_bool_var2atom.erase(a->var()); m_bool_var2atom.erase(a->var());
dealloc(a); dealloc(a);
} }
@ -469,7 +448,7 @@ namespace smt {
model_value_proc * theory_special_relations::mk_value(enode * n, model_generator & mg) { model_value_proc * theory_special_relations::mk_value(enode * n, model_generator & mg) {
UNREACHABLE(); UNREACHABLE();
return 0; return nullptr;
} }
void theory_special_relations::ensure_strict(graph& g) { void theory_special_relations::ensure_strict(graph& g) {
@ -480,7 +459,7 @@ namespace smt {
dl_var src = g.get_source(i); dl_var src = g.get_source(i);
dl_var dst = g.get_target(i); dl_var dst = g.get_target(i);
if (get_enode(src)->get_root() == get_enode(dst)->get_root()) continue; if (get_enode(src)->get_root() == get_enode(dst)->get_root()) continue;
VERIFY(g.enable_edge(g.add_edge(src, dst, s_integer(-2), literal_vector()))); VERIFY(g.add_strict_edge(src, dst, literal_vector()));
} }
TRACE("special_relations", g.display(tout);); TRACE("special_relations", g.display(tout););
} }
@ -498,9 +477,10 @@ namespace smt {
edge_id e2 = edges[k]; edge_id e2 = edges[k];
if (g.is_enabled(e2)) { if (g.is_enabled(e2)) {
dl_var src2 = g.get_source(e2); dl_var src2 = g.get_source(e2);
if (get_enode(src1)->get_root() == get_enode(src2)->get_root()) continue; if (get_enode(src1)->get_root() != get_enode(src2)->get_root() &&
if (!disconnected(g, src1, src2)) continue; disconnected(g, src1, src2)) {
VERIFY(g.enable_edge(g.add_edge(src1, src2, s_integer(-2), literal_vector()))); VERIFY(g.add_strict_edge(src1, src2, literal_vector()));
}
} }
} }
} }
@ -587,7 +567,6 @@ namespace smt {
expr_ref theory_special_relations::mk_interval(relation& r, model_generator& mg, unsigned_vector & lo, unsigned_vector& hi) { expr_ref theory_special_relations::mk_interval(relation& r, model_generator& mg, unsigned_vector & lo, unsigned_vector& hi) {
graph const& g = r.m_graph; graph const& g = r.m_graph;
//context& ctx = get_context();
ast_manager& m = get_manager(); ast_manager& m = get_manager();
expr_ref result(m); expr_ref result(m);
func_decl_ref lofn(m), hifn(m); func_decl_ref lofn(m), hifn(m);

13
src/smt/theory_special_relations.h
View file

@ -78,7 +78,14 @@ namespace smt {
struct int_ext : public sidl_ext { struct int_ext : public sidl_ext {
typedef literal_vector explanation; typedef literal_vector explanation;
}; };
typedef dl_graph<int_ext> graph; struct graph : public dl_graph<int_ext> {
bool add_strict_edge(theory_var v1, theory_var v2, literal_vector const& j) {
return enable_edge(add_edge(v1, v2, s_integer(1), j));
}
bool add_non_strict_edge(theory_var v1, theory_var v2, literal_vector const& j) {
return enable_edge(add_edge(v1, v2, s_integer(-2), j));
}
};
typedef union_find<union_find_default_ctx> union_find_t; typedef union_find<union_find_default_ctx> union_find_t;
@ -104,6 +111,9 @@ namespace smt {
m_explanation.append(ex); m_explanation.append(ex);
} }
void new_edge(dl_var src, dl_var dst, unsigned num_edges, edge_id const* edges) {} void new_edge(dl_var src, dl_var dst, unsigned num_edges, edge_id const* edges) {}
bool add_strict_edge(theory_var v1, theory_var v2, literal_vector const& j);
bool add_non_strict_edge(theory_var v1, theory_var v2, literal_vector const& j);
}; };
@ -117,6 +127,7 @@ namespace smt {
obj_map<func_decl, relation*> m_relations; obj_map<func_decl, relation*> m_relations;
bool_var2atom m_bool_var2atom; bool_var2atom m_bool_var2atom;
void del_atoms(unsigned old_size); void del_atoms(unsigned old_size);
lbool final_check(relation& r); lbool final_check(relation& r);
lbool final_check_po(relation& r); lbool final_check_po(relation& r);