mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

remove incorrect and inefficient default model conversion

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-07-15 18:47:25 +02:00
parent 0e066fef1f
commit c7a7d40a8f
8 changed files with 6 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/solver/solver.cpp
View file

@ -202,12 +202,6 @@ bool solver::is_literal(ast_manager& m, expr* e) {
void solver::assert_expr(expr* f) {
expr_ref fml(f, get_manager());
if (m_enforce_model_conversion) {
model_converter_ref mc = get_model_converter();
if (mc) {
(*mc)(fml);
}
}
assert_expr_core(fml);
}
@ -215,13 +209,6 @@ void solver::assert_expr(expr* f, expr* t) {
ast_manager& m = get_manager();
expr_ref fml(f, m);
expr_ref a(t, m);
if (m_enforce_model_conversion) {
model_converter_ref mc = get_model_converter();
if (mc) {
(*mc)(fml);
// (*mc)(a);
}
}
assert_expr_core2(fml, a);
}
@ -241,14 +228,12 @@ void solver::collect_param_descrs(param_descrs & r) {
void solver::reset_params(params_ref const & p) {
m_params = p;
solver_params sp(m_params);
m_enforce_model_conversion = sp.enforce_model_conversion();
m_cancel_backup_file = sp.cancel_backup_file();
}
void solver::updt_params(params_ref const & p) {
m_params.copy(p);
solver_params sp(m_params);
m_enforce_model_conversion = sp.enforce_model_conversion();
m_cancel_backup_file = sp.cancel_backup_file();
}

3
src/solver/solver.h
View file

@ -49,10 +49,9 @@ solver* mk_smt2_solver(ast_manager& m, params_ref const& p);
*/
class solver : public check_sat_result {
params_ref m_params;
bool m_enforce_model_conversion;
symbol m_cancel_backup_file;
public:
solver(): m_enforce_model_conversion(false) {}
solver() {}
~solver() override {}
/**

3
src/solver/solver_params.pyg
View file

@ -2,8 +2,7 @@
def_module_params('solver',
description='solver parameters',
export=True,
params=(('enforce_model_conversion', BOOL, False, "apply model transformation on new assertions"),
('smtlib2_log', SYMBOL, '', "file to save solver interaction"),
params=(('smtlib2_log', SYMBOL, '', "file to save solver interaction"),
('cancel_backup_file', SYMBOL, '', "file to save partial search state if search is canceled"),
('timeout', UINT, UINT_MAX, "timeout on the solver object; overwrites a global timeout"),
))