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

Merge branch 'master' of https://github.com/z3prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-08-13 07:07:34 -07:00
commit 16a948683f
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -91,4 +91,5 @@ examples/**/obj
CMakeSettings.json
# Editor temp files
*.swp
.DS_Store
.DS_Store
dbg/**

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

@ -871,6 +871,7 @@ namespace opt {
unsigned model_based_opt::add_var(rational const& value, bool is_int) {
unsigned v = m_var2value.size();
verbose_stream() << "add var " << v << "\n";
m_var2value.push_back(value);
m_var2is_int.push_back(is_int);
SASSERT(value.is_int() || !is_int);
@ -1208,7 +1209,7 @@ namespace opt {
// compute a_inv
rational a_inv, m_inv;
rational g = gcd(a, m, a_inv, m_inv);
rational g = mod(gcd(a, m, a_inv, m_inv), m);
if (a_inv.is_neg())
a_inv = mod(a_inv, m);
SASSERT(mod(a_inv * a, m) == g);
@ -1252,7 +1253,7 @@ namespace opt {
// add g*z + w - v - k*m = 0, for k = (g*z_value + w_value) div m
rational km = div(g*z_value + w_value, m)*m;
vector<var> mod_coeffs;
mod_coeffs.push_back(var(z, g));
if (g != 0) mod_coeffs.push_back(var(z, g));
mod_coeffs.push_back(var(w, rational::one()));
mod_coeffs.push_back(var(v, rational::minus_one()));
add_constraint(mod_coeffs, km, t_eq);
@ -1270,7 +1271,7 @@ namespace opt {
result = (y_def * m) + z_def * a_inv;
m_var2value[x] = eval(result);
}
TRACE("opt", display(tout << "solve_mod\n"));
return result;
}
@ -1308,11 +1309,14 @@ namespace opt {
replace_var(row_index, x, rational::zero());
rational b_value = m_rows[row_index].m_value;
TRACE("opt", display(tout << "solve_div\n"));
// compute a_inv
rational a_inv, m_inv;
rational g = gcd(a, m, a_inv, m_inv);
rational g = mod(gcd(a, m, a_inv, m_inv), m);
if (a_inv.is_neg())
a_inv = mod(a_inv, m);
SASSERT(mod(a_inv * a, m) == g);
// solve for x_value = m*y_value + a_inv*z_value, 0 <= z_value < m.
@ -1366,7 +1370,7 @@ namespace opt {
// add g*z + (b mod m) < (k + 1)*m
vector<var> bound_coeffs;
bound_coeffs.push_back(var(z, g));
if (g != 0) bound_coeffs.push_back(var(z, g));
bound_coeffs.push_back(var(u, rational::one()));
add_constraint(bound_coeffs, 1 - m * (k + 1), t_le);
@ -1387,6 +1391,7 @@ namespace opt {
result = (y_def * m) + (z_def * a_inv);
m_var2value[x] = eval(result);
}
TRACE("opt", display(tout << "solve_div\n"));
return result;
}
@ -1505,13 +1510,13 @@ namespace opt {
if (coeff.is_zero() || !r.m_alive)
return;
replace_var(row_id, x, rational::zero());
r.m_vars.push_back(var(y, coeff*A));
r.m_vars.push_back(var(z, coeff*B));
if (A != 0) r.m_vars.push_back(var(y, coeff*A));
if (B != 0) r.m_vars.push_back(var(z, coeff*B));
r.m_value += coeff*A*m_var2value[y];
r.m_value += coeff*B*m_var2value[z];
std::sort(r.m_vars.begin(), r.m_vars.end(), var::compare());
m_var2row_ids[y].push_back(row_id);
m_var2row_ids[z].push_back(row_id);
if (A != 0) m_var2row_ids[y].push_back(row_id);
if (B != 0) m_var2row_ids[z].push_back(row_id);
SASSERT(invariant(row_id, r));
}