mirror of
https://github.com/Z3Prover/z3
synced 2026-02-18 06:34:22 +00:00
add more simplifiers, fix model reconstruction order for elim_unconstrained
- enable sat.smt in smt_tactic that is invoked by default on first goals add flatten-clauses add push-ite have tptp5 front-end pretty print SMT2 formulas a little nicer.
This commit is contained in:
parent
edb0fc394b
commit
cfc8e19baf
10 changed files with 271 additions and 54 deletions
95
src/ast/simplifiers/flatten_clauses.h
Normal file
95
src/ast/simplifiers/flatten_clauses.h
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*++
|
||||
Copyright (c) 2022 Microsoft Corporation
|
||||
|
||||
Module Name:
|
||||
|
||||
flatten_clauses.h
|
||||
|
||||
Abstract:
|
||||
|
||||
flatten clauses
|
||||
|
||||
Author:
|
||||
|
||||
Nikolaj Bjorner (nbjorner) 2022-11-24
|
||||
|
||||
--*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "ast/simplifiers/dependent_expr_state.h"
|
||||
#include "ast/rewriter/th_rewriter.h"
|
||||
#include "ast/ast_util.h"
|
||||
|
||||
|
||||
class flatten_clauses : public dependent_expr_simplifier {
|
||||
|
||||
unsigned m_num_flat = 0;
|
||||
|
||||
bool is_literal(expr* a) {
|
||||
m.is_not(a, a);
|
||||
return !is_app(a) || to_app(a)->get_num_args() == 0;
|
||||
}
|
||||
|
||||
bool is_reducible(expr* a, expr* b) {
|
||||
return b->get_ref_count() == 1 || is_literal(a);
|
||||
}
|
||||
|
||||
public:
|
||||
flatten_clauses(ast_manager& m, params_ref const& p, dependent_expr_state& fmls):
|
||||
dependent_expr_simplifier(m, fmls) {
|
||||
}
|
||||
|
||||
char const* name() const override { return "flatten-clauses"; }
|
||||
|
||||
void reset_statistics() override { m_num_flat = 0; }
|
||||
|
||||
void collect_statistics(statistics& st) const override {
|
||||
st.update("flatten-clauses-rewrites", m_num_flat);
|
||||
}
|
||||
|
||||
void reduce() override {
|
||||
bool change = true;
|
||||
|
||||
while (change) {
|
||||
change = false;
|
||||
for (unsigned idx : indices()) {
|
||||
auto de = m_fmls[idx];
|
||||
expr* f = de.fml(), *a, *b, *c;
|
||||
bool decomposed = false;
|
||||
if (m.is_or(f, a, b) && m.is_not(b, b) && m.is_or(b) && is_reducible(a, b))
|
||||
decomposed = true;
|
||||
else if (m.is_or(f, b, a) && m.is_not(b, b) && m.is_or(b) && is_reducible(a, b))
|
||||
decomposed = true;
|
||||
if (decomposed) {
|
||||
for (expr* arg : *to_app(b))
|
||||
m_fmls.add(dependent_expr(m, m.mk_or(a, mk_not(m, arg)), de.dep()));
|
||||
m_fmls.update(idx, dependent_expr(m, m.mk_true(), nullptr));
|
||||
change = true;
|
||||
++m_num_flat;
|
||||
continue;
|
||||
}
|
||||
if (m.is_or(f, a, b) && m.is_and(b) && is_reducible(a, b))
|
||||
decomposed = true;
|
||||
else if (m.is_or(f, b, a) && m.is_and(b) && is_reducible(a, b))
|
||||
decomposed = true;
|
||||
if (decomposed) {
|
||||
for (expr * arg : *to_app(b))
|
||||
m_fmls.add(dependent_expr(m, m.mk_or(a, arg), de.dep()));
|
||||
m_fmls.update(idx, dependent_expr(m, m.mk_true(), nullptr));
|
||||
change = true;
|
||||
++m_num_flat;
|
||||
continue;
|
||||
}
|
||||
if (m.is_ite(f, a, b, c)) {
|
||||
m_fmls.add(dependent_expr(m, m.mk_or(mk_not(m, a), b), de.dep()));
|
||||
m_fmls.add(dependent_expr(m, m.mk_or(a, c), de.dep()));
|
||||
m_fmls.update(idx, dependent_expr(m, m.mk_true(), nullptr));
|
||||
change = true;
|
||||
++m_num_flat;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue