3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-12 10:40:17 +00:00

merge with unstable

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-10-05 10:37:55 -07:00
commit c706e91019
18 changed files with 49 additions and 38 deletions

View file

@ -49,7 +49,7 @@ namespace sat {
m_qhead(0),
m_scope_lvl(0),
m_params(p) {
m_config.updt_params(p);
updt_params(p);
m_conflicts_since_gc = 0;
m_conflicts = 0;
m_next_simplify = 0;
@ -2358,7 +2358,7 @@ namespace sat {
m_asymm_branch.updt_params(p);
m_probing.updt_params(p);
m_scc.updt_params(p);
m_rand.set_seed(p.get_uint("random_seed", 0));
m_rand.set_seed(m_config.m_random_seed);
}
void solver::collect_param_descrs(param_descrs & d) {