mirror of
https://github.com/Z3Prover/z3
synced 2026-07-04 22:36:10 +00:00
6ac3075022
This is another PR towards the goal of getting Z3 to compile cleanly when included via FetchContents into clang-tidy, which uses a pretty strict set of warnings. This is a second version of https://github.com/Z3Prover/z3/pull/9957. I address @NikolajBjorner 's comments about not changing the semicolons after macro invocations, because some editors work better with them present. It now, to the best of my ability, only deletes semis: * after the closing brace of namespace decl. * after the closing brace of an extern "C" decl. * after a function definition. This PR is very large, but it consists entirely of deletions of semicolons in these situations. (If there was a way to update the previous PR, which had been closed, and that is preferable, please let me know. I couldn't figure it out.)
77 lines
2.4 KiB
C++
77 lines
2.4 KiB
C++
/*++
|
|
Copyright (c) 2014 Microsoft Corporation
|
|
|
|
Module Name:
|
|
|
|
simplex.h
|
|
|
|
Abstract:
|
|
|
|
Multi-precision simplex tableau.
|
|
|
|
Author:
|
|
|
|
Nikolaj Bjorner (nbjorner) 2014-01-15
|
|
|
|
Notes:
|
|
|
|
--*/
|
|
|
|
#include "math/simplex/simplex.h"
|
|
#include "math/simplex/sparse_matrix_ops.h"
|
|
#include "math/simplex/sparse_matrix_def.h"
|
|
#include "math/simplex/simplex_def.h"
|
|
#include "util/rational.h"
|
|
#include "util/inf_rational.h"
|
|
|
|
namespace simplex {
|
|
template class simplex<mpz_ext>;
|
|
template class simplex<mpq_ext>;
|
|
|
|
static void refine_delta(rational& delta, inf_rational const& l, inf_rational const& u) {
|
|
if (l.get_rational() < u.get_rational() && l.get_infinitesimal() > u.get_infinitesimal()) {
|
|
rational new_delta = (u.get_rational() - l.get_rational()) / (l.get_infinitesimal() - u.get_infinitesimal());
|
|
if (new_delta < delta) {
|
|
delta = new_delta;
|
|
}
|
|
}
|
|
}
|
|
|
|
void kernel(sparse_matrix<mpq_ext>& M, vector<vector<rational>>& K) {
|
|
sparse_matrix_ops::kernel(M, K);
|
|
}
|
|
|
|
void kernel_ffe(sparse_matrix<mpq_ext> &M, vector<vector<rational>> &K) {
|
|
sparse_matrix_ops::kernel_ffe(M, K);
|
|
}
|
|
|
|
void ensure_rational_solution(simplex<mpq_ext>& S) {
|
|
rational delta(1);
|
|
for (unsigned i = 0; i < S.get_num_vars(); ++i) {
|
|
auto const& _value = S.get_value(i);
|
|
inf_rational value(rational(_value.first), rational(_value.second));
|
|
if (S.lower_valid(i)) {
|
|
auto const& _bound = S.get_lower(i);
|
|
inf_rational bound(rational(_bound.first), rational(_bound.second));
|
|
refine_delta(delta, bound, value);
|
|
}
|
|
if (S.upper_valid(i)) {
|
|
auto const& _bound = S.get_upper(i);
|
|
inf_rational bound(rational(_bound.first), rational(_bound.second));
|
|
refine_delta(delta, value, bound);
|
|
}
|
|
}
|
|
unsynch_mpq_inf_manager inf_mgr;
|
|
scoped_mpq_inf q(inf_mgr);
|
|
for (unsigned i = 0; i < S.get_num_vars(); ++i) {
|
|
auto const& _value = S.get_value(i);
|
|
rational inf(_value.second);
|
|
if (!inf.is_zero()) {
|
|
rational fin = rational(_value.first) + inf * delta;
|
|
inf = 0;
|
|
inf_mgr.set(q, fin.to_mpq(), inf.to_mpq());
|
|
S.set_value(i, q);
|
|
}
|
|
}
|
|
}
|
|
}
|