mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-02 09:20:22 +00:00
Code Activity

z3str3: fix Issues 4349, 4354, and 4310 (#4529)

Browse source 
* regex needs lesson; m.mk_eq not ctx.mk_eq

* when unsat core is of size 0, then do naive learning

* remove two extra comments, and correct positive regex learning

* replace magic numbers for fixed-length lessons with constants
This commit is contained in:
Federico Mora Rocha 2020-06-24 13:46:32 -07:00 • committed by GitHub
parent c0fbb31379
commit 8d16a9a034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/smt/theory_str.cpp
View file

@ -9099,16 +9099,16 @@ namespace smt {
return refine_eq(lhs, rhs, offset.get_unsigned());
}
// Let's just giveup if we find ourselves in the disjunctive fragment.
if (offset == rational(-1)) { // negative equation
if (offset == NEQ) { // negative equation
++m_stats.m_refine_neq;
return refine_dis(lhs, rhs);
}
if (offset == rational(-2)) { // function like contains, prefix,...
if (offset == PFUN) { // function like contains, prefix,...
SASSERT(rhs == lhs);
++m_stats.m_refine_f;
return refine_function(lhs);
}
if (offset == rational(-3)) { // negated function
if (offset == NFUN) { // negated function
SASSERT(rhs == lhs);
++m_stats.m_refine_nf;
ast_manager & m = get_manager();
@ -9252,7 +9252,7 @@ namespace smt {
ast_manager & m = get_manager();
expr_ref lesson(m);
lesson = m.mk_not(ctx.mk_eq_atom(lhs, rhs));
lesson = m.mk_not(m.mk_eq(lhs, rhs));
TRACE("str", tout << "learning not " << mk_pp(lesson, m) << std::endl;);
return lesson;
}