mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-05 02:40:24 +00:00
Code Activity

add phase selection to theory-aware branching queue

Browse source
This commit is contained in:
Murphy Berzish 2017-01-14 14:43:57 -05:00
parent dd03632f3d
commit a9ec8666f0
1 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/smt/smt_case_split_queue.cpp
View file

@ -1231,11 +1231,14 @@ namespace smt {
smt_params & m_params; smt_params & m_params;
theory_var_priority_map m_theory_var_priority; theory_var_priority_map m_theory_var_priority;
theory_aware_act_queue m_queue; theory_aware_act_queue m_queue;
int_hashtable<int_hash, default_eq<bool_var> > m_theory_vars;
map<bool_var, lbool, int_hash, default_eq<bool_var> > m_theory_var_phase;
public: public:
theory_aware_branching_queue(context & ctx, smt_params & p): theory_aware_branching_queue(context & ctx, smt_params & p):
m_context(ctx), m_context(ctx),
m_params(p), m_params(p),
m_theory_var_priority(), m_theory_var_priority(),
m_queue(1024, theory_aware_act_lt(ctx.get_activity_vector(), m_theory_var_priority)) { m_queue(1024, theory_aware_act_lt(ctx.get_activity_vector(), m_theory_var_priority)) {
} }
@ -1290,20 +1293,25 @@ namespace smt {
} }
next = null_bool_var; next = null_bool_var;
if (m_theory_vars.contains(next)) {
if (!m_theory_var_phase.find(next, phase)) {
phase = l_undef;
}
}
} }
virtual void add_theory_aware_branching_info(bool_var v, double priority, lbool phase) { virtual void add_theory_aware_branching_info(bool_var v, double priority, lbool phase) {
TRACE("theory_aware_branching", tout << "Add theory-aware branching information for l#" << v << ": priority=" << priority << std::endl;); TRACE("theory_aware_branching", tout << "Add theory-aware branching information for l#" << v << ": priority=" << priority << std::endl;);
// m_theory_vars.insert(v); m_theory_vars.insert(v);
// m_theory_var_phase.insert(v, phase); m_theory_var_phase.insert(v, phase);
m_theory_var_priority.insert(v, priority); m_theory_var_priority.insert(v, priority);
if (m_queue.contains(v)) { if (m_queue.contains(v)) {
if (priority > 0.0) { if (priority > 0.0) {
m_queue.decreased(v); m_queue.decreased(v);
} else { } else {
m_queue.increased(v); m_queue.increased(v);
} }
} }
// m_theory_queue.reserve(v+1); // m_theory_queue.reserve(v+1);
// m_theory_queue.insert(v); // m_theory_queue.insert(v);
} }
@ -1333,12 +1341,12 @@ namespace smt {
case_split_queue * mk_case_split_queue(context & ctx, smt_params & p) { case_split_queue * mk_case_split_queue(context & ctx, smt_params & p) {
if (p.m_relevancy_lvl < 2 && (p.m_case_split_strategy == CS_RELEVANCY || p.m_case_split_strategy == CS_RELEVANCY_ACTIVITY || if (p.m_relevancy_lvl < 2 && (p.m_case_split_strategy == CS_RELEVANCY || p.m_case_split_strategy == CS_RELEVANCY_ACTIVITY ||
p.m_case_split_strategy == CS_RELEVANCY_GOAL)) { p.m_case_split_strategy == CS_RELEVANCY_GOAL)) {
warning_msg("relevancy must be enabled to use option CASE_SPLIT=3, 4 or 5"); warning_msg("relevancy must be enabled to use option CASE_SPLIT=3, 4 or 5");
p.m_case_split_strategy = CS_ACTIVITY; p.m_case_split_strategy = CS_ACTIVITY;
} }
if (p.m_auto_config && (p.m_case_split_strategy == CS_RELEVANCY || p.m_case_split_strategy == CS_RELEVANCY_ACTIVITY || if (p.m_auto_config && (p.m_case_split_strategy == CS_RELEVANCY || p.m_case_split_strategy == CS_RELEVANCY_ACTIVITY ||
p.m_case_split_strategy == CS_RELEVANCY_GOAL)) { p.m_case_split_strategy == CS_RELEVANCY_GOAL)) {
warning_msg("auto configuration (option AUTO_CONFIG) must be disabled to use option CASE_SPLIT=3, 4 or 5"); warning_msg("auto configuration (option AUTO_CONFIG) must be disabled to use option CASE_SPLIT=3, 4 or 5");
p.m_case_split_strategy = CS_ACTIVITY; p.m_case_split_strategy = CS_ACTIVITY;
} }