mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

relaxing condition for assumptions, add theory-assumption to skolem functions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-07 14:54:47 -07:00
parent e02392c0e3
commit 3ae722025f
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/smt/smt_context.cpp
View file

@ -3115,11 +3115,18 @@ namespace smt {
} }
bool is_valid_assumption(ast_manager & m, expr * assumption) { bool is_valid_assumption(ast_manager & m, expr * assumption) {
expr* arg;
if (!m.is_bool(assumption)) if (!m.is_bool(assumption))
return false; return false;
if (is_uninterp_const(assumption)) if (is_uninterp_const(assumption))
return true; return true;
if (m.is_not(assumption) && is_uninterp_const(to_app(assumption)->get_arg(0))) if (m.is_not(assumption, arg) && is_uninterp_const(arg))
return true;
if (!is_app(assumption))
return false;
if (to_app(assumption)->get_num_args() == 0)
return true;
if (m.is_not(assumption, arg) && is_app(arg) && to_app(arg)->get_num_args() == 0)
return true; return true;
return false; return false;
} }

4
src/smt/theory_str.cpp
View file

@ -7351,10 +7351,10 @@ namespace smt {
void theory_str::add_theory_assumptions(expr_ref_vector & assumptions) { void theory_str::add_theory_assumptions(expr_ref_vector & assumptions) {
TRACE("str", tout << "add overlap assumption for theory_str" << std::endl;); TRACE("str", tout << "add overlap assumption for theory_str" << std::endl;);
symbol strOverlap("!!TheoryStrOverlapAssumption!!"); char* strOverlap = "!!TheoryStrOverlapAssumption!!";
seq_util m_sequtil(get_manager()); seq_util m_sequtil(get_manager());
sort * s = get_manager().mk_bool_sort(); sort * s = get_manager().mk_bool_sort();
m_theoryStrOverlapAssumption_term = expr_ref(get_manager().mk_const(strOverlap, s), get_manager()); m_theoryStrOverlapAssumption_term = expr_ref(mk_fresh_const(strOverlap, s), get_manager());
assumptions.push_back(get_manager().mk_not(m_theoryStrOverlapAssumption_term)); assumptions.push_back(get_manager().mk_not(m_theoryStrOverlapAssumption_term));
} }