neatly organizing parameters in function signatures - part 1

basilegithub · basilegithub · commit 78ddd1f83443 · 2025-10-21T17:58:27.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,9 @@
         "numbers": "c",
         "omp.h": "c",
         "polynomial_functions.h": "c",
-        "limits": "c"
+        "limits": "c",
+        "stdbool.h": "c",
+        "structures.h": "c",
+        "random": "c"
     }
 }
diff --git a/include/build_matrix.h b/include/build_matrix.h
@@ -3,7 +3,7 @@
 
 #include "structures.h"
 
-void build_sparse_matrix(dyn_array_classic* matrix, dyn_array relations, dyn_array_classic factor_base, unsigned long *nonzero_count, double *density, unsigned long *row_count, dyn_array_classic* rel_weight);
-void build_dense_matrix(dyn_array relations, dyn_array_classic factor_base, unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix);
+void build_sparse_matrix(dyn_array relations, dyn_array_classic* matrix, dyn_array_classic* rel_weight, dyn_array_classic factor_base, unsigned long *nonzero_count, unsigned long *row_count, double *density);
+void build_dense_matrix(dyn_array relations, dyn_array_classic factor_base, mpz_t *dense_matrix, unsigned long relations_len, unsigned long base_size);
 
 #endif // BUILD_MATRIX_H
diff --git a/include/compute_sqrt.h b/include/compute_sqrt.h
@@ -6,6 +6,6 @@
 
 #include "structures.h"
 
-void build_sqrt(mpz_t n, unsigned long dim, bool vector[dim], dyn_array_classic factor_base, mpz_t x, mpz_t y, dyn_array relations, dyn_array smooth);
+void build_sqrt(dyn_array relations, dyn_array smooth, dyn_array_classic factor_base, mpz_t n, mpz_t x, mpz_t y, unsigned long dim, bool vector[dim]);
 
 #endif // COMPUTE_SQRT_H
diff --git a/include/gaussian_elimination.h b/include/gaussian_elimination.h
@@ -5,7 +5,7 @@
 
 #include "structures.h"
 
-void gaussian_elimination(unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix, mpz_t *res);
-bool row_is_zero(unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix, size_t row_index);
+void gaussian_elimination(mpz_t *dense_matrix, mpz_t *res, unsigned long relations_len, unsigned long base_size);
+bool row_is_zero(mpz_t *dense_matrix, size_t row_index, unsigned long relations_len, unsigned long base_size);
 
 #endif // GAUSSIAN_ELIMINATION_H
diff --git a/include/generate_primes.h b/include/generate_primes.h
@@ -5,6 +5,6 @@
 
 #include "structures.h"
 
-void smoothB(mpz_t B, dyn_array_classic* primes);
+void erasthotenes_sieve(dyn_array_classic* primes, mpz_t bound);
 
 #endif // GENERATE_PRIMES_H
diff --git a/include/mono_cpu_sieving.h b/include/mono_cpu_sieving.h
@@ -9,8 +9,8 @@
 void mono_cpu_sieve(
     dyn_array* relations,
     dyn_array* smooth_numbers,
-    dyn_array_classic primes,
     dyn_array a,
+    dyn_array_classic primes,
     mpz_t n,
     mpz_t prod_primes,
     mpz_t cst,
@@ -20,6 +20,11 @@ void mono_cpu_sieve(
     mpf_t ln2,
     mpf_t ln10,
     mpf_t e,
+    unsigned long* full_found,
+    unsigned long* partial_found,
+    unsigned long* indexp,
+    unsigned long* bounds,
+    unsigned long* logs,
     unsigned long best_mult,
     unsigned long time_seed,
     unsigned long sieve_len,
@@ -37,11 +42,6 @@ void mono_cpu_sieve(
     unsigned long time_diff,
     unsigned long objective,
     unsigned long seconds,
-    unsigned long* full_found,
-    unsigned long* partial_found,
-    unsigned long* indexp,
-    unsigned long* bounds,
-    unsigned long* logs,
     int* need_append,
     int flag_batch_smooth,
     double nb_large,
diff --git a/include/parallel_sieving.h b/include/parallel_sieving.h
@@ -10,8 +10,8 @@ void parallel_sieve(
     FILE *logfile,
     dyn_array* relations,
     dyn_array* smooth_numbers,
-    dyn_array_classic primes,
     dyn_array a,
+    dyn_array_classic primes,
     mpz_t n,
     mpz_t prod_primes,
     mpz_t cst,
@@ -21,6 +21,11 @@ void parallel_sieve(
     mpf_t ln2,
     mpf_t ln10,
     mpf_t e,
+    unsigned long* full_found,
+    unsigned long* partial_found,
+    unsigned long* indexp,
+    unsigned long* bounds,
+    unsigned long* logs,
     unsigned long best_mult,
     unsigned long time_seed,
     unsigned long sieve_len,
@@ -38,11 +43,6 @@ void parallel_sieve(
     unsigned long time_diff,
     unsigned long objective,
     unsigned long seconds,
-    unsigned long* full_found,
-    unsigned long* partial_found,
-    unsigned long* indexp,
-    unsigned long* bounds,
-    unsigned long* logs,
     int* need_append,
     int nb_cpu_sieve,
     int flag_batch_smooth,
diff --git a/include/polynomial_functions.h b/include/polynomial_functions.h
@@ -5,7 +5,26 @@
 
 #include "structures.h"
 
-void create_polynomial(mpz_t a, dyn_array* sol_needed, dyn_array* second_part, dyn_array_classic* locations, mpz_t n, dyn_array_classic* primes, dyn_array* roots, unsigned long bounds[4], mpf_t target, mpf_t ln2, mpf_t ln10, dyn_array* inverse_a, dyn_array_classic* way_to_root, mpf_t best_bound, dyn_array_classic* tmp_where, mpf_t e, unsigned long mult);
-void CRT(mpz_t res, dyn_array* moduli, mpz_t a, dyn_array* second_part);
+void create_polynomial(
+    dyn_array* sol_needed,
+    dyn_array* second_part,
+    dyn_array* roots,
+    dyn_array* inverse_a,
+    dyn_array_classic* locations,
+    dyn_array_classic* primes,
+    dyn_array_classic* way_to_root,
+    dyn_array_classic* tmp_where,
+    mpz_t a,
+    mpz_t n,
+    mpf_t target,
+    mpf_t ln2,
+    mpf_t ln10,
+    mpf_t best_bound,
+    mpf_t e,
+    unsigned long bounds[4],
+    unsigned long mult
+);
+
+void CRT(dyn_array* moduli, dyn_array* second_part, mpz_t a, mpz_t res);
 
 #endif // POLYNOMIAL_FUNCTIONS_H
diff --git a/include/reduce_matrix.h b/include/reduce_matrix.h
@@ -6,12 +6,44 @@
 #include "structures.h"
 
 void reduce_relations(dyn_array* relations, dyn_array* smooth, dyn_array_classic* primes, mpz_t n);
-void bubble_sort_down(dyn_array_classic weights, dyn_array_classic *sorted, unsigned long tmp3);
-void bubble_sort_up(dyn_array_classic weights, dyn_array_classic *sorted, unsigned long tmp3);
+void bubble_sort_down(dyn_array_classic *sorted, dyn_array_classic weights, unsigned long tmp3);
+void bubble_sort_up(dyn_array_classic *sorted, dyn_array_classic weights, unsigned long tmp3);
 size_t get_index(dyn_array_classic sorted, unsigned long line_index);
 bool delete_empty_row(dyn_array_classic *matrix, dyn_array_classic *weights, dyn_array_classic *sorted, size_t i, unsigned long row_index);
-void delete_singleton(dyn_array *relations, dyn_array *smooth, dyn_array_classic *matrix, dyn_array_classic *weights, dyn_array_classic *rel_weight, dyn_array_classic sorted, size_t i, unsigned long row_index, unsigned long row_delimiter);
-void delete_to_elements_row(dyn_array *relations, dyn_array *smooth, dyn_array_classic *matrix, dyn_array_classic *rel_weight, dyn_array_classic sorted, dyn_array_classic *weights, mpz_t n, size_t i, unsigned long row_index, unsigned long row_delimiter);
-void reduce_matrix(dyn_array_classic* matrix, dyn_array* relations, dyn_array* smooth, unsigned long limit, mpz_t n, dyn_array_classic* rel_weight, unsigned long merge_bound);
+
+void delete_singleton(
+    dyn_array *relations,
+    dyn_array *smooth,
+    dyn_array_classic *matrix,
+    dyn_array_classic *weights,
+    dyn_array_classic *rel_weight,
+    dyn_array_classic sorted,
+    size_t i,
+    unsigned long row_index,
+    unsigned long row_delimiter
+);
+
+void delete_two_elements_row(
+    dyn_array *relations,
+    dyn_array *smooth,
+    dyn_array_classic *matrix,
+    dyn_array_classic *rel_weight,
+    dyn_array_classic *weights,
+    dyn_array_classic sorted,
+    mpz_t n,
+    size_t i,
+    unsigned long row_index,
+    unsigned long row_delimiter
+);
+
+void reduce_matrix(
+    dyn_array* relations,
+    dyn_array* smooth,
+    dyn_array_classic* matrix,
+    dyn_array_classic* rel_weight,
+    mpz_t n,
+    unsigned long row_delimiter,
+    unsigned long merge_bound
+);
 
 #endif // REDUCE_MATRIX_H
diff --git a/include/relations.h b/include/relations.h
@@ -5,31 +5,52 @@
 
 #include "structures.h"
 
-bool DFS(Hashmap_graph graph, mpz_t small_p, mpz_t big_p, dyn_array *path, dyn_array_stack *stack);
-void find_path(Hashmap_graph graph, mpz_t small_p, mpz_t big_p, dyn_array *path, dyn_array_stack *stack);
-void combine_path(Hashmap_PartialRelation *partial_relations, dyn_array path, mpz_t x, mpz_t n, mpz_t res_x, mpz_t res_y, PartialRelation *to_combine_node);
+bool DFS(
+    Hashmap_graph graph,
+    dyn_array_stack *stack,
+    dyn_array *path,
+    mpz_t small_p,
+    mpz_t big_p
+);
 
-void handle_relations(
-    dyn_array* relations,
-    dyn_array* smooth_numbers,
-    PartialRelation *tmp_array,
+void find_path(
+    Hashmap_graph graph,
+    dyn_array_stack *stack,
+    dyn_array *path,
+    mpz_t small_p, mpz_t big_p
+);
+
+void combine_path(
     Hashmap_PartialRelation *partial_relations,
     PartialRelation *to_combine_node,
+    dyn_array path,
+    mpz_t x,
+    mpz_t n,
+    mpz_t res_x,
+    mpz_t res_y
+);
+
+void handle_relations(
+    Hashmap_PartialRelation *partial_relations,
     Hashmap_graph *graph,
     Hashmap_1D *parent,
+    PartialRelation *tmp_array,
+    PartialRelation *to_combine_node,
     dyn_array_stack *stack,
+    dyn_array* relations,
+    dyn_array* smooth_numbers,
     dyn_array block,
     dyn_array coefficient,
     mpz_t n,
     mpz_t value,
     mpz_t tmp_bin,
+    unsigned long* full_found,
+    unsigned long* partial_found,
+    unsigned long* indexp,
     unsigned long k,
     unsigned long tmp_a,
     unsigned long tmp_b,
     unsigned long tmplol,
-    unsigned long* full_found,
-    unsigned long* partial_found,
-    unsigned long* indexp,
     int* need_append
 );
 
diff --git a/include/sieve.h b/include/sieve.h
@@ -5,23 +5,25 @@
 
 #include "structures.h"
 
-void sieve(dyn_array_small* sieve,
-    unsigned long length,
-    unsigned long L,
-    dyn_array_classic* primes,
-    unsigned long * logs,
+void sieve(
+    dyn_array* smooth,
     dyn_array* roots,
+    dyn_array* inverse_a,
+    dyn_array_classic *primes,
+    dyn_array_classic *way_to_root,
+    dyn_array_classic *locations,
+    dyn_array_small *sieve,
     mpz_t n,
     mpz_t poly_a,
     mpz_t poly_b,
     mpz_t poly_c,
-    dyn_array* inverse_a,
-    dyn_array_classic* way_to_root,
-    dyn_array_classic* locations,
-    signed long *tmp_array,
+    unsigned long *logs,
+    unsigned long length,
+    unsigned long L,
     unsigned long skipped,
     unsigned long prime_start,
-    dyn_array* smooth,
-    unsigned long smooth_bound);
+    unsigned long smooth_bound,
+    signed long *tmp_array
+);
 
 #endif // SIEVE_H
diff --git a/src/build_matrix.c b/src/build_matrix.c
@@ -3,7 +3,7 @@
 
 #include "structures.h"
 
-void build_sparse_matrix(dyn_array_classic* matrix, dyn_array relations, dyn_array_classic factor_base, unsigned long *nonzero_count, double *density, unsigned long *row_count, dyn_array_classic* rel_weight)
+void build_sparse_matrix(dyn_array relations, dyn_array_classic* matrix, dyn_array_classic* rel_weight, dyn_array_classic factor_base, unsigned long *nonzero_count, unsigned long *row_count, double *density)
 {
     mpz_t current_prime, tmp_mpz;
     mpz_inits(current_prime, tmp_mpz, NULL);
@@ -55,7 +55,7 @@ void build_sparse_matrix(dyn_array_classic* matrix, dyn_array relations, dyn_arr
     mpz_clears(current_prime, tmp_mpz, NULL);
 }
 
-void build_dense_matrix(dyn_array relations, dyn_array_classic factor_base, unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix)
+void build_dense_matrix(dyn_array relations, dyn_array_classic factor_base, mpz_t *dense_matrix, unsigned long relations_len, unsigned long base_size)
 {
 
     mpz_t accumulator, current_prime, tmp_mpz;
diff --git a/src/compute_sqrt.c b/src/compute_sqrt.c
@@ -4,7 +4,7 @@
 
 #include "structures.h"
 
-void build_sqrt(mpz_t n, unsigned long dim, bool vector[dim], dyn_array_classic factor_base, mpz_t x, mpz_t y, dyn_array relations, dyn_array smooth)
+void build_sqrt(dyn_array relations, dyn_array smooth, dyn_array_classic factor_base, mpz_t n, mpz_t x, mpz_t y, unsigned long dim, bool vector[dim])
 {
     mpz_t tmp_mpz, tmp_mpz_2;
     mpz_inits(tmp_mpz, tmp_mpz_2, NULL);
diff --git a/src/gaussian_elimination.c b/src/gaussian_elimination.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-void gaussian_elimination(unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix, mpz_t *res)
+void gaussian_elimination(mpz_t *dense_matrix, mpz_t *res, unsigned long relations_len, unsigned long base_size)
 {
     mpz_t tmp;
     mpz_init(tmp);
@@ -57,7 +57,7 @@ void gaussian_elimination(unsigned long relations_len, unsigned long base_size,
     mpz_clear(tmp);
 }
 
-bool row_is_zero(unsigned long relations_len, unsigned long base_size, mpz_t *dense_matrix, size_t row_index)
+bool row_is_zero(mpz_t *dense_matrix, size_t row_index, unsigned long relations_len, unsigned long base_size)
 {
     return ((bool) !mpz_cmp_ui(dense_matrix[row_index], 0));
 }
diff --git a/src/generate_primes.c b/src/generate_primes.c
@@ -4,7 +4,7 @@
 #include "structures.h"
 #include "generate_primes.h"
 
-void smoothB(mpz_t bound, dyn_array_classic* primes)
+void erasthotenes_sieve(dyn_array_classic* primes, mpz_t bound)
 {
     mpz_t sqrtB;
     mpz_init(sqrtB);
diff --git a/src/main.c b/src/main.c
diff --git a/src/mono_cpu_sieve.c b/src/mono_cpu_sieve.c
diff --git a/src/parallel_sieving.c b/src/parallel_sieving.c
diff --git a/src/polynomial_functions.c b/src/polynomial_functions.c
diff --git a/src/reduce_matrix.c b/src/reduce_matrix.c
diff --git a/src/relations.c b/src/relations.c
diff --git a/src/sieve.c b/src/sieve.c

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`"numbers": "c",`
`4`	`4`	`"omp.h": "c",`
`5`	`5`	`"polynomial_functions.h": "c",`
`6`		`- "limits": "c"`
	`6`	`+ "limits": "c",`
	`7`	`+ "stdbool.h": "c",`
	`8`	`+ "structures.h": "c",`
	`9`	`+ "random": "c"`
`7`	`10`	`}`
`8`	`11`	`}`