small optimizations of prime tests

Author: TilmanNeumann

src/main/java/de/tilman_neumann/jml/primes/probable/BPSWTest.java

@@ -34,9 +34,10 @@ public class NextProbablePrimePerformanceTest {
 	private static final Random RNG = new Random();
 
 	/** Number of test numbers for the performance test. */
-	private static final int NCOUNT = 1000;
+	private static final int NCOUNT = 10000;
 
 	private static final BPSWTest bpsw = new BPSWTest();
+	private static final PrPTest prp = new PrPTest();
 
 	/**
 	 * Performance test.
@@ -64,6 +65,14 @@ private static void testPerformance() {
 			duration = System.currentTimeMillis() - startMillis;
 			addToMap(duration_2_algLists, duration, "BPSW");
 
+			// test PrP
+			startMillis = System.currentTimeMillis();
+			for (BigInteger n : testSet) {
+				prp.nextProbablePrime(n);
+			}
+			duration = System.currentTimeMillis() - startMillis;
+			addToMap(duration_2_algLists, duration, "PrP");
+
 			// test built-in method
 			startMillis = System.currentTimeMillis();
 			for (BigInteger n : testSet) {

src/main/java/de/tilman_neumann/jml/primes/probable/PrPTest.java

@@ -39,16 +39,17 @@ public class NextProbablePrimeTest {
 	private static final int MAX_BITS = 150;
 
 	private static final BPSWTest bpsw = new BPSWTest();
+	private static final PrPTest prp = new PrPTest();
 
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
 	}
 
 	@Test
-	public void testNextProbablePrime() {
+	public void testNextProbablePrimeBPSW() {
 		for (int nBits = 20; nBits<=MAX_BITS; nBits+=10) {
-			LOG.info("Test correctness of " + NCOUNT + " N with " + nBits + " bits:");
+			LOG.info("Test correctness of " + NCOUNT + " N with " + nBits + " bits using BPSW:");
 			int i = 0;
 			while (i < NCOUNT) {
 				BigInteger n = new BigInteger(nBits, RNG);
@@ -63,4 +64,23 @@ public void testNextProbablePrime() {
 			LOG.info("    Tested " + NCOUNT + " next probable primes...");
 		}
 	}
+
+	@Test
+	public void testNextProbablePrimePrP() {
+		for (int nBits = 20; nBits<=MAX_BITS; nBits+=10) {
+			LOG.info("Test correctness of " + NCOUNT + " N with " + nBits + " bits using PrP:");
+			int i = 0;
+			while (i < NCOUNT) {
+				BigInteger n = new BigInteger(nBits, RNG);
+				if (n.equals(I_0)) continue; // exclude 0 from test set
+				
+				BigInteger correctValue = n.nextProbablePrime();
+				BigInteger bpswValue = prp.nextProbablePrime(n);
+				assertEquals(correctValue, bpswValue);
+
+				i++;
+			}
+			LOG.info("    Tested " + NCOUNT + " next probable primes...");
+		}
+	}
 }