[pgsqlclient-checkins] pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator SequentialSearchPrimeGeneratorBase.cs,1.2,1.3

[Carlos G. Á. <car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1763

Modified Files:
	SequentialSearchPrimeGeneratorBase.cs 
Log Message:
Updated Mono.Security sources to mono Beta 2

Index: SequentialSearchPrimeGeneratorBase.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Math.Prime.Generator/SequentialSearchPrimeGeneratorBase.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SequentialSearchPrimeGeneratorBase.cs	9 May 2004 11:59:35 -0000	1.2
--- SequentialSearchPrimeGeneratorBase.cs	12 Jun 2004 09:28:27 -0000	1.3
***************
*** 69,73 ****
  				// STEP 2.2 Sieve out all numbers divisible by the primes <= DivisionBound
  				//
! 				for (int p = 9; p < SmallPrimes.Length && SmallPrimes [p] <= DivisionBound; p++) {
  					if (curVal % SmallPrimes [p] == 0)
  						goto biNotPrime;
--- 69,73 ----
  				// STEP 2.2 Sieve out all numbers divisible by the primes <= DivisionBound
  				//
! 				for (int p = 10; p < SmallPrimes.Length && SmallPrimes [p] <= DivisionBound; p++) {
  					if (curVal % SmallPrimes [p] == 0)
  						goto biNotPrime;
***************
*** 77,87 ****
  				// STEP 2.3 Is the potential prime acceptable?
  				//
! 				if (!IsPrimeAcceptable (curVal, context)) goto biNotPrime;
  
  				//
  				// STEP 2.4 Filter out all primes that pass this step with a primality test
  				//
! 				if (PrimalityTest (curVal, Confidence)) return curVal;
! 
  
  				//
--- 77,88 ----
  				// STEP 2.3 Is the potential prime acceptable?
  				//
! 				if (!IsPrimeAcceptable (curVal, context))
! 					goto biNotPrime;
  
  				//
  				// STEP 2.4 Filter out all primes that pass this step with a primality test
  				//
! 				if (PrimalityTest (curVal, Confidence))
! 					return curVal;
  
  				//
***************
*** 90,94 ****
  			biNotPrime:
  				pMod1 += 2;
! 				if (pMod1 >= primeProd1) pMod1 -= primeProd1;
  				curVal.Incr2 ();
  			}
--- 91,96 ----
  			biNotPrime:
  				pMod1 += 2;
! 				if (pMod1 >= primeProd1)
! 					pMod1 -= primeProd1;
  				curVal.Incr2 ();
  			}