mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-07-03 22:06:11 +00:00
Code Activity

Standardize for-loop increments to prefix form (++i) (#8199)

Browse source 
* Initial plan

* Convert postfix to prefix increment in for loops

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Fix member variable increment conversion bug

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Update API generator to produce prefix increments

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
This commit is contained in:
Copilot 2026-01-14 19:55:31 -08:00 • committed by Nikolaj Bjorner
parent 851b8ea31c
commit 317dd92105
475 changed files with 3237 additions and 3237 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/lp/argument_parser.h
View file

@ -37,7 +37,7 @@ class argument_parser {
public:
std::string m_error_message;
argument_parser(unsigned argn, char * const* args) {
for (unsigned i = 0; i < argn; i++) {
for (unsigned i = 0; i < argn; ++i) {
m_args.push_back(std::string(args[i]));
}
}
@ -61,7 +61,7 @@ public:
bool parse() {
bool status_is_ok = true;
for (unsigned i = 0; i < m_args.size(); i++) {
for (unsigned i = 0; i < m_args.size(); ++i) {
std::string ar = m_args[i];
if (m_options.find(ar) != m_options.end() )
m_used_options.insert(ar);

4
src/test/lp/gomory_test.h
View file

@ -158,7 +158,7 @@ struct gomory_test {
TRACE(gomory_cut_detail, tout << "pol.size() > 1" << std::endl;);
lcm_den = lcm(lcm_den, denominator(k));
TRACE(gomory_cut_detail, tout << "k: " << k << " lcm_den: " << lcm_den << "\n";
for (unsigned i = 0; i < pol.size(); i++) {
for (unsigned i = 0; i < pol.size(); ++i) {
tout << pol[i].first << " " << pol[i].second << "\n";
}
tout << "k: " << k << "\n";);
@ -172,7 +172,7 @@ struct gomory_test {
k *= lcm_den;
}
TRACE(gomory_cut_detail, tout << "after *lcm\n";
for (unsigned i = 0; i < pol.size(); i++) {
for (unsigned i = 0; i < pol.size(); ++i) {
tout << pol[i].first << " * v" << pol[i].second << "\n";
}
tout << "k: " << k << "\n";);

46
src/test/lp/lp.cpp
View file

@ -61,7 +61,7 @@ void test_patching();
bool my_white_space(const char &a) { return a == ' ' || a == '\t'; }
size_t number_of_whites(const std::string &s) {
size_t i = 0;
for (; i < s.size(); i++)
for (; i < s.size(); ++i)
if (!my_white_space(s[i]))
return i;
return i;
@ -144,7 +144,7 @@ void test_nex_order() {
enable_trace("nla_test");
nex_creator r;
r.set_number_of_vars(3);
for (unsigned j = 0; j < r.get_number_of_vars(); j++)
for (unsigned j = 0; j < r.get_number_of_vars(); ++j)
r.set_var_weight(j, 10 - j);
nex_var *a = r.mk_var(0);
nex_var *b = r.mk_var(1);
@ -197,7 +197,7 @@ void test_simplify() {
enable_trace("nla_test");
r.set_number_of_vars(3);
for (unsigned j = 0; j < r.get_number_of_vars(); j++)
for (unsigned j = 0; j < r.get_number_of_vars(); ++j)
r.set_var_weight(j, j);
nex_var *a = r.mk_var(0);
nex_var *b = r.mk_var(1);
@ -277,7 +277,7 @@ void test_cn_shorter() {
// // enable_trace("nla_cn_details_");
// enable_trace("nla_test_details");
// cr.set_number_of_vars(20);
// for (unsigned j = 0; j < cr.get_number_of_vars(); j++)
// for (unsigned j = 0; j < cr.get_number_of_vars(); ++j)
// cr.set_var_weight(j,j);
// nex_var* a = cr.mk_var(0);
@ -320,7 +320,7 @@ void test_cn() {
// // enable_trace("nla_cn");
// // enable_trace("nla_test_details");
// cr.set_number_of_vars(20);
// for (unsigned j = 0; j < cr.get_number_of_vars(); j++)
// for (unsigned j = 0; j < cr.get_number_of_vars(); ++j)
// cr.set_var_weight(j, j);
// nex_var* a = cr.mk_var(0);
@ -389,7 +389,7 @@ void init_basic_part_of_basis_heading(vector<unsigned> &basis,
vector<int> &basis_heading) {
SASSERT(basis_heading.size() >= basis.size());
unsigned m = basis.size();
for (unsigned i = 0; i < m; i++) {
for (unsigned i = 0; i < m; ++i) {
unsigned column = basis[i];
basis_heading[column] = i;
}
@ -643,7 +643,7 @@ char *find_home_dir() {
template <typename T>
void print_chunk(T *arr, unsigned len) {
for (unsigned i = 0; i < len; i++) {
for (unsigned i = 0; i < len; ++i) {
std::cout << arr[i] << ", ";
}
std::cout << std::endl;
@ -1096,20 +1096,20 @@ void test_rationals_no_numeric_pairs() {
stopwatch sw;
vector<mpq> c;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
c.push_back(mpq(my_random() % 100, 1 + my_random() % 100));
vector<mpq> x;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
x.push_back(mpq(my_random() % 100, 1 + my_random() % 100));
unsigned k = 500000;
mpq r = zero_of_type<mpq>();
sw.start();
for (unsigned j = 0; j < k; j++) {
for (unsigned j = 0; j < k; ++j) {
mpq val = zero_of_type<mpq>();
for (unsigned j = 0; j < c.size(); j++) {
for (unsigned j = 0; j < c.size(); ++j) {
val += c[j] * x[j];
}
@ -1126,20 +1126,20 @@ void test_rationals_no_numeric_pairs_plus() {
stopwatch sw;
vector<mpq> c;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
c.push_back(mpq(my_random() % 100, 1 + my_random() % 100));
vector<mpq> x;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
x.push_back(mpq(my_random() % 100, 1 + my_random() % 100));
unsigned k = 500000;
mpq r = zero_of_type<mpq>();
sw.start();
for (unsigned j = 0; j < k; j++) {
for (unsigned j = 0; j < k; ++j) {
mpq val = zero_of_type<mpq>();
for (unsigned j = 0; j < c.size(); j++) {
for (unsigned j = 0; j < c.size(); ++j) {
val = val + c[j] * x[j];
}
@ -1156,11 +1156,11 @@ void test_rationals() {
stopwatch sw;
vector<rational> c;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
c.push_back(rational(my_random() % 100, 1 + my_random() % 100));
vector<numeric_pair<rational>> x;
for (unsigned j = 0; j < 10; j++)
for (unsigned j = 0; j < 10; ++j)
x.push_back(numeric_pair<rational>(
rational(my_random() % 100, 1 + my_random() % 100)));
@ -1171,8 +1171,8 @@ void test_rationals() {
numeric_pair<rational> r = zero_of_type<numeric_pair<rational>>();
sw.start();
for (unsigned j = 0; j < k; j++) {
for (unsigned i = 0; i < c.size(); i++) {
for (unsigned j = 0; j < k; ++j) {
for (unsigned i = 0; i < c.size(); ++i) {
r += c[i] * x[i];
}
}
@ -1427,8 +1427,8 @@ void cutting_the_mix_example_1() {
void fill_general_matrix(general_matrix &M) {
unsigned m = M.row_count();
unsigned n = M.column_count();
for (unsigned i = 0; i < m; i++)
for (unsigned j = 0; j < n; j++)
for (unsigned i = 0; i < m; ++i)
for (unsigned j = 0; j < n; ++j)
M[i][j] = mpq(static_cast<int>(my_random() % 13) - 6);
}
@ -1724,7 +1724,7 @@ void test_hnf() {
test_hnf_5_5();
test_hnf_2_2();
for (unsigned k = 1000; k > 0; k--)
for (int i = 1; i < 8; i++)
for (int i = 1; i < 8; ++i)
test_hnf_for_dim(i);
cutting_the_mix_example_1();
// test_hnf_m_less_than_n();
@ -2009,7 +2009,7 @@ void test_patching() {
// repeat the test 100 times
int range = 40;
for (int i = 0; i < 100; i++) {
for (int i = 0; i < 100; ++i) {
int a1;
int a2 = std::max((int)rand() % range, (int)range / 3);

12
src/test/lp/nla_solver_test.cpp
View file

@ -22,7 +22,7 @@ namespace nla {
svector<lpvar> get_monic(int monic_size, int var_bound, random_gen& rand) {
svector<lpvar> v;
for (int i = 0; i < monic_size; i++) {
for (int i = 0; i < monic_size; ++i) {
lpvar j = rand() % var_bound;
v.push_back(j);
}
@ -48,7 +48,7 @@ void test_monics_on_setup(int n_of_monics ,
var_eqs<emonics> & var_eqs,
emonics& ms, random_gen & rand) {
int i;
for ( i = 0; i < n_of_monics; i++) {
for ( i = 0; i < n_of_monics; ++i) {
int size = min_monic_size + rand() % (max_monic_size - min_monic_size);
ms.add(n_of_vars + i, get_monic(size, n_of_vars, rand));
}
@ -56,7 +56,7 @@ void test_monics_on_setup(int n_of_monics ,
ms.add(n_of_vars + i, ms[n_of_vars + i - 1].vars());
int eqs_left = number_of_eqs;
int add_max_var = 4;
for (int i = 0; i < number_of_pushes; i++) {
for (int i = 0; i < number_of_pushes; ++i) {
ms.push();
if (eqs_left > 0) {
if( i < number_of_pushes - 1) {
@ -620,7 +620,7 @@ void test_order_lemma_params(bool var_equiv, int sign) {
lpvar lp_abef = s.add_named_var(abef, true, "abef");
lpvar lp_cdij = s.add_named_var(cdij, true, "cdij");
for (unsigned j = 0; j < s.number_of_vars(); j++) {
for (unsigned j = 0; j < s.number_of_vars(); ++j) {
s_set_column_value_test(s, j, rational(j + 2));
}
@ -752,7 +752,7 @@ void test_monotone_lemma() {
lpvar lp_cd = s.add_named_var(cd, true, "cd");
lpvar lp_ef = s.add_named_var(ef, true, "ef");
lpvar lp_ij = s.add_named_var(ij, true, "ij");
for (unsigned j = 0; j < s.number_of_vars(); j++) {
for (unsigned j = 0; j < s.number_of_vars(); ++j) {
s_set_column_value_test(s, j, rational((j + 2)*(j + 2)));
}
@ -871,7 +871,7 @@ void test_tangent_lemma_equiv() {
// lpvar lp_j = s.add_named_var(j, true, "j");
lpvar lp_ab = s.add_named_var(ab, true, "ab");
int sign = 1;
for (unsigned j = 0; j < s.number_of_vars(); j++) {
for (unsigned j = 0; j < s.number_of_vars(); ++j) {
sign *= -1;
s_set_column_value_test(s, j, sign * rational((j + 2) * (j + 2)));
}