mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

update core generation to be partial, update maxres to use current model too

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-09-02 19:05:28 -07:00
parent 3f8083dfa6
commit b5bbf83847
9 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_config.cpp
View file

@ -105,6 +105,7 @@ namespace sat {
}
m_minimize_lemmas = p.minimize_lemmas();
m_minimize_core = p.minimize_core();
m_minimize_core_partial = p.minimize_core_partial();
m_optimize_model = p.optimize_model();
m_dyn_sub_res = p.dyn_sub_res();
}

1
src/sat/sat_config.h
View file

@ -69,6 +69,7 @@ namespace sat {
bool m_minimize_lemmas;
bool m_dyn_sub_res;
bool m_minimize_core;
bool m_minimize_core_partial;
bool m_optimize_model;

25
src/sat/sat_mus.cpp
View file

@ -41,7 +41,9 @@ namespace sat {
}
lbool mus::operator()() {
bool minimize_partial = s.m_config.m_minimize_core_partial;
flet<bool> _disable_min(s.m_config.m_minimize_core, false);
flet<bool> _disable_min_partial(s.m_config.m_minimize_core_partial, false);
flet<bool> _disable_opt(s.m_config.m_optimize_model, false);
flet<bool> _is_active(m_is_active, true);
TRACE("sat", tout << "old core: " << s.get_core() << "\n";);
@ -58,7 +60,7 @@ namespace sat {
--i;
}
}
unsigned delta_time = 0;
while (!core.empty()) {
IF_VERBOSE(2, verbose_stream() << "(opt.mus reducing core: " << core.size() << " new core: " << mus.size() << ")\n";);
TRACE("sat",
@ -69,6 +71,11 @@ namespace sat {
set_core();
return l_undef;
}
if (minimize_partial && delta_time > 4) {
break;
}
unsigned num_literals = core.size() + mus.size();
literal lit = core.back();
core.pop_back();
unsigned sz = mus.size();
@ -99,14 +106,6 @@ namespace sat {
if (new_core.contains(~lit)) {
mus.resize(sz);
break;
#if 0
mus.pop_back();
is_sat = s.check(mus.size(), mus.c_ptr());
SASSERT(is_sat != l_true);
if (is_sat != l_false) {
return l_undef;
}
#endif
}
mus.resize(sz);
TRACE("sat", tout << "new core: " << new_core << "\n";);
@ -119,6 +118,14 @@ namespace sat {
}
break;
}
unsigned new_num_literals = core.size() + mus.size();
if (new_num_literals == num_literals) {
delta_time++;
}
else {
delta_time = 0;
}
}
TRACE("sat", tout << "new core: " << mus << "\n";);
set_core();

1
src/sat/sat_params.pyg
View file

@ -19,5 +19,6 @@ def_module_params('sat',
('minimize_lemmas', BOOL, True, 'minimize learned clauses'),
('dyn_sub_res', BOOL, True, 'dynamic subsumption resolution for minimizing learned clauses'),
('minimize_core', BOOL, False, 'minimize computed core'),
('minimize_core_partial', BOOL, False, 'apply partial (cheap) core minimization'),
('optimize_model', BOOL, False, 'enable optimization of soft constraints'),
('dimacs.core', BOOL, False, 'extract core from DIMACS benchmarks')))

2
src/sat/sat_solver.cpp
View file

@ -1730,7 +1730,7 @@ namespace sat {
idx--;
}
reset_unmark(old_size);
if (m_config.m_minimize_core) {
if (m_config.m_minimize_core || m_config.m_minimize_core_partial) {
// TBD:
// apply optional clause minimization by detecting subsumed literals.
// initial experiment suggests it has no effect.