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

add internalization as fallback option

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2026-04-14 08:47:55 -07:00
parent 725b13680e
commit f09f6d5097
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/smt/theory_nseq.cpp
View file

@ -83,15 +83,20 @@ namespace smt {
m_axioms.set_ensure_digits(ensure_digit_axiom); m_axioms.set_ensure_digits(ensure_digit_axiom);
m_axioms.set_mark_no_diseq(mark_no_diseq); m_axioms.set_mark_no_diseq(mark_no_diseq);
m_should_internalize = true; // delete this if using internalize as fallback
std::function<sat::literal(expr*)> literal_if_false = [&](expr* e) { std::function<sat::literal(expr*)> literal_if_false = [&](expr* e) {
bool is_not = m.is_not(e, e); bool is_not = m.is_not(e, e);
if (!ctx.b_internalized(e)) if (m_should_internalize && !ctx.b_internalized(e)) {
// it can happen that the element is not internalized, but as soon as we do it, it becomes false. // it can happen that the element is not internalized, but as soon as we do it, it becomes false.
// In case we just skip one of those uninternalized expressions, // In case we just skip one of those uninternalized expressions,
// adding the Nielsen assumption later will fail // adding the Nielsen assumption later will fail
// Alternatively, we could just retry Nielsen saturation in case // Alternatively, we could just retry Nielsen saturation in case
// adding the Nielsen assumption yields the assumption being false after internalizing // adding the Nielsen assumption yields the assumption being false after internalizing
ctx.internalize(to_app(e), false); ctx.internalize(to_app(e), false);
}
if (!ctx.b_internalized(e))
return sat::null_literal;
literal lit = ctx.get_literal(e); literal lit = ctx.get_literal(e);
if (is_not) if (is_not)
@ -764,6 +769,8 @@ namespace smt {
// this should not happen because nielsen checks for this before returning a satisfying path. // this should not happen because nielsen checks for this before returning a satisfying path.
TRACE(seq, tout << "nseq final_check: nielsen assumption " << c.fml << " is false; internalized - " << ctx.e_internalized(c.fml) << "\n"); TRACE(seq, tout << "nseq final_check: nielsen assumption " << c.fml << " is false; internalized - " << ctx.e_internalized(c.fml) << "\n");
std::cout << "False [" << lit << "]: " << mk_pp(c.fml, m) << std::endl; std::cout << "False [" << lit << "]: " << mk_pp(c.fml, m) << std::endl;
ctx.push_trail(value_trail(m_should_internalize));
m_should_internalize = true;
break; break;
} }
} }

1
src/smt/theory_nseq.h
View file

@ -50,6 +50,7 @@ namespace smt {
seq::axioms m_axioms; seq::axioms m_axioms;
seq::seq_regex m_regex; // regex membership pre-processing seq::seq_regex m_regex; // regex membership pre-processing
seq_model m_model; // model construction helper seq_model m_model; // model construction helper
bool m_should_internalize = false;
// propagation queue items (variant over the distinct propagation cases) // propagation queue items (variant over the distinct propagation cases)
using eq_item = tracked_str_eq; // string equality using eq_item = tracked_str_eq; // string equality