mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity

tweaking nlqsat

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-09-05 09:55:25 +03:00
parent 5fbfc0f9f7
commit 29f0897afc
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/qe/nlqsat.cpp
View file

@ -102,7 +102,9 @@ namespace qe {
void init_expr2var(app_ref_vector const& qvars) {
for (app* v : qvars) {
if (m.is_bool(v)) {
m_a2b.insert(v, m_solver.mk_bool_var());
nlsat::bool_var b = m_solver.mk_bool_var();
m_solver.inc_ref(b);
m_a2b.insert(v, b);
}
else {
// TODO: assert it is of type Real.
@ -121,8 +123,12 @@ namespace qe {
}
void save_model(bool is_exists) {
svector<nlsat::bool_var> bvars;
for (auto const& kv : m_bvar2level) {
bvars.push_back(kv.m_key);
}
m_solver.get_rvalues(m_rmodel);
m_solver.get_bvalues(m_bmodel);
m_solver.get_bvalues(bvars, m_bmodel);
m_valid_model = true;
if (is_exists) {
m_rmodel0.copy(m_rmodel);
@ -311,6 +317,7 @@ namespace qe {
}
}
TRACE("qe", s.display(tout);
tout << "assumptions\n";
for (nlsat::literal a : s.m_asms) {
s.m_solver.display(tout, a) << "\n";
});