cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct the currently unused code path in next_likely_prime.c (tested and now working)

Browse Source
This commit is contained in:
gladman 2009-09-22 09:17:57 +00:00
parent fc7828a2ea
commit ca8c9ec2ef
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mpz/next_likely_prime.c
View File

@ -24,6 +24,8 @@ Boston, MA 02110-1301, USA.
#include "mpir.h" #include "mpir.h"
#include "gmp-impl.h" #include "gmp-impl.h"
#if 1
void mpz_next_likely_prime (mpz_ptr p, mpz_srcptr t,gmp_randstate_t rnd) void mpz_next_likely_prime (mpz_ptr p, mpz_srcptr t,gmp_randstate_t rnd)
{ {
mpz_add_ui (p, t, 1L); mpz_add_ui (p, t, 1L);
@ -31,10 +33,11 @@ void mpz_next_likely_prime (mpz_ptr p, mpz_srcptr t,gmp_randstate_t rnd)
mpz_add_ui (p, p, 1L); mpz_add_ui (p, p, 1L);
} }
#if 0 #else
/* This code is not yet tested. Will be enabled some time. */ /* This code is not yet tested. Will be enabled some time. */
status unsigned short primes[] = static unsigned short primes[] =
{ {
3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97, 3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,
101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181, 101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,
@ -53,11 +56,11 @@ status unsigned short primes[] =
void void
mpz_nextprime (mpz_ptr p, mpz_srcptr n) mpz_nextprime (mpz_ptr p, mpz_srcptr n)
{ {
mpz_t tmp;
unsigned short *moduli; unsigned short *moduli;
unsigned long difference; unsigned long difference;
int i; int i, prime_limit;
int composite; int composite;
TMP_DECL;
/* First handle tiny numbers */ /* First handle tiny numbers */
if (mpz_cmp_ui (n, 2) < 0) if (mpz_cmp_ui (n, 2) < 0)
@ -77,6 +80,7 @@ mpz_nextprime (mpz_ptr p, mpz_srcptr n)
prime_limit = 3; prime_limit = 3;
if (prime_limit) if (prime_limit)
{ {
TMP_MARK;
/* Compute residues modulo small odd primes */ /* Compute residues modulo small odd primes */
moduli = (unsigned short *) TMP_ALLOC (prime_limit * sizeof moduli[0]); moduli = (unsigned short *) TMP_ALLOC (prime_limit * sizeof moduli[0]);
for (i = 0; i < prime_limit; i++) for (i = 0; i < prime_limit; i++)
@ -105,5 +109,7 @@ mpz_nextprime (mpz_ptr p, mpz_srcptr n)
if (mpz_millerrabin (p, 2)) if (mpz_millerrabin (p, 2))
break; break;
} }
TMP_FREE;
} }
#endif #endif