mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 09:55:19 +00:00
Code Activity

add engine-init to control model transfer

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-03-30 15:12:32 -07:00
parent 51f1e2655c
commit 84092cbd96
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ast/sls/bv_sls.cpp
View file

@ -101,16 +101,24 @@ namespace bv {
std::function<bool(expr*, unsigned)> eval = [&](expr* e, unsigned i) { std::function<bool(expr*, unsigned)> eval = [&](expr* e, unsigned i) {
unsigned id = e->get_id(); unsigned id = e->get_id();
bool keep = (m_rand() % 100 <= 50) || !m_to_repair.contains(id); bool keep = !m_to_repair.contains(id);
if (m.is_bool(e) && (m_eval.is_fixed0(e) || keep)) if (m.is_bool(e)) {
return m_eval.bval0(e); if (m_eval.is_fixed0(e) || keep)
return m_eval.bval0(e);
if (m_engine_init) {
auto const& z = m_engine.get_value(e);
return rational(z).get_bit(0);
}
}
else if (bv.is_bv(e)) { else if (bv.is_bv(e)) {
auto& w = m_eval.wval(e); auto& w = m_eval.wval(e);
if (w.fixed.get(i) || keep) if (w.fixed.get(i) || keep)
return w.get_bit(i); return w.get_bit(i);
//auto const& z = m_engine.get_value(e); if (m_engine_init) {
//return rational(z).get_bit(i); auto const& z = m_engine.get_value(e);
} return rational(z).get_bit(i);
}
}
return m_rand() % 2 == 0; return m_rand() % 2 == 0;
}; };
@ -177,7 +185,8 @@ namespace bv {
else if (m_stats.m_restarts % 1000 == 0) else if (m_stats.m_restarts % 1000 == 0)
res = m_engine.search_loop(); res = m_engine.search_loop();
if (res != l_undef) if (res != l_undef)
m_engine_model = true; m_engine_model = true;
m_engine_init = true;
return res; return res;
} }
@ -187,6 +196,7 @@ namespace bv {
m_stats.reset(); m_stats.reset();
m_stats.m_restarts = 0; m_stats.m_restarts = 0;
m_engine_model = false; m_engine_model = false;
m_engine_init = false;
do { do {
res = search1(); res = search1();

1
src/ast/sls/bv_sls.h
View file

@ -52,6 +52,7 @@ namespace bv {
config m_config; config m_config;
sls_engine m_engine; sls_engine m_engine;
bool m_engine_model = false; bool m_engine_model = false;
bool m_engine_init = false;
std::pair<bool, app*> next_to_repair(); std::pair<bool, app*> next_to_repair();