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

fix #2548 fix #2530

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-09-13 13:54:51 +02:00
parent 5d9ed5b0a9
commit 67c4777514
11 changed files with 251 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/qe/nlqsat.cpp
View file

@ -350,6 +350,16 @@ namespace qe {
}
}
void display_project(std::ostream& out, nlsat::var v, nlsat::scoped_literal_vector const& r1, nlsat::scoped_literal_vector const& r2) {
for (auto const& kv : s.m_x2t) {
out << "(declare-const x" << kv.m_key << " Real)\n";
}
s.m_solver.display(out << "(assert (not (exists ((", v) << " Real)) \n";
s.m_solver.display_smt2(out << "(and ", r1.size(), r1.c_ptr()) << "))))\n";
s.m_solver.display_smt2(out << "(assert (and ", r2.size(), r2.c_ptr()); out << "))\n";
out << "(check-sat)\n(reset)\n";
}
void mbp(nlsat::var_vector const& vars, uint_set const& fvars, clause& result) {
//
// Also project auxiliary variables from clausification.
@ -370,11 +380,10 @@ namespace qe {
// renaming variables.
for (unsigned i = vars.size(); i-- > 0;) {
new_result.reset();
TRACE("qe", s.m_solver.display(tout << "project: ", vars[i]) << "\n";);
ex.project(vars[i], result.size(), result.c_ptr(), new_result);
TRACE("qe", display_project(tout, vars[i], result, new_result););
TRACE("qe", display_project(std::cout, vars[i], result, new_result););
result.swap(new_result);
TRACE("qe", s.m_solver.display(tout, vars[i]) << ": ";
s.m_solver.display(tout, result.size(), result.c_ptr()); tout << "\n";);
}
negate_clause(result);
}