mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00
Code Activity

move to scoped state, change default parameter for sls until bv is debugged

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-05-11 18:39:36 -07:00
parent e9a11bd93b
commit cad1e5cab3
3 changed files with 15 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/opt/opt_context.cpp
View file

@ -991,11 +991,11 @@ namespace opt {
free_func_visitor visitor(m);
std::ostringstream out;
#define PP(_e_) ast_smt2_pp(out, _e_, env);
for (unsigned i = 0; i < m_hard_constraints.size(); ++i) {
visitor.collect(m_hard_constraints[i]);
for (unsigned i = 0; i < m_scoped_state.m_hard.size(); ++i) {
visitor.collect(m_scoped_state.m_hard[i]);
}
for (unsigned i = 0; i < m_objectives.size(); ++i) {
objective const& obj = m_objectives[i];
for (unsigned i = 0; i < m_scoped_state.m_objectives.size(); ++i) {
objective const& obj = m_scoped_state.m_objectives[i];
switch(obj.m_type) {
case O_MAXIMIZE:
case O_MINIMIZE:
@ -1023,13 +1023,13 @@ namespace opt {
PP(*it);
out << "\n";
}
for (unsigned i = 0; i < m_hard_constraints.size(); ++i) {
for (unsigned i = 0; i < m_scoped_state.m_hard.size(); ++i) {
out << "(assert ";
PP(m_hard_constraints[i]);
PP(m_scoped_state.m_hard[i]);
out << ")\n";
}
for (unsigned i = 0; i < m_objectives.size(); ++i) {
objective const& obj = m_objectives[i];
for (unsigned i = 0; i < m_scoped_state.m_objectives.size(); ++i) {
objective const& obj = m_scoped_state.m_objectives[i];
switch(obj.m_type) {
case O_MAXIMIZE:
out << "(maximize ";