mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

add hint verification, combine bounds/farkas into one rule

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-05-29 10:12:05 -07:00
parent 36ad377a7d
commit bffa7ff2f6
9 changed files with 59 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/shell/drat_frontend.cpp
View file

@ -160,16 +160,15 @@ public:
// m_drat.add(lits, st);
}
void validate_hint(sat::literal_vector const& lits, sat::proof_hint const& hint) {
return; // remove when testing this
void validate_hint(expr_ref_vector const& exprs, sat::literal_vector const& lits, sat::proof_hint const& hint) {
// return; // remove when testing this
proof_checker pc(m);
arith_util autil(m);
switch (hint.m_ty) {
case sat::hint_type::null_h:
break;
case sat::hint_type::bound_h: {
// TODO: combine bound_h and farkas_h into a single rule
// TODO: use proof_checker.cpp check_arith_proof to check farkas claim
case sat::hint_type::cut_h:
case sat::hint_type::farkas_h: {
expr_ref sum(m);
bool is_strict = false;
vector<rational> coeffs;
@ -178,6 +177,10 @@ public:
coeffs.push_back(coeff);
lc = lcm(lc, denominator(coeff));
}
for (auto const& [coeff, a, b]: hint.m_eqs) {
coeffs.push_back(coeff);
lc = lcm(lc, denominator(coeff));
}
if (!lc.is_one())
for (auto& coeff : coeffs)
coeff *= lc;
@ -186,13 +189,25 @@ public:
for (auto const& [coeff, lit] : hint.m_literals) {
app_ref e(to_app(m_b2e[lit.var()]), m);
if (!pc.check_arith_literal(!lit.sign(), e, coeffs[i], sum, is_strict)) {
std::cout << "Failed checking hint " << e << "\n";
std::cout << "p failed checking hint " << e << "\n";
return;
}
++i;
}
for (auto const& [coeff, a, b]: hint.m_eqs) {
expr* x = exprs[a];
expr* y = exprs[b];
coeffs.push_back(coeff);
app_ref e(m.mk_eq(x, y), m);
if (!pc.check_arith_literal(true, e, coeffs[i], sum, is_strict)) {
std::cout << "p failed checking hint " << e << "\n";
return;
}
++i;
}
if (!sum.get()) {
std::cout << "no summation\n";
std::cout << "p no summation\n";
return;
}
@ -204,16 +219,14 @@ public:
th_rewriter rw(m);
rw(sum);
if (!m.is_false(sum)) {
std::cout << "Lemma not simplified " << sum << "\n";
std::cout << "p hint not verified " << sum << "\n";
return;
}
std::cout << "p hint verified\n";
break;
}
case sat::hint_type::farkas_h:
std::cout << "FARKAS\n";
break;
case sat::hint_type::cut_h:
std::cout << "CUT\n";
default:
UNREACHABLE();
break;
}
}
@ -405,7 +418,7 @@ static void verify_smt(char const* drat_file, char const* smt_file) {
switch (r.m_tag) {
case dimacs::drat_record::tag_t::is_clause:
checker.add(r.m_lits, r.m_status);
checker.validate_hint(r.m_lits, r.m_hint);
checker.validate_hint(exprs, r.m_lits, r.m_hint);
if (drat_checker.inconsistent()) {
std::cout << "inconsistent\n";
return;