nortega/indivisible-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed algorithm problem.

Browse Source
This commit is contained in:
Nicolás A. Ortega 2017-02-02 10:35:43 +01:00
parent a5b68282b3
commit 22278999e7
No known key found for this signature in database
GPG Key ID: 614272579C2070D1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.c
View File

@ -93,7 +93,7 @@ int main(int argc, char *argv[]) {
int exitCode = 0; int exitCode = 0;
if(!omp_get_cancellation()) { if(!omp_get_cancellation() && efile == NULL) {
puts("Warning: the OpenMP cancellation (`OMP_CANCELLATION') environment variable is not enabled."); puts("Warning: the OpenMP cancellation (`OMP_CANCELLATION') environment variable is not enabled.");
char cont = '\0'; char cont = '\0';
while(true) { while(true) {
@ -180,10 +180,19 @@ int main(int argc, char *argv[]) {
mpz_init(numRoot); mpz_init(numRoot);
mpz_add_ui(num, num, 2); mpz_add_ui(num, num, 2);
size_t rootInd = 0;
while(run) { while(run) {
// Calculate the sqrt(num) // Calculate the sqrt(num)
mpz_sqrt(numRoot, num); mpz_sqrt(numRoot, num);
while(mpz_cmp(primes.list[rootInd], numRoot) <= 0) {
if(++rootInd > primes.end) {
fprintf(stderr, "Error: `rootInd' surpassed `primes.end'.\n");
goto releaseMemory;
}
}
bool isPrime = true; bool isPrime = true;
/** /**
* Loop through primes we've found until we get to the sqrt of the * Loop through primes we've found until we get to the sqrt of the
@ -193,10 +202,8 @@ int main(int argc, char *argv[]) {
#pragma omp parallel #pragma omp parallel
{ {
#pragma omp for #pragma omp for
for(size_t i = 1; i < primes.end; ++i) { for(size_t i = 1; i < rootInd; ++i) {
if(mpz_cmp(primes.list[i], numRoot) >= 0) { if(mpz_divisible_p(num, primes.list[i])) {
#pragma omp cancel for
} else if(mpz_divisible_p(num, primes.list[i])) {
#pragma omp atomic write #pragma omp atomic write
isPrime = false; isPrime = false;
#pragma omp cancel for #pragma omp cancel for
@ -209,8 +216,7 @@ int main(int argc, char *argv[]) {
// `num' is a prime so we add it to the list and print it // `num' is a prime so we add it to the list and print it
if(addToList(&primes, num) == 1) { if(addToList(&primes, num) == 1) {
fprintf(stderr, "Failed to allocate more memory for list.\n"); fprintf(stderr, "Failed to allocate more memory for list.\n");
exitCode = 1; goto releaseMemory;
run = false;
} }
if(!f_quiet) { if(!f_quiet) {
if(mpz_out_str(stdout, base, num) == 0) if(mpz_out_str(stdout, base, num) == 0)
@ -222,7 +228,6 @@ int main(int argc, char *argv[]) {
mpz_add_ui(num, num, 2); mpz_add_ui(num, num, 2);
} }
mpz_clear(numRoot);
printf("Found %zu primes.\n", primes.end); printf("Found %zu primes.\n", primes.end);
@ -246,6 +251,7 @@ int main(int argc, char *argv[]) {
releaseMemory: releaseMemory:
puts("Clearing memory..."); puts("Clearing memory...");
// Clear GMP variables // Clear GMP variables
mpz_clear(numRoot);
mpz_clear(num); mpz_clear(num);
// Deinitialize the list // Deinitialize the list
deInitList(&primes); deInitList(&primes);