mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

fix bug in mutex extraction, reported by Patrick Trentin

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-11-01 00:16:16 +01:00
parent ba942af5a8
commit 84172302a2
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/opt/maxres.cpp
View file

@ -155,7 +155,7 @@ public:
void add_soft(expr* e, rational const& w) { void add_soft(expr* e, rational const& w) {
TRACE("opt", tout << mk_pp(e, m) << "\n";); TRACE("opt", tout << mk_pp(e, m) << " |-> " << w << "\n";);
expr_ref asum(m), fml(m); expr_ref asum(m), fml(m);
app_ref cls(m); app_ref cls(m);
rational weight(0); rational weight(0);
@ -290,7 +290,10 @@ public:
} }
void process_mutex(expr_ref_vector& mutex) { void process_mutex(expr_ref_vector& mutex) {
TRACE("opt", tout << mutex << "\n";); TRACE("opt",
for (unsigned i = 0; i < mutex.size(); ++i) {
tout << mk_pp(mutex[i].get(), m) << " |-> " << get_weight(mutex[i].get()) << "\n";
});
if (mutex.size() <= 1) { if (mutex.size() <= 1) {
return; return;
} }
@ -298,20 +301,22 @@ public:
ptr_vector<expr> core(mutex.size(), mutex.c_ptr()); ptr_vector<expr> core(mutex.size(), mutex.c_ptr());
remove_soft(core, m_asms); remove_soft(core, m_asms);
rational weight(0), sum1(0), sum2(0); rational weight(0), sum1(0), sum2(0);
vector<rational> weights;
for (unsigned i = 0; i < mutex.size(); ++i) { for (unsigned i = 0; i < mutex.size(); ++i) {
sum1 += get_weight(mutex[i].get()); rational w = get_weight(mutex[i].get());
weights.push_back(w);
sum1 += w;
m_asm2weight.remove(mutex[i].get());
} }
while (!mutex.empty()) { for (unsigned i = mutex.size(); i > 0; ) {
expr_ref soft = mk_or(mutex); --i;
rational w = get_weight(mutex.back()); expr_ref soft(m.mk_or(i+1, mutex.c_ptr()), m);
rational w = weights[i];
weight = w - weight; weight = w - weight;
m_lower += weight*rational(mutex.size()-1); m_lower += weight*rational(i);
sum2 += weight*rational(mutex.size()); sum2 += weight*rational(i+1);
add_soft(soft, weight); add_soft(soft, weight);
mutex.pop_back(); for (; i > 0 && weights[i-1] == w; --i) {}
while (!mutex.empty() && get_weight(mutex.back()) == w) {
mutex.pop_back();
}
weight = w; weight = w;
} }
SASSERT(sum1 == sum2); SASSERT(sum1 == sum2);

1
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -379,7 +379,6 @@ private:
g = m_subgoals[0]; g = m_subgoals[0];
expr_ref_vector atoms(m); expr_ref_vector atoms(m);
TRACE("sat", g->display_with_dependencies(tout);); TRACE("sat", g->display_with_dependencies(tout););
std::cout << "exprs: " << g->num_exprs() << "\n";
m_goal2sat(*g, m_params, m_solver, m_map, dep2asm, true); m_goal2sat(*g, m_params, m_solver, m_map, dep2asm, true);
m_goal2sat.get_interpreted_atoms(atoms); m_goal2sat.get_interpreted_atoms(atoms);
if (!atoms.empty()) { if (!atoms.empty()) {