mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-04 06:15:46 +00:00
Code Activity

factor out model-based-opt code

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-04-27 15:08:10 -07:00
parent 68c7d64d00
commit 6aa6102891
5 changed files with 125 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/math/simplex/model_based_opt.h
View file

@ -44,23 +44,32 @@ namespace opt {
unsigned m_id;
rational m_coeff;
var(unsigned id, rational const& c): m_id(id), m_coeff(c) {}
struct compare {
bool operator()(var x, var y) {
return x.m_id < y.m_id;
}
};
};
private:
struct row {
row(): m_type(t_le), m_value(0), m_alive(false) {}
vector<var> m_vars; // variables with coefficients
rational m_coeff; // constant in inequality
ineq_type m_type; // inequality type
rational m_value; // value of m_vars + m_coeff under interpretation of m_var2value.
bool m_alive; // rows can be marked dead if they have been processed.
};
vector<row> m_rows;
unsigned m_objective_id;
vector<unsigned_vector> m_var2row_ids;
vector<rational> m_var2value;
row m_objective;
vector<var> m_new_vars;
bool invariant();
bool invariant(row const& r);
row& objective() { return m_rows[0]; }
bool find_bound(unsigned x, unsigned& bound_index, unsigned_vector& other, bool is_pos);
@ -73,8 +82,12 @@ namespace opt {
void add(unsigned row_id1, unsigned row_id2);
void set_row(row& r, vector<var> const& coeffs, rational const& c, ineq_type rel);
public:
model_based_opt();
// add a fresh variable with value 'value'.
unsigned add_var(rational const& value);