mirror of
https://github.com/Z3Prover/z3
synced 2025-04-06 17:44:08 +00:00
fixes to lazy tactic uses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
01cf0427b4
commit
40b0210dda
|
@ -89,7 +89,7 @@ tactic * mk_qfnra_very_small_solver(ast_manager& m, params_ref const& p) {
|
||||||
p_i.set_bool("shuffle_vars", true);
|
p_i.set_bool("shuffle_vars", true);
|
||||||
// if ((i & 1) == 0)
|
// if ((i & 1) == 0)
|
||||||
// p_i.set_bool("randomize", false);
|
// p_i.set_bool("randomize", false);
|
||||||
ts.push_back(mk_lazy_tactic(m, p_i, [&](ast_manager& m, params_ref const& p) { return try_for(mk_qfnra_nlsat_tactic(m, p_i), 3 * 1000); }));
|
ts.push_back(mk_lazy_tactic(m, p_i, [&](ast_manager& m, params_ref const& p) { return try_for(mk_qfnra_nlsat_tactic(m, p), 3 * 1000); }));
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ts.push_back(mk_qfnra_nlsat_tactic(m, p));
|
ts.push_back(mk_qfnra_nlsat_tactic(m, p));
|
||||||
|
@ -147,7 +147,7 @@ tactic * mk_qfnra_small_solver(ast_manager& m, params_ref const& p) {
|
||||||
p_i.set_bool("shuffle_vars", true);
|
p_i.set_bool("shuffle_vars", true);
|
||||||
// if ((i & 1) == 0)
|
// if ((i & 1) == 0)
|
||||||
// p_i.set_bool("randomize", false);
|
// p_i.set_bool("randomize", false);
|
||||||
ts.push_back(mk_lazy_tactic(m, p_i, [&](ast_manager& m, params_ref const& p) { return try_for(mk_qfnra_nlsat_tactic(m, p_i), 5 * 1000); }));
|
ts.push_back(mk_lazy_tactic(m, p_i, [&](ast_manager& m, params_ref const& p) { return try_for(mk_qfnra_nlsat_tactic(m, p), 5 * 1000); }));
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
ts.push_back(mk_qfnra_nlsat_tactic(m, p));
|
ts.push_back(mk_qfnra_nlsat_tactic(m, p));
|
||||||
|
|
|
@ -114,6 +114,11 @@ public:
|
||||||
void user_propagate_initialize_value(expr* var, expr* value) override { if (m_tactic) m_tactic->user_propagate_initialize_value(var, value); }
|
void user_propagate_initialize_value(expr* var, expr* value) override { if (m_tactic) m_tactic->user_propagate_initialize_value(var, value); }
|
||||||
tactic* translate(ast_manager& m) override { ensure_tactic(); return m_tactic->translate(m); }
|
tactic* translate(ast_manager& m) override { ensure_tactic(); return m_tactic->translate(m); }
|
||||||
void reset() override { if (m_tactic) m_tactic->reset(); }
|
void reset() override { if (m_tactic) m_tactic->reset(); }
|
||||||
|
void reset_statistics() override { if (m_tactic) m_tactic->reset_statistics(); }
|
||||||
|
void register_on_clause(void* ctx, user_propagator::on_clause_eh_t& on_clause) override {
|
||||||
|
ensure_tactic();
|
||||||
|
m_tactic->register_on_clause(ctx, on_clause);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue