mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity

call it data instead of c_ptr for approaching C++11 std::vector convention.

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-04-13 18:17:10 -07:00
parent 524dcd35f9
commit 4a6083836a
456 changed files with 2802 additions and 2802 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/util/sorting_network.h
View file

@ -241,7 +241,7 @@ Notes:
return mk_or(n, xs);
}
if (dualize(k, n, xs, in)) {
return le(full, k, in.size(), in.c_ptr());
return le(full, k, in.size(), in.data());
}
else {
switch (m_cfg.m_encoding) {
@ -272,7 +272,7 @@ Notes:
SASSERT(k < n);
literal_vector in, out;
if (dualize(k, n, xs, in)) {
return ge(full, k, n, in.c_ptr());
return ge(full, k, n, in.data());
}
else if (k == 1) {
literal_vector ors;
@ -322,7 +322,7 @@ Notes:
SASSERT(k <= n);
literal_vector in, out;
if (dualize(k, n, xs, in)) {
return eq(full, k, n, in.c_ptr());
return eq(full, k, n, in.data());
}
else if (k == 1) {
// scoped_stats _ss(m_stats, k, n);
@ -526,12 +526,12 @@ Notes:
ors.push_back(mk_and(x[i], mk_not(c), mk_not(y[i])));
ors.push_back(mk_and(y[i], mk_not(c), mk_not(x[i])));
ors.push_back(mk_and(c, x[i], y[i]));
literal o = mk_or(4, ors.c_ptr());
literal o = mk_or(4, ors.data());
out.push_back(o);
ors[0] = mk_and(c, x[i]);
ors[1] = mk_and(c, y[i]);
ors[2] = mk_and(x[i], y[i]);
c = mk_or(3, ors.c_ptr());
c = mk_or(3, ors.data());
}
return c;
}
@ -629,7 +629,7 @@ Notes:
switch (j) {
case 0: return ctx.mk_false();
case 1: return ors[0];
default: return ctx.mk_max(ors.size(), ors.c_ptr());
default: return ctx.mk_max(ors.size(), ors.data());
}
}
@ -643,7 +643,7 @@ Notes:
}
literal mk_or(literal_vector const& ors) {
return mk_or(ors.size(), ors.c_ptr());
return mk_or(ors.size(), ors.data());
}
literal mk_not(literal lit) {
@ -688,7 +688,7 @@ Notes:
case 2:
return mk_min(ands[0], ands[1]);
default: {
return ctx.mk_min(ands.size(), ands.c_ptr());
return ctx.mk_min(ands.size(), ands.data());
}
}
}
@ -718,7 +718,7 @@ Notes:
r1 = mk_and(r1, mk_or(ors));
}
else {
add_implies_or(r1, ors.size(), ors.c_ptr());
add_implies_or(r1, ors.size(), ors.data());
}
return r1;
}
@ -738,9 +738,9 @@ Notes:
if (n + 1 == inc_size) ++inc_size;
for (unsigned i = 0; i < n; i += inc_size) {
unsigned inc = std::min(n - i, inc_size);
mk_at_most_1_small(full, inc, in.c_ptr() + i, result, ands);
mk_at_most_1_small(full, inc, in.data() + i, result, ands);
if (use_ors || n > inc_size) {
ors.push_back(mk_or(inc, in.c_ptr() + i));
ors.push_back(mk_or(inc, in.data() + i));
}
}
if (n <= inc_size) {
@ -902,8 +902,8 @@ Notes:
literal_vector ands;
for (unsigned i = 0; i < n; i += inc_size) {
unsigned inc = std::min(n - i, inc_size);
mk_at_most_1_small(full, inc, in.c_ptr() + i, result, ands);
ors.push_back(mk_or(inc, in.c_ptr() + i));
mk_at_most_1_small(full, inc, in.data() + i, result, ands);
ors.push_back(mk_or(inc, in.data() + i));
}
unsigned nbits = 0;
@ -989,7 +989,7 @@ Notes:
add_clause(2, lits);
}
void add_clause(literal_vector const& lits) {
add_clause(lits.size(), lits.c_ptr());
add_clause(lits.size(), lits.data());
}
void add_clause(unsigned n, literal const* ls) {
for (unsigned i = 0; i < n; ++i) {
@ -998,7 +998,7 @@ Notes:
m_stats.m_num_compiled_clauses++;
m_stats.m_num_clause_vars += n;
literal_vector tmp(n, ls);
ctx.mk_clause(n, tmp.c_ptr());
ctx.mk_clause(n, tmp.data());
}
// y1 <= mk_max(x1,x2)
@ -1048,7 +1048,7 @@ Notes:
unsigned half = n/2; // TBD
card(k, half, xs, out1);
card(k, n-half, xs + half, out2);
smerge(k, out1.size(), out1.c_ptr(), out2.size(), out2.c_ptr(), out);
smerge(k, out1.size(), out1.data(), out2.size(), out2.data(), out);
}
TRACE("pb_verbose", tout << "card k: " << k << " n: " << n << "\n";
//pp(tout << "in:", n, xs) << "\n";
@ -1109,10 +1109,10 @@ Notes:
split(b, bs, even_b, odd_b);
SASSERT(!even_a.empty());
SASSERT(!even_b.empty());
merge(even_a.size(), even_a.c_ptr(),
even_b.size(), even_b.c_ptr(), out1);
merge(odd_a.size(), odd_a.c_ptr(),
odd_b.size(), odd_b.c_ptr(), out2);
merge(even_a.size(), even_a.data(),
even_b.size(), even_b.data(), out1);
merge(odd_a.size(), odd_a.data(),
odd_b.size(), odd_b.data(), out2);
interleave(out1, out2, out);
}
TRACE("pb_verbose", tout << "merge a: " << a << " b: " << b << " ";
@ -1213,8 +1213,8 @@ Notes:
unsigned half = n/2; // TBD
sorting(half, xs, out1);
sorting(n-half, xs+half, out2);
merge(out1.size(), out1.c_ptr(),
out2.size(), out2.c_ptr(),
merge(out1.size(), out1.data(),
out2.size(), out2.data(),
out);
}
break;
@ -1305,10 +1305,10 @@ Notes:
else {
c1 = (c + 1)/2; c2 = (c - 1)/2;
}
smerge(c1, even_a.size(), even_a.c_ptr(),
even_b.size(), even_b.c_ptr(), out1);
smerge(c2, odd_a.size(), odd_a.c_ptr(),
odd_b.size(), odd_b.c_ptr(), out2);
smerge(c1, even_a.size(), even_a.data(),
even_b.size(), even_b.data(), out1);
smerge(c2, odd_a.size(), odd_a.data(),
odd_b.size(), odd_b.data(), out2);
SASSERT(out1.size() == std::min(even_a.size()+even_b.size(), c1));
SASSERT(out2.size() == std::min(odd_a.size()+odd_b.size(), c2));
literal y;