mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

really lousy model-building, WIP

Browse source
This commit is contained in:
Murphy Berzish 2015-09-28 01:56:13 -04:00
parent 0d54e4e4ae
commit 7da3854a8b
2 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/smt/theory_str.cpp
View file

@ -35,18 +35,9 @@ theory_str::~theory_str() {
} }
void theory_str::assert_axiom(ast * a) { void theory_str::assert_axiom(ast * a) {
/*
if (search_started) {
// effectively Z3_theory_assert_axiom
NOT_IMPLEMENTED_YET();
} else {
// effectively Z3_assert_cnstr
context & ctx = get_context();
ctx.assert_expr(to_expr(a));
}
*/
TRACE("t_str_detail", tout << "asserting " << mk_ismt2_pp(a, get_manager()) << "\n";);
expr * e = to_expr(a); expr * e = to_expr(a);
if (get_manager().is_true(e)) return;
TRACE("t_str_detail", tout << "asserting " << mk_ismt2_pp(a, get_manager()) << "\n";);
context & ctx = get_context(); context & ctx = get_context();
ctx.internalize(e, false); ctx.internalize(e, false);
literal lit(ctx.get_literal(e)); literal lit(ctx.get_literal(e));
@ -381,11 +372,11 @@ void theory_str::solve_concat_eq_str(expr * concat, expr * str) {
if (const_str == "") { if (const_str == "") {
TRACE("t_str", tout << "quick path: concat == \"\"" << std::endl;); TRACE("t_str", tout << "quick path: concat == \"\"" << std::endl;);
// assert the following axiom: // assert the following axiom:
// ( (Concat a1 a2) == str ) -> ( (a1 == "") AND (a2 == "") ) // ( (Concat a1 a2) == "" ) -> ( (a1 == "") AND (a2 == "") )
expr_ref premise(m.mk_eq(concat, str), m);
expr_ref empty_str(m_strutil.mk_string(""), m); expr_ref empty_str(m_strutil.mk_string(""), m);
expr_ref c1(m.mk_eq(a1, empty_str), m); expr_ref premise(ctx.mk_eq_atom(concat, empty_str), m);
expr_ref c2(m.mk_eq(a2, empty_str), m); expr_ref c1(ctx.mk_eq_atom(a1, empty_str), m);
expr_ref c2(ctx.mk_eq_atom(a2, empty_str), m);
expr_ref conclusion(m.mk_and(c1, c2), m); expr_ref conclusion(m.mk_and(c1, c2), m);
expr_ref axiom(m.mk_implies(premise, conclusion), m); expr_ref axiom(m.mk_implies(premise, conclusion), m);
TRACE("t_str_detail", tout << "learn " << mk_ismt2_pp(axiom, m) << std::endl;); TRACE("t_str_detail", tout << "learn " << mk_ismt2_pp(axiom, m) << std::endl;);
@ -643,4 +634,29 @@ final_check_status theory_str::final_check_eh() {
return FC_DONE; return FC_DONE;
} }
void theory_str::init_model(model_generator & mg) {
TRACE("t_str", tout << "initializing model" << std::endl; display(tout););
m_factory = alloc(str_value_factory, get_manager(), get_family_id());
mg.register_factory(m_factory);
}
model_value_proc * theory_str::mk_value(enode * n, model_generator & mg) {
TRACE("t_str", tout << "mk_value for: " << mk_ismt2_pp(n->get_owner(), get_manager()) <<
" (sort " << mk_ismt2_pp(get_manager().get_sort(n->get_owner()), get_manager()) << ")\n";);
ast_manager & m = get_manager();
context & ctx = get_context();
app_ref owner(m);
owner = n->get_owner();
// If the owner is not internalized, it doesn't have an enode associated.
SASSERT(ctx.e_internalized(owner));
if (m_strutil.is_string(owner)) {
return alloc(expr_wrapper_proc, owner);
}
NOT_IMPLEMENTED_YET(); // TODO
}
void theory_str::finalize_model(model_generator & mg) {}
}; /* namespace smt */ }; /* namespace smt */

23
src/smt/theory_str.h
View file

@ -28,7 +28,22 @@ Revision History:
namespace smt { namespace smt {
class str_value_factory : public value_factory { class str_value_factory : public value_factory {
// TODO str_util m_util;
public:
str_value_factory(ast_manager & m, family_id fid) :
value_factory(m, fid),
m_util(m) {}
virtual ~str_value_factory() {}
virtual expr * get_some_value(sort * s) {
return m_util.mk_string("some value");
}
virtual bool get_some_values(sort * s, expr_ref & v1, expr_ref & v2) {
v1 = m_util.mk_string("value 1");
v2 = m_util.mk_string("value 2");
return true;
}
virtual expr * get_fresh_value(sort * s) { NOT_IMPLEMENTED_YET(); }
virtual void register_value(expr * n) { /* Ignore */ }
}; };
class theory_str : public theory { class theory_str : public theory {
@ -38,6 +53,8 @@ namespace smt {
arith_util m_autil; arith_util m_autil;
str_util m_strutil; str_util m_strutil;
str_value_factory * m_factory;
ptr_vector<enode> m_basicstr_axiom_todo; ptr_vector<enode> m_basicstr_axiom_todo;
svector<std::pair<enode*,enode*> > m_str_eq_todo; svector<std::pair<enode*,enode*> > m_str_eq_todo;
protected: protected:
@ -83,6 +100,10 @@ namespace smt {
virtual final_check_status final_check_eh(); virtual final_check_status final_check_eh();
void attach_new_th_var(enode * n); void attach_new_th_var(enode * n);
virtual void init_model(model_generator & m);
virtual model_value_proc * mk_value(enode * n, model_generator & mg);
virtual void finalize_model(model_generator & mg);
}; };
}; };