mirror of
https://github.com/Z3Prover/z3
synced 2025-09-11 04:01:25 +00:00
Merge branch 'ilana' into parallel-solving
This commit is contained in:
commit
4eeb98d294
4 changed files with 129 additions and 0 deletions
|
@ -192,6 +192,7 @@ namespace smt {
|
|||
svector<double> m_activity;
|
||||
updatable_priority_queue::priority_queue<bool_var, double> m_pq_scores;
|
||||
svector<std::array<double, 2>> m_lit_scores;
|
||||
|
||||
clause_vector m_aux_clauses;
|
||||
clause_vector m_lemmas;
|
||||
vector<clause_vector> m_clauses_to_reinit;
|
||||
|
|
|
@ -1545,6 +1545,7 @@ namespace smt {
|
|||
|
||||
auto new_score = m_lit_scores[v][0] * m_lit_scores[v][1];
|
||||
m_pq_scores.set(v, new_score);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -92,6 +92,7 @@ namespace smt {
|
|||
sl.push_child(&(new_m->limit()));
|
||||
}
|
||||
|
||||
|
||||
auto cube = [](context& ctx, expr_ref_vector& lasms, expr_ref& c) {
|
||||
lookahead lh(ctx);
|
||||
c = lh.choose();
|
||||
|
@ -122,6 +123,7 @@ namespace smt {
|
|||
expr* e = ctx.bool_var2expr(node.key);
|
||||
if (!e) continue;
|
||||
|
||||
|
||||
expr_ref lit(e, m);
|
||||
conjuncts.push_back(lit);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue