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

isolate constraints in a constraint_set

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-07 09:13:40 -08:00
parent 4535228fe2
commit a59745c2f2
7 changed files with 192 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

152
src/math/lp/lar_constraints.h
View file

@ -19,14 +19,17 @@ Revision History:
--*/
#pragma once
#include "util/vector.h"
#include <utility>
#include <unordered_map>
#include <string>
#include <algorithm>
#include "util/vector.h"
#include "util/region.h"
#include "math/lp/lp_utils.h"
#include "math/lp/ul_pair.h"
#include "math/lp/lar_term.h"
#include "math/lp/column_namer.h"
#include "math/lp/stacked_value.h"
namespace lp {
inline lconstraint_kind flip_kind(lconstraint_kind t) {
return static_cast<lconstraint_kind>( - static_cast<int>(t));
@ -57,8 +60,9 @@ struct lar_base_constraint {
virtual mpq get_free_coeff_of_left_side() const { return zero_of_type<mpq>();}
};
struct lar_var_constraint: public lar_base_constraint {
class lar_var_constraint: public lar_base_constraint {
unsigned m_j;
public:
vector<std::pair<mpq, var_index>> coeffs() const override {
vector<std::pair<mpq, var_index>> ret;
ret.push_back(std::make_pair(one_of_type<mpq>(), m_j));
@ -69,32 +73,136 @@ struct lar_var_constraint: public lar_base_constraint {
};
struct lar_term_constraint: public lar_base_constraint {
class lar_term_constraint: public lar_base_constraint {
const lar_term * m_term;
vector<std::pair<mpq, var_index>> coeffs() const override {
return m_term->coeffs_as_vector();
}
public:
vector<std::pair<mpq, var_index>> coeffs() const override { return m_term->coeffs_as_vector(); }
unsigned size() const override { return m_term->size();}
lar_term_constraint(const lar_term *t, lconstraint_kind kind, const mpq& right_side) : lar_base_constraint(kind, right_side), m_term(t) { }
// mpq get_free_coeff_of_left_side() const override { return m_term->m_v;}
};
class lar_constraint : public lar_base_constraint {
class constraint_set {
region m_region;
column_namer& m_namer;
vector<lar_base_constraint*> m_constraints;
stacked_value<unsigned> m_constraint_count;
constraint_index add(lar_base_constraint* c) {
constraint_index ci = m_constraints.size();
m_constraints.push_back(c);
return ci;
}
std::ostream& print_left_side_of_constraint(const lar_base_constraint & c, std::ostream & out) const {
m_namer.print_linear_combination_of_column_indices(c.coeffs(), out);
mpq free_coeff = c.get_free_coeff_of_left_side();
if (!is_zero(free_coeff))
out << " + " << free_coeff;
return out;
}
std::ostream& print_left_side_of_constraint_indices_only(const lar_base_constraint & c, std::ostream & out) const {
print_linear_combination_of_column_indices_only(c.coeffs(), out);
mpq free_coeff = c.get_free_coeff_of_left_side();
if (!is_zero(free_coeff))
out << " + " << free_coeff;
return out;
}
std::ostream& print_left_side_of_constraint(const lar_base_constraint & c, std::function<std::string (unsigned)>& var_str, std::ostream & out) const {
print_linear_combination_customized(c.coeffs(), var_str, out);
mpq free_coeff = c.get_free_coeff_of_left_side();
if (!is_zero(free_coeff))
out << " + " << free_coeff;
return out;
}
std::ostream& out_of_bounds(std::ostream& out, constraint_index ci) const {
return out << "constraint " << T_to_string(ci) << " is not found" << std::endl;
}
public:
vector<std::pair<mpq, var_index>> m_coeffs;
lar_constraint(const vector<std::pair<mpq, var_index>> & left_side, lconstraint_kind kind, const mpq & right_side)
: lar_base_constraint(kind, right_side), m_coeffs(left_side) {}
constraint_set(column_namer& cn):
m_namer(cn) {}
~constraint_set() {
for (auto* c : m_constraints)
c->~lar_base_constraint();
}
void push() {
m_constraint_count = m_constraints.size();
m_constraint_count.push();
m_region.push_scope();
}
void pop(unsigned k) {
m_constraint_count.pop(k);
for (unsigned i = m_constraints.size(); i-- > m_constraint_count; )
m_constraints[i]->~lar_base_constraint();
m_constraints.shrink(m_constraint_count);
m_region.pop_scope(k);
}
constraint_index add_var_constraint(var_index j, lconstraint_kind k, mpq const& rhs) {
return add(new (m_region) lar_var_constraint(j, k, rhs));
}
constraint_index add_term_constraint(const lar_term* t, lconstraint_kind k, mpq const& rhs) {
return add(new (m_region) lar_term_constraint(t, k, rhs));
}
lar_base_constraint const& operator[](constraint_index ci) const { return *m_constraints[ci]; }
// TBD: would like to make this opaque
// and expose just active constraints
// constraints need not be active.
unsigned size() const { return m_constraints.size(); }
vector<lar_base_constraint*>::const_iterator begin() const { return m_constraints.begin(); }
vector<lar_base_constraint*>::const_iterator end() const { return m_constraints.end(); }
std::ostream& display(std::ostream& out) const {
out << "number of constraints = " << m_constraints.size() << std::endl;
for (auto const* c : *this) {
display(out, *c);
}
return out;
}
std::ostream& display(std::ostream& out, constraint_index ci) const {
return (ci >= m_constraints.size()) ? out_of_bounds(out, ci) : display(out, (*this)[ci]);
}
std::ostream& display(std::ostream& out, lar_base_constraint const& c) const {
print_left_side_of_constraint(c, out);
return out << " " << lconstraint_kind_string(c.m_kind) << " " << c.m_right_side << std::endl;
}
std::ostream& display_indices_only(std::ostream& out, constraint_index ci) const {
return (ci >= m_constraints.size()) ? out_of_bounds(out, ci) : display_indices_only(out, (*this)[ci]);
}
std::ostream& display_indices_only(std::ostream& out, lar_base_constraint const& c) const {
print_left_side_of_constraint_indices_only(c, out);
return out << " " << lconstraint_kind_string(c.m_kind) << " " << c.m_right_side << std::endl;
}
std::ostream& display(std::ostream& out, std::function<std::string (unsigned)> var_str, constraint_index ci) const {
return (ci >= m_constraints.size()) ? out_of_bounds(out, ci) : display(out, var_str, (*this)[ci]);
}
std::ostream& display(std::ostream& out, std::function<std::string (unsigned)>& var_str, lar_base_constraint const& c) const {
print_left_side_of_constraint(c, var_str, out);
return out << " " << lconstraint_kind_string(c.m_kind) << " " << c.m_right_side << std::endl;
}
lar_constraint(const lar_base_constraint & c) {
lp_assert(false); // should not be called : todo!
}
unsigned size() const override {
return static_cast<unsigned>(m_coeffs.size());
}
vector<std::pair<mpq, var_index>> coeffs() const override { return m_coeffs; }
};
inline std::ostream& operator<<(std::ostream& out, constraint_set const& cs) {
return cs.display(out);
}
}