mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

add seq_rewriter to model_evaluator, remove th_rewriter additional step in validator

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-01-15 04:02:48 +05:30
parent 7cbd59bf06
commit a295dd48dc
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd_context/cmd_context.cpp
View file

@ -1623,10 +1623,6 @@ void cmd_context::validate_model() {
r = 0;
evaluator(a, r);
TRACE("model_validate", tout << "checking\n" << mk_ismt2_pp(a, m()) << "\nresult:\n" << mk_ismt2_pp(r, m()) << "\n";);
if (m().is_true(r))
continue;
th_rewriter thr(m());
thr(r);
if (m().is_true(r))
continue;

9
src/model/model_evaluator.cpp
View file

@ -24,6 +24,7 @@ Revision History:
#include"arith_rewriter.h"
#include"bv_rewriter.h"
#include"pb_rewriter.h"
#include"seq_rewriter.h"
#include"datatype_rewriter.h"
#include"array_rewriter.h"
#include"fpa_rewriter.h"
@ -39,6 +40,7 @@ struct evaluator_cfg : public default_rewriter_cfg {
datatype_rewriter m_dt_rw;
pb_rewriter m_pb_rw;
fpa_rewriter m_f_rw;
seq_rewriter m_seq_rw;
unsigned long long m_max_memory;
unsigned m_max_steps;
bool m_model_completion;
@ -55,7 +57,8 @@ struct evaluator_cfg : public default_rewriter_cfg {
m_ar_rw(m, p),
m_dt_rw(m),
m_pb_rw(m),
m_f_rw(m) {
m_f_rw(m),
m_seq_rw(m) {
m_b_rw.set_flat(false);
m_a_rw.set_flat(false);
m_bv_rw.set_flat(false);
@ -139,6 +142,8 @@ struct evaluator_cfg : public default_rewriter_cfg {
st = m_dt_rw.mk_eq_core(args[0], args[1], result);
else if (s_fid == m_f_rw.get_fid())
st = m_f_rw.mk_eq_core(args[0], args[1], result);
else if (s_fid == m_seq_rw.get_fid())
st = m_seq_rw.mk_eq_core(args[0], args[1], result);
if (st != BR_FAILED)
return st;
}
@ -157,6 +162,8 @@ struct evaluator_cfg : public default_rewriter_cfg {
st = m_pb_rw.mk_app_core(f, num, args, result);
else if (fid == m_f_rw.get_fid())
st = m_f_rw.mk_app_core(f, num, args, result);
else if (fid == m_seq_rw.get_fid())
st = m_seq_rw.mk_app_core(f, num, args, result);
else if (evaluate(f, num, args, result)) {
TRACE("model_evaluator", tout << "reduce_app " << f->get_name() << "\n";
for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m()) << "\n";