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

adding annotation to logging to show number of columns and rows, adding dual propagation sketch

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-01-25 04:01:18 -08:00
parent aae37c2317
commit 761c7d9a40
12 changed files with 152 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/maxsmt.cpp
View file

@ -106,7 +106,7 @@ namespace opt {
}
void maxsmt_solver_base::set_soft_assumptions() {
m_c.set_soft_assumptions()
m_c.set_soft_assumptions();
}
app* maxsmt_solver_base::mk_fresh_bool(char const* name) {
@ -174,11 +174,8 @@ namespace opt {
else if (maxsat_engine == symbol("maxres")) {
m_msolver = mk_maxres(m_c, m_weights, m_soft_constraints);
}
else if (maxsat_engine == symbol("mus-mss-maxres")) {
m_msolver = mk_mus_mss_maxres(m_c, m_weights, m_soft_constraints);
}
else if (maxsat_engine == symbol("mss-maxres")) {
m_msolver = mk_mss_maxres(m_c, m_weights, m_soft_constraints);
else if (maxsat_engine == symbol("pd-maxres")) {
m_msolver = mk_primal_dual_maxres(m_c, m_weights, m_soft_constraints);
}
else if (maxsat_engine == symbol("bcd2")) {
m_msolver = mk_bcd2(m_c, m_weights, m_soft_constraints);