mirror of
https://github.com/Z3Prover/z3
synced 2025-05-12 02:04:43 +00:00
call it data instead of c_ptr for approaching C++11 std::vector convention.
This commit is contained in:
Nikolaj Bjorner
parent
524dcd35f9
commit
4a6083836a
456 changed files with 2802 additions and 2802 deletions
|
|
@ -145,10 +145,10 @@ namespace smt {
|
|||
}
|
||||
pb_util pb(m);
|
||||
if (is_eq) {
|
||||
result = pb.mk_eq(coeffs.size(), coeffs.c_ptr(), args.c_ptr(), k());
|
||||
result = pb.mk_eq(coeffs.size(), coeffs.data(), args.data(), k());
|
||||
}
|
||||
else {
|
||||
result = pb.mk_ge(coeffs.size(), coeffs.c_ptr(), args.c_ptr(), k());
|
||||
result = pb.mk_ge(coeffs.size(), coeffs.data(), args.data(), k());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -243,7 +243,7 @@ namespace smt {
|
|||
for (unsigned i = 0; i < size(); ++i) {
|
||||
args.push_back(th.literal2expr(m_args[i]));
|
||||
}
|
||||
return app_ref(th.pb.mk_at_least_k(args.size(), args.c_ptr(), k()), m);
|
||||
return app_ref(th.pb.mk_at_least_k(args.size(), args.data(), k()), m);
|
||||
}
|
||||
|
||||
lbool theory_pb::card::assign(theory_pb& th, literal alit) {
|
||||
|
|
@ -500,8 +500,8 @@ namespace smt {
|
|||
// -ax - by - cz >= -k
|
||||
// <=>
|
||||
// a(1-x) + b(1-y) + c(1-z) >= a + b + c - k
|
||||
expr_ref le(pb.mk_ge(num_args, coeffs.c_ptr(), nargs.c_ptr(), sum - k), m);
|
||||
expr_ref ge(pb.mk_ge(num_args, coeffs.c_ptr(), args.c_ptr(), k), m);
|
||||
expr_ref le(pb.mk_ge(num_args, coeffs.data(), nargs.data(), sum - k), m);
|
||||
expr_ref ge(pb.mk_ge(num_args, coeffs.data(), args.data(), k), m);
|
||||
ctx.internalize(le, false);
|
||||
ctx.internalize(ge, false);
|
||||
literal le_lit = ctx.get_literal(le);
|
||||
|
|
@ -568,7 +568,7 @@ namespace smt {
|
|||
SASSERT(c->coeff(i).is_one());
|
||||
ctx.mk_th_axiom(get_id(), lit, ~c->lit(i));
|
||||
}
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.data());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -765,7 +765,7 @@ namespace smt {
|
|||
return nullptr;
|
||||
}
|
||||
else {
|
||||
return m.mk_th_lemma(m_fid, fact, prs.size(), prs.c_ptr());
|
||||
return m.mk_th_lemma(m_fid, fact, prs.size(), prs.data());
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -844,7 +844,7 @@ namespace smt {
|
|||
lits.push_back(~c.lit(i));
|
||||
}
|
||||
lits.push_back(lit);
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.data());
|
||||
for (unsigned i = 0; i < c.size(); ++i) {
|
||||
literal lits2[2] = { ~lit, c.lit(i) };
|
||||
ctx.mk_th_axiom(get_id(), 2, lits2);
|
||||
|
|
@ -858,7 +858,7 @@ namespace smt {
|
|||
lits.push_back(c.lit(i));
|
||||
}
|
||||
lits.push_back(~lit);
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
|
||||
ctx.mk_th_axiom(get_id(), lits.size(), lits.data());
|
||||
for (unsigned i = 0; i < c.size(); ++i) {
|
||||
literal lits2[2] = { lit, ~c.lit(i) };
|
||||
ctx.mk_th_axiom(get_id(), 2, lits2);
|
||||
|
|
@ -934,9 +934,9 @@ namespace smt {
|
|||
c.inc_propagations(*this);
|
||||
if (!resolve_conflict(c, lits)) {
|
||||
if (proofs_enabled()) {
|
||||
js = alloc(theory_lemma_justification, get_id(), ctx, lits.size(), lits.c_ptr());
|
||||
js = alloc(theory_lemma_justification, get_id(), ctx, lits.size(), lits.data());
|
||||
}
|
||||
ctx.mk_clause(lits.size(), lits.c_ptr(), js, CLS_TH_LEMMA, nullptr);
|
||||
ctx.mk_clause(lits.size(), lits.data(), js, CLS_TH_LEMMA, nullptr);
|
||||
}
|
||||
SASSERT(ctx.inconsistent());
|
||||
}
|
||||
|
|
@ -1280,7 +1280,7 @@ namespace smt {
|
|||
ctx.literal2expr(lits[i], tmp);
|
||||
es.push_back(tmp);
|
||||
}
|
||||
tmp = m.mk_or(es.size(), es.c_ptr());
|
||||
tmp = m.mk_or(es.size(), es.data());
|
||||
bool_var v = ctx.b_internalized(tmp)?ctx.get_bool_var(tmp):ctx.mk_bool_var(tmp);
|
||||
return literal(v);
|
||||
}
|
||||
|
|
@ -1292,7 +1292,7 @@ namespace smt {
|
|||
ctx.literal2expr(lits[i], tmp);
|
||||
es.push_back(tmp);
|
||||
}
|
||||
tmp = m.mk_and(es.size(), es.c_ptr());
|
||||
tmp = m.mk_and(es.size(), es.data());
|
||||
bool_var v = ctx.b_internalized(tmp)?ctx.get_bool_var(tmp):ctx.mk_bool_var(tmp);
|
||||
return literal(v);
|
||||
}
|
||||
|
|
@ -1301,7 +1301,7 @@ namespace smt {
|
|||
|
||||
void mk_clause(unsigned n, literal const* ls) {
|
||||
literal_vector tmp(n, ls);
|
||||
ctx.mk_clause(n, tmp.c_ptr(), th.justify(tmp), CLS_AUX, nullptr);
|
||||
ctx.mk_clause(n, tmp.data(), th.justify(tmp), CLS_AUX, nullptr);
|
||||
}
|
||||
|
||||
literal mk_false() { return false_literal; }
|
||||
|
|
@ -1504,7 +1504,7 @@ namespace smt {
|
|||
SASSERT(validate_antecedents(lits));
|
||||
ctx.assign(l, ctx.mk_justification(
|
||||
pb_justification(
|
||||
c, get_id(), ctx.get_region(), lits.size(), lits.c_ptr(), l)));
|
||||
c, get_id(), ctx.get_region(), lits.size(), lits.data(), l)));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1516,9 +1516,9 @@ namespace smt {
|
|||
display(tout, c, true););
|
||||
justification* js = nullptr;
|
||||
if (proofs_enabled()) {
|
||||
js = alloc(theory_lemma_justification, get_id(), ctx, lits.size(), lits.c_ptr());
|
||||
js = alloc(theory_lemma_justification, get_id(), ctx, lits.size(), lits.data());
|
||||
}
|
||||
ctx.mk_clause(lits.size(), lits.c_ptr(), js, CLS_TH_LEMMA, nullptr);
|
||||
ctx.mk_clause(lits.size(), lits.data(), js, CLS_TH_LEMMA, nullptr);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1622,7 +1622,7 @@ namespace smt {
|
|||
literal lit = cls.get_literal(i);
|
||||
args.push_back(literal2expr(lit));
|
||||
}
|
||||
result = m.mk_or(args.size(), args.c_ptr());
|
||||
result = m.mk_or(args.size(), args.data());
|
||||
break;
|
||||
}
|
||||
case b_justification::BIN_CLAUSE:
|
||||
|
|
@ -2005,7 +2005,7 @@ namespace smt {
|
|||
|
||||
SASSERT(validate_antecedents(m_antecedents));
|
||||
TRACE("pb", tout << "assign " << m_antecedents << " ==> " << alit << "\n";);
|
||||
ctx.assign(alit, ctx.mk_justification(theory_propagation_justification(get_id(), ctx.get_region(), m_antecedents.size(), m_antecedents.c_ptr(), alit, 0, nullptr)));
|
||||
ctx.assign(alit, ctx.mk_justification(theory_propagation_justification(get_id(), ctx.get_region(), m_antecedents.size(), m_antecedents.data(), alit, 0, nullptr)));
|
||||
|
||||
DEBUG_CODE(
|
||||
m_antecedents.push_back(~alit);
|
||||
|
|
@ -2013,7 +2013,7 @@ namespace smt {
|
|||
for (literal lit : m_antecedents) {
|
||||
args.push_back(literal2expr(lit));
|
||||
}
|
||||
B = m.mk_not(m.mk_and(args.size(), args.c_ptr()));
|
||||
B = m.mk_not(m.mk_and(args.size(), args.data()));
|
||||
validate_implies(A, B); );
|
||||
return true;
|
||||
}
|
||||
|
|
@ -2034,7 +2034,7 @@ namespace smt {
|
|||
justification* theory_pb::justify(literal_vector const& lits) {
|
||||
justification* js = nullptr;
|
||||
if (proofs_enabled()) {
|
||||
js = ctx.mk_justification(theory_axiom_justification(get_id(), ctx.get_region(), lits.size(), lits.c_ptr()));
|
||||
js = ctx.mk_justification(theory_axiom_justification(get_id(), ctx.get_region(), lits.size(), lits.data()));
|
||||
}
|
||||
return js;
|
||||
}
|
||||
|
|
@ -2188,7 +2188,7 @@ namespace smt {
|
|||
coeffs.push_back(rational(get_abs_coeff(v)));
|
||||
}
|
||||
rational k(m_bound);
|
||||
return app_ref(pb.mk_ge(args.size(), coeffs.c_ptr(), args.c_ptr(), k), m);
|
||||
return app_ref(pb.mk_ge(args.size(), coeffs.data(), args.data(), k), m);
|
||||
}
|
||||
|
||||
// display methods
|
||||
|
|
@ -2296,7 +2296,7 @@ namespace smt {
|
|||
}
|
||||
|
||||
void get_dependencies(buffer<model_value_dependency> & result) override {
|
||||
result.append(m_dependencies.size(), m_dependencies.c_ptr());
|
||||
result.append(m_dependencies.size(), m_dependencies.data());
|
||||
}
|
||||
|
||||
app * mk_value(model_generator & mg, expr_ref_vector const& values) override {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue