mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

Remove m_final from spanning tree representation

Browse source
This commit is contained in:
Anh-Dung Phan 2013-11-06 13:30:29 -08:00
parent cf75a7743e
commit 034b33b6da
5 changed files with 55 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/opt/opt_solver.cpp
View file

@ -23,6 +23,7 @@ Notes:
#include"smt_context.h"
#include"theory_arith.h"
#include"theory_diff_logic.h"
#include "ast_pp.h"
namespace opt {
@ -94,7 +95,13 @@ namespace opt {
lbool opt_solver::check_sat_core(unsigned num_assumptions, expr * const * assumptions) {
TRACE("opt_solver_na2as", tout << "opt_opt_solver::check_sat_core: " << num_assumptions << "\n";);
TRACE("opt_solver_na2as", {
tout << "opt_opt_solver::check_sat_core: " << m_context.size() << "\n";
for (unsigned i = 0; i < m_context.size(); ++i) {
tout << mk_pp(m_context.get_formulas()[i], m_context.m()) << "\n";
}
});
lbool r = m_context.check(num_assumptions, assumptions);
if (r == l_true && m_objective_enabled) {
m_objective_values.reset();

2
src/opt/optimize_objectives.cpp
View file

@ -115,7 +115,7 @@ namespace opt {
verbose_stream() << m_lower[i] << " ";
}
verbose_stream() << "\n";
// model_pp(verbose_stream(), *md);
model_pp(verbose_stream(), *md);
);
expr_ref_vector disj(m);
expr_ref constraint(m);