mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 19:02:02 +00:00
Code Activity

fixes

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-04-16 19:19:05 +02:00
parent 7496f11542
commit 4a59ae41b3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opt/maxres.cpp
View file

@ -629,9 +629,8 @@ public:
if (core.empty()) return rational(0); if (core.empty()) return rational(0);
// find the minimal weight: // find the minimal weight:
rational w = get_weight(core[0]); rational w = get_weight(core[0]);
for (unsigned i = 1; i < core.size(); ++i) { for (unsigned i = 1; i < core.size(); ++i)
w = std::min(w, get_weight(core[i])); w = std::min(w, get_weight(core[i]));
}
return w; return w;
} }
@ -721,7 +720,7 @@ public:
} }
void bin_max_resolve(exprs const& _core, rational const& w) { void bin_max_resolve(exprs const& _core, rational w) {
expr_ref_vector core(m, _core.size(), _core.data()); expr_ref_vector core(m, _core.size(), _core.data());
expr_ref fml(m), cls(m); expr_ref fml(m), cls(m);
for (unsigned i = 0; i + 1 < core.size(); i += 2) { for (unsigned i = 0; i + 1 < core.size(); i += 2) {
@ -756,7 +755,7 @@ public:
obj_map<expr, unfold_record> m_unfold; obj_map<expr, unfold_record> m_unfold;
rational m_unfold_upper; rational m_unfold_upper;
void bin_delay_max_resolve(exprs const& _core, rational const& weight) { void bin_delay_max_resolve(exprs const& _core, rational weight) {
expr_ref_vector core(m, _core.size(), _core.data()), partial(m); expr_ref_vector core(m, _core.size(), _core.data()), partial(m);
expr_ref fml(m), cls(m); expr_ref fml(m), cls(m);
for (expr* c : core) { for (expr* c : core) {
@ -805,6 +804,7 @@ public:
if (partial.get(i + 1)) if (partial.get(i + 1))
r.ws.push_back(partial.get(i + 1)); r.ws.push_back(partial.get(i + 1));
m_trail.append(r.ws.size(), r.ws.data()); m_trail.append(r.ws.size(), r.ws.data());
r.weight = weight;
if (r.ws.size() == 1) if (r.ws.size() == 1)
w = u; w = u;
else { else {