mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

fix regression

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-07 12:15:51 -08:00
parent 8fb92e6312
commit 759d80dfe3
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/smt/theory_card.cpp
View file

@ -304,7 +304,7 @@ namespace smt {
lbool val = ctx.get_assignment(bv); lbool val = ctx.get_assignment(bv);
if (inc_min(inc, val) == l_true) { if (inc_min(inc, val) == l_true) {
curr_min += abs(inc); curr_min += abs(inc);
lits.push_back(literal(bv, val != l_true)); lits.push_back(literal(bv, val == l_true));
} }
} }
return curr_min; return curr_min;
@ -424,7 +424,7 @@ namespace smt {
} }
else if (vars[mid].first < bv) { else if (vars[mid].first < bv) {
lo = mid; lo = mid;
mid += (hi-mid)/2; mid += (hi-mid)/2 + 1;
} }
else { else {
hi = mid; hi = mid;

2
src/test/sorting_network.cpp
View file

@ -111,6 +111,8 @@ static void test_sorting4() {
svector<unsigned> in; svector<unsigned> in;
in.resize(5); in.resize(5);
test_sorting4_r(0, in); test_sorting4_r(0, in);
in.resize(8);
test_sorting4_r(0, in);
} }
void test_sorting3() { void test_sorting3() {

4
src/util/sorting_network.h
View file

@ -96,11 +96,11 @@ Notes:
{} {}
void operator()(vect const& in, vect& out) { void operator()(vect const& in, vect& out) {
out.reset();
out.append(in);
if (in.size() <= 1) { if (in.size() <= 1) {
return; return;
} }
out.reset();
out.append(in);
while (!is_power_of2(out.size())) { while (!is_power_of2(out.size())) {
out.push_back(m_ext.mk_default()); out.push_back(m_ext.mk_default());
} }