mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 19:52:29 +00:00
Code Activity

Merge branch 'opt' of https://git01.codeplex.com/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2014-12-29 12:57:17 -08:00
commit 7d62ceeadc
2 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/muz/rel/doc.cpp
View file

@ -216,7 +216,7 @@ bool doc_manager::merge(doc& d, unsigned idx, subset_ints const& equalities,
unsigned root = equalities.find(idx);
idx = root;
unsigned num_x = 0;
unsigned root1;
unsigned root1 = root;
tbit value = BIT_x;
do {
switch (d[idx]) {
@ -229,12 +229,13 @@ bool doc_manager::merge(doc& d, unsigned idx, subset_ints const& equalities,
value = BIT_1;
break;
case BIT_x:
++num_x;
if (!discard_cols.get(idx)) {
++num_x;
root1 = idx;
}
break;
default:
UNREACHABLE();
break;
}
idx = equalities.next(idx);

49
src/test/udoc_relation.cpp
View file

@ -159,6 +159,7 @@ public:
test_filter_neg2();
test_join_project();
test_join_project2();
test_filter_neg4(false);
test_filter_neg4(true);
@ -470,6 +471,54 @@ public:
}
}
void test_join_project2()
{
relation_signature sig3;
sig3.push_back(bv.mk_sort(1));
sig3.push_back(bv.mk_sort(1));
sig3.push_back(bv.mk_sort(1));
/// xxx \ x11
udoc_relation *t1 = mk_full(sig3);
{
udoc_relation *neg = mk_full(sig3);
doc& n = neg->get_udoc()[0];
neg->get_dm().set(n, 1, BIT_1);
neg->get_dm().set(n, 2, BIT_1);
unsigned_vector allcols;
allcols.push_back(0);
allcols.push_back(1);
allcols.push_back(2);
apply_filter_neg(*t1, *neg, allcols, allcols);
neg->deallocate();
}
// 11x
udoc_relation *t2 = mk_full(sig3);
{
doc& n = t2->get_udoc()[0];
t2->get_dm().set(n, 0, BIT_1);
t2->get_dm().set(n, 1, BIT_1);
}
unsigned_vector jc1, jc2, pc;
jc1.push_back(1);
jc1.push_back(2);
jc2.push_back(0);
jc2.push_back(1);
pc.push_back(1);
pc.push_back(2);
scoped_ptr<datalog::relation_join_fn> join_project_fn;
join_project_fn = p.mk_join_project_fn(*t1, *t2, jc1.size(), jc1.c_ptr(), jc2.c_ptr(), pc.size(), pc.c_ptr());
relation_base *t = (*join_project_fn)(*t1, *t2);
cr.verify_join_project(*t1, *t2, *t, jc1, jc2, pc);
t->deallocate();
t1->deallocate();
t2->deallocate();
}
void test_rename() {
udoc_relation* t1;
// rename