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

fix model generation in opt

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-04-30 12:23:46 -07:00
parent 4b940bde11
commit 22507281cf
2 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/math/simplex/model_based_opt.cpp
View file

@ -142,49 +142,61 @@ namespace opt {
for (unsigned i = bound_trail.size(); i > 0; ) { for (unsigned i = bound_trail.size(); i > 0; ) {
--i; --i;
unsigned x = bound_vars[i]; unsigned x = bound_vars[i];
row const& r = m_rows[bound_trail[i]]; row& r = m_rows[bound_trail[i]];
rational val = r.m_coeff; rational val = r.m_coeff;
rational x_val;
rational x_coeff; rational x_coeff;
vector<var> const& vars = r.m_vars; vector<var> const& vars = r.m_vars;
for (unsigned j = 0; j < vars.size(); ++j) { for (unsigned j = 0; j < vars.size(); ++j) {
var const& v = vars[j]; var const& v = vars[j];
if (x = v.m_id) { if (x == v.m_id) {
x_coeff = v.m_coeff; x_coeff = v.m_coeff;
} }
else { else {
val += m_var2value[v.m_id]*v.m_coeff; val += m_var2value[v.m_id]*v.m_coeff;
} }
} }
TRACE("opt", display(tout << "v" << x << " val: " << val
<< " coeff_x: " << x_coeff << " val_x: " << m_var2value[x] << " ", r); );
SASSERT(!x_coeff.is_zero()); SASSERT(!x_coeff.is_zero());
val /= -x_coeff; x_val = -val/x_coeff;
// Adjust epsilon to be s
if (!val.is_zero() && (eps.is_zero() || eps > abs(val))) {
eps = abs(val)/rational(2);
}
if (!r.m_value.is_zero() && (eps.is_zero() || eps > abs(r.m_value))) {
eps = abs(r.m_value)/rational(2);
}
// //
// //
// ax + t < 0 // ax + t < 0
// <=> x < -t/a // <=> x < -t/a
// <=> x := -t/a - epsilon // <=> x := -t/a - epsilon
// //
if (x_coeff.is_pos() && r.m_type == t_lt) { if (r.m_type == t_lt) {
val -= eps; // Adjust epsilon to be
if (!x_val.is_zero() && (eps.is_zero() || eps >= abs(x_val))) {
eps = abs(x_val)/rational(2);
}
if (!r.m_value.is_zero() && (eps.is_zero() || eps >= abs(r.m_value))) {
eps = abs(r.m_value)/rational(2);
}
SASSERT(!eps.is_zero());
if (x_coeff.is_pos()) {
x_val -= eps;
}
//
// -ax + t < 0
// <=> -ax < -t
// <=> -x < -t/a
// <=> x > t/a
// <=> x := t/a + epsilon
//
else if (x_coeff.is_neg()) {
x_val += eps;
}
} }
// m_var2value[x] = x_val;
// -ax + t < 0 r.m_value = (x_val * x_coeff) + val;
// <=> -ax < -t
// <=> -x < -t/a TRACE("opt", display(tout << "v" << x << " val: " << val << " coeff_x: "
// <=> x > t/a << x_coeff << " val_x: " << m_var2value[x] << " ", r); );
// <=> x := t/a + epsilon SASSERT(invariant(bound_trail[i], r));
// }
else if (x_coeff.is_neg() && r.m_type == t_lt) {
val += eps;
}
m_var2value[x] = val;
}
} }
bool model_based_opt::find_bound(unsigned x, unsigned& bound_row_index, rational& bound_coeff, unsigned_vector& other, bool is_pos) { bool model_based_opt::find_bound(unsigned x, unsigned& bound_row_index, rational& bound_coeff, unsigned_vector& other, bool is_pos) {

8
src/test/model_based_opt.cpp
View file

@ -36,6 +36,10 @@ static void test1() {
opt::inf_eps value = mbo.maximize(); opt::inf_eps value = mbo.maximize();
std::cout << value << "\n"; std::cout << value << "\n";
std::cout << "x: " << mbo.get_value(x) << "\n";
std::cout << "y: " << mbo.get_value(y) << "\n";
std::cout << "z: " << mbo.get_value(z) << "\n";
std::cout << "u: " << mbo.get_value(u) << "\n";
} }
// test with lower bounds // test with lower bounds
@ -105,6 +109,10 @@ static void test4() {
opt::inf_eps value = mbo.maximize(); opt::inf_eps value = mbo.maximize();
std::cout << value << "\n"; std::cout << value << "\n";
std::cout << "x: " << mbo.get_value(x) << "\n";
std::cout << "y: " << mbo.get_value(y) << "\n";
std::cout << "z: " << mbo.get_value(z) << "\n";
std::cout << "u: " << mbo.get_value(u) << "\n";
} }
// test with mix of upper and lower bounds // test with mix of upper and lower bounds