3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-10 19:27:06 +00:00

Merge pull request #268 from NikolajBjorner/master

Fix for issue #263
This commit is contained in:
Nikolaj Bjorner 2015-10-27 19:26:52 -07:00
commit 1756dd1c13

View file

@ -1451,6 +1451,11 @@ namespace smt {
normalize_gain(min_gain.get_rational(), max_gain);
}
if (is_int(x_i) && !max_gain.is_rational()) {
max_gain = inf_numeral(floor(max_gain));
normalize_gain(min_gain.get_rational(), max_gain);
}
if (!max_inc.is_minus_one()) {
if (is_int(x_i)) {
TRACE("opt",
@ -1597,6 +1602,7 @@ namespace smt {
TRACE("opt", tout << "after traversing row:\nx_i: v" << x_i << ", x_j: v" << x_j << ", gain: " << max_gain << "\n";
tout << "best efforts: " << best_efforts << " has shared: " << has_shared << "\n";);
if (!has_bound && x_i == null_theory_var && x_j == null_theory_var) {
has_shared = false;