mirror of
https://github.com/Z3Prover/z3
synced 2025-04-08 18:31:49 +00:00
local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
d8ea3023fc
commit
527980e440
|
@ -1265,6 +1265,7 @@ namespace smt {
|
|||
}
|
||||
}
|
||||
|
||||
unsigned num_compiled_vars, num_compiled_clauses;
|
||||
|
||||
if (ctx.get_assignment(thl) == l_true &&
|
||||
ctx.get_assign_level(thl) == ctx.get_base_level()) {
|
||||
|
@ -1273,8 +1274,8 @@ namespace smt {
|
|||
sortnw.m_stats.reset();
|
||||
at_least_k = sortnw.ge(false, k, in.size(), in.c_ptr());
|
||||
ctx.mk_clause(~thl, at_least_k, justify(~thl, at_least_k));
|
||||
m_stats.m_num_compiled_vars += sortnw.m_stats.m_num_compiled_vars;
|
||||
m_stats.m_num_compiled_clauses += sortnw.m_stats.m_num_compiled_clauses;
|
||||
num_compiled_vars = sortnw.m_stats.m_num_compiled_vars;
|
||||
num_compiled_clauses = sortnw.m_stats.m_num_compiled_clauses;
|
||||
}
|
||||
else {
|
||||
psort_expr ps(ctx, *this);
|
||||
|
@ -1283,12 +1284,16 @@ namespace smt {
|
|||
literal at_least_k = sortnw.ge(true, k, in.size(), in.c_ptr());
|
||||
ctx.mk_clause(~thl, at_least_k, justify(~thl, at_least_k));
|
||||
ctx.mk_clause(~at_least_k, thl, justify(thl, ~at_least_k));
|
||||
m_stats.m_num_compiled_vars += sortnw.m_stats.m_num_compiled_vars;
|
||||
m_stats.m_num_compiled_clauses += sortnw.m_stats.m_num_compiled_clauses;
|
||||
num_compiled_vars = sortnw.m_stats.m_num_compiled_vars;
|
||||
num_compiled_clauses = sortnw.m_stats.m_num_compiled_clauses;
|
||||
}
|
||||
m_stats.m_num_compiled_vars += num_compiled_vars;
|
||||
m_stats.m_num_compiled_clauses += num_compiled_clauses;
|
||||
IF_VERBOSE(1, verbose_stream()
|
||||
<< "(smt.pb compile sorting network bound: "
|
||||
<< k << " literals: " << in.size() << ")\n";);
|
||||
<< k << " literals: " << in.size()
|
||||
<< " clauses: " << num_compiled_clauses
|
||||
<< " vars: " << num_compiled_vars << ")\n";);
|
||||
|
||||
TRACE("pb", tout << thl << "\n";);
|
||||
// auxiliary clauses get removed when popping scopes.
|
||||
|
|
|
@ -235,7 +235,7 @@ Notes:
|
|||
|
||||
literal mk_at_most_1(bool full, unsigned n, literal const* xs) {
|
||||
literal_vector in(n, xs);
|
||||
literal result = ctx.fresh();
|
||||
literal result = fresh();
|
||||
unsigned inc_size = 4;
|
||||
while (!in.empty()) {
|
||||
literal_vector ors;
|
||||
|
@ -260,7 +260,7 @@ Notes:
|
|||
|
||||
void mk_at_most_1_small(bool full, bool last, unsigned n, literal const* xs, literal result, literal_vector& ors) {
|
||||
if (!last) {
|
||||
literal ex = ctx.fresh();
|
||||
literal ex = fresh();
|
||||
for (unsigned j = 0; j < n; ++j) {
|
||||
add_clause(ctx.mk_not(xs[j]), ex);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue