3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-30 20:35:51 +00:00

re-organizing muz

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-08-28 21:49:53 -07:00
parent add96bc98f
commit 9e61820125
20 changed files with 73 additions and 42 deletions

View file

@ -46,6 +46,7 @@ Notes:
#include "proof_utils.h"
#include "dl_boogie_proof.h"
#include "qe_util.h"
#include "scoped_proof.h"
namespace pdr {
@ -1719,7 +1720,7 @@ namespace pdr {
}
proof_ref context::get_proof() const {
datalog::scoped_proof _sc(m);
scoped_proof _sc(m);
proof_ref proof(m);
SASSERT(m_last_result == l_true);
proof = m_search.get_proof_trace(*this);
@ -1959,7 +1960,7 @@ namespace pdr {
void context::create_children(model_node& n) {
SASSERT(n.level() > 0);
bool use_model_generalizer = m_params.use_model_generalizer();
datalog::scoped_no_proof _sc(m);
scoped_no_proof _sc(m);
pred_transformer& pt = n.pt();
model_ref M = n.get_model_ptr();

View file

@ -31,8 +31,9 @@ Revision History:
#include "dl_mk_slice.h"
#include "dl_mk_unfold.h"
#include "dl_mk_coalesce.h"
#include "model_smt2_pp.h"
#include "dl_transforms.h"
#include "scoped_proof.h"
#include "model_smt2_pp.h"
using namespace pdr;
@ -149,7 +150,7 @@ lbool dl_interface::query(expr * query) {
m_ctx.reopen();
m_ctx.replace_rules(old_rules);
datalog::scoped_restore_proof _sc(m); // update_rules may overwrite the proof mode.
scoped_restore_proof _sc(m); // update_rules may overwrite the proof mode.
m_context->set_proof_converter(m_ctx.get_proof_converter());
m_context->set_model_converter(m_ctx.get_model_converter());

View file

@ -45,6 +45,7 @@ Notes:
#include "poly_rewriter.h"
#include "poly_rewriter_def.h"
#include "arith_rewriter.h"
#include "scoped_proof.h"
@ -1072,7 +1073,7 @@ namespace pdr {
void hoist_non_bool_if(expr_ref& fml) {
ast_manager& m = fml.get_manager();
datalog::scoped_no_proof _sp(m);
scoped_no_proof _sp(m);
params_ref p;
ite_hoister_star ite_rw(m, p);
expr_ref tmp(m);
@ -1419,7 +1420,7 @@ namespace pdr {
void normalize_arithmetic(expr_ref& t) {
ast_manager& m = t.get_manager();
datalog::scoped_no_proof _sp(m);
scoped_no_proof _sp(m);
params_ref p;
arith_normalizer_star rw(m, p);
expr_ref tmp(m);