mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 21:38:44 +00:00
Code Activity

Add objective functions to difference logic solver

Browse source
This commit is contained in:
Phan Anh Dung 2013-10-24 08:57:21 +02:00
parent 7c8fbbb06a
commit 1ff373072d
2 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/smt/theory_diff_logic.h
View file

@ -306,7 +306,11 @@ namespace smt {
virtual bool maximize(theory_var v); virtual bool maximize(theory_var v);
virtual theory_var add_objective(app* term); virtual theory_var add_objective(app* term);
virtual inf_eps_rational<inf_rational> get_objective_value(theory_var v); virtual inf_eps_rational<inf_rational> get_objective_value(theory_var v);
inf_rational m_objective;
typedef vector <std::pair<theory_var, rational> > objective_term;
vector<objective_term> m_objectives;
void internalize_objective(app * n, objective_term & objective);
private: private:

58
src/smt/theory_diff_logic_def.h
View file

@ -998,21 +998,73 @@ void theory_diff_logic<Ext>::get_implied_bound_antecedents(edge_id bridge_edge,
template<typename Ext> template<typename Ext>
bool theory_diff_logic<Ext>::maximize(theory_var v) { bool theory_diff_logic<Ext>::maximize(theory_var v) {
IF_VERBOSE(1,
objective_term objective = m_objectives[v];
for (unsigned i = 0; i < objective.size(); ++i) {
verbose_stream() << "coefficient " << objective[i].second << " of theory_var " << objective[i].first << "\n";
}
verbose_stream() << "\n";);
NOT_IMPLEMENTED_YET(); NOT_IMPLEMENTED_YET();
return false; return false;
} }
template<typename Ext> template<typename Ext>
theory_var theory_diff_logic<Ext>::add_objective(app* term) { theory_var theory_diff_logic<Ext>::add_objective(app* term) {
// Internalizing may not succeed since objective can be LRA objective_term objective;
return null_theory_var; internalize_objective(term, objective);
m_objectives.push_back(objective);
return m_objectives.size()-1;
} }
template<typename Ext> template<typename Ext>
inf_eps_rational<inf_rational> theory_diff_logic<Ext>::get_objective_value(theory_var v) { inf_eps_rational<inf_rational> theory_diff_logic<Ext>::get_objective_value(theory_var v) {
inf_eps_rational<inf_rational> val(m_objective); inf_rational objective;
inf_eps_rational<inf_rational> val(objective);
return val; return val;
} }
template<typename Ext>
void theory_diff_logic<Ext>::internalize_objective(app * n, objective_term & objective) {
// TODO: Need some simplification on n to ensure no bad case
SASSERT(!m_util.is_div(n));
SASSERT(!m_util.is_idiv(n));
SASSERT(!m_util.is_mod(n));
SASSERT(!m_util.is_rem(n));
SASSERT(!m_util.is_to_real(n));
SASSERT(!m_util.is_to_int(n));
SASSERT(!m_util.is_power(n));
SASSERT(!m_util.is_irrational_algebraic_numeral(n));
// Compile term into objective_term format
rational r;
if (m_util.is_numeral(n, r)) {
theory_var v = mk_num(n, r);
objective.push_back(std::make_pair(v, r));
}
else if (m_util.is_add(n)) {
for (unsigned i = 0; i < n->get_num_args(); ++i) {
internalize_objective(to_app(n->get_arg(i)), objective);
};
}
else if (m_util.is_mul(n)) {
SASSERT(n->get_num_args() == 2);
rational r;
app * lhs = to_app(n->get_arg(0));
app * rhs = to_app(n->get_arg(1));
SASSERT(m_util.is_numeral(lhs, r) || m_util.is_numeral(rhs, r));
if (!m_util.is_numeral(lhs, r))
std::swap(lhs, rhs);
m_util.is_numeral(lhs, r);
theory_var v = mk_var(rhs);
objective.push_back(std::make_pair(v, r));
}
else {
theory_var v = mk_var(n);
rational r(1);
objective.push_back(std::make_pair(v, r));
}
}
#endif /* _THEORY_DIFF_LOGIC_DEF_H_ */ #endif /* _THEORY_DIFF_LOGIC_DEF_H_ */