Merge pull request #1 from basilegithub/cleaning_code

Merged.

Author: basilegithub

.gitignore

@@ -0,0 +1,4 @@
+lib/
+logs/
+build/
+config/

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+    "files.associations": {
+        "numbers": "c",
+        "omp.h": "c",
+        "polynomial_functions.h": "c",
+        "limits": "c",
+        "stdbool.h": "c",
+        "structures.h": "c",
+        "random": "c"
+    }
+}

README.txt

@@ -85,6 +85,4 @@ Here are the next steps:
 
 - I still have to implement one last feature : adding block Lanczos algorithm for the linear algebra.
 
-- I have to continue cleaning up the code.
-
 - Finally, implement the GNFS algorithm in C.

config/config.txt

@@ -1,3 +1,3 @@
-nb_cpu_sieve=28
-flag_batch_smooth=1
-flag_gaussian_elimination=1
+nb_cpu_sieve=2
+flag_batch_smooth=0
+flag_gaussian_elimination=0

include/build_matrix.h

@@ -3,7 +3,7 @@
 
 #include "structures.h"
 
-void build_sparse_matrix(dyn_array_classic* A, dyn_array relations, dyn_array_classic primes, unsigned long *nonzero, double *density, unsigned long *nb_lines, dyn_array_classic* rel_weight);
-void build_dense_matrix(dyn_array relations, dyn_array_classic primes, 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

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 primes, 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

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

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

include/mono_cpu_sieving.h

@@ -9,22 +9,22 @@
 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,
     mpz_t cst2,
     mpz_t tmp_bin,
-    mpf_t nb_large,
     mpf_t target,
     mpf_t ln2,
     mpf_t ln10,
     mpf_t e,
-    mpf_t var1,
-    mpf_t var2,
-    mpf_t var3,
-    mpf_t tmpf2,
+    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,
@@ -42,13 +42,9 @@ 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,
     time_t second1,
     time_t second2
 );

include/parallel_sieving.h

@@ -10,22 +10,22 @@ 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,
     mpz_t cst2,
     mpz_t tmp_bin,
-    mpf_t nb_large,
     mpf_t target,
     mpf_t ln2,
     mpf_t ln10,
     mpf_t e,
-    mpf_t var1,
-    mpf_t var2,
-    mpf_t var3,
-    mpf_t tmpf2,
+    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,
@@ -43,14 +43,10 @@ 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,
+    double nb_large,
     time_t second1,
     time_t second2
 );