mirror of
https://github.com/Z3Prover/z3
synced 2025-04-29 11:55:51 +00:00
merge smon with monomial
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
e73296fbe5
commit
53cc8048f7
20 changed files with 312 additions and 633 deletions
|
@ -8,72 +8,86 @@
|
|||
#include "util/lp/lp_settings.h"
|
||||
#include "util/vector.h"
|
||||
#include "util/lp/lar_solver.h"
|
||||
|
||||
#include "util/lp/nla_defs.h"
|
||||
namespace nla {
|
||||
/*
|
||||
* represents definition m_v = v1*v2*...*vn,
|
||||
* where m_vs = [v1, v2, .., vn]
|
||||
*/
|
||||
class monomial {
|
||||
|
||||
class mon_eq {
|
||||
// fields
|
||||
lp::var_index m_v;
|
||||
svector<lp::var_index> m_vs;
|
||||
public:
|
||||
// constructors
|
||||
monomial(lp::var_index v, unsigned sz, lp::var_index const* vs):
|
||||
mon_eq(lp::var_index v, unsigned sz, lp::var_index const* vs):
|
||||
m_v(v), m_vs(sz, vs) {
|
||||
std::sort(m_vs.begin(), m_vs.end());
|
||||
}
|
||||
monomial(lp::var_index v, const svector<lp::var_index> &vs):
|
||||
mon_eq(lp::var_index v, const svector<lp::var_index> &vs):
|
||||
m_v(v), m_vs(vs) {
|
||||
std::sort(m_vs.begin(), m_vs.end());
|
||||
}
|
||||
monomial() {}
|
||||
mon_eq() {}
|
||||
|
||||
unsigned var() const { return m_v; }
|
||||
unsigned size() const { return m_vs.size(); }
|
||||
unsigned operator[](unsigned idx) const { return m_vs[idx]; }
|
||||
svector<lp::var_index>::const_iterator begin() const { return m_vs.begin(); }
|
||||
svector<lp::var_index>::const_iterator end() const { return m_vs.end(); }
|
||||
const svector<lp::var_index>& vars() const { return m_vs; }
|
||||
svector<lp::var_index>& vars() { return m_vs; }
|
||||
bool empty() const { return m_vs.empty(); }
|
||||
};
|
||||
|
||||
std::ostream& display(std::ostream& out) const {
|
||||
out << "v" << var() << " := ";
|
||||
for (auto v : *this) {
|
||||
out << "v" << v << " ";
|
||||
}
|
||||
return out;
|
||||
}
|
||||
};
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& out, monomial const& m) {
|
||||
SASSERT(false);
|
||||
return m.display(out);
|
||||
// support the congruence
|
||||
class monomial: public mon_eq {
|
||||
// fields
|
||||
svector<lpvar> m_rvars;
|
||||
bool m_rsign;
|
||||
unsigned m_next; // next congruent node.
|
||||
unsigned m_prev; // previous congruent node
|
||||
mutable unsigned m_visited;
|
||||
public:
|
||||
// constructors
|
||||
monomial(lpvar v, unsigned sz, lpvar const* vs, unsigned idx): monomial(v, svector<lpvar>(sz, vs), idx) {
|
||||
}
|
||||
monomial(lpvar v, const svector<lpvar> &vs, unsigned idx) : mon_eq(v, vs), m_rsign(false), m_next(idx), m_prev(idx), m_visited(0) {
|
||||
std::sort(vars().begin(), vars().end());
|
||||
}
|
||||
|
||||
typedef std::unordered_map<lp::var_index, rational> variable_map_type;
|
||||
|
||||
bool check_assignment(monomial const& m, variable_map_type & vars);
|
||||
|
||||
bool check_assignments(const vector<monomial> & monomimials,
|
||||
unsigned next() const { return m_next; }
|
||||
unsigned& next() { return m_next; }
|
||||
unsigned prev() const { return m_prev; }
|
||||
unsigned& prev() { return m_prev; }
|
||||
unsigned visited() const { return m_visited; }
|
||||
unsigned& visited() { return m_visited; }
|
||||
svector<lpvar> const& rvars() const { return m_rvars; }
|
||||
bool sign() const { return m_rsign; }
|
||||
rational rsign() const { return rational(m_rsign ? -1 : 1); }
|
||||
void reset_rfields() { m_rsign = false; m_rvars.reset(); }
|
||||
void push_rvar(signed_var sv) { m_rsign ^= sv.sign(); m_rvars.push_back(sv.var()); }
|
||||
void sort_rvars() {
|
||||
std::sort(m_rvars.begin(), m_rvars.end());
|
||||
}
|
||||
std::ostream& display(std::ostream& out) const {
|
||||
// out << "v" << var() << " := ";
|
||||
// if (sign()) out << "- ";
|
||||
// for (lpvar v : vars()) out << "v" << v << " ";
|
||||
SASSERT(false);
|
||||
return out;
|
||||
}
|
||||
};
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& out, monomial const& m) {
|
||||
SASSERT(false);
|
||||
return m.display(out);
|
||||
}
|
||||
|
||||
typedef std::unordered_map<lpvar, rational> variable_map_type;
|
||||
template <typename T>
|
||||
bool check_assignment(T const& m, variable_map_type & vars);
|
||||
template <typename K>
|
||||
bool check_assignments(const K & monomimials,
|
||||
const lp::lar_solver& s,
|
||||
variable_map_type & vars);
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* represents definition m_v = coeff* v1*v2*...*vn,
|
||||
* where m_vs = [v1, v2, .., vn]
|
||||
*/
|
||||
class monomial_coeff {
|
||||
svector<lp::var_index> m_vs;
|
||||
rational m_coeff;
|
||||
public:
|
||||
monomial_coeff(const svector<lp::var_index>& vs, rational const& coeff): m_vs(vs), m_coeff(coeff) {}
|
||||
|
||||
rational const& coeff() const { return m_coeff; }
|
||||
const svector<lp::var_index> & vars() const { return m_vs; }
|
||||
};
|
||||
|
||||
}
|
||||
} // end of namespace nla
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue