use new small composites test for Squfof variants

Author: TilmanNeumann

src/test/java/de/tilman_neumann/jml/factor/squfof/SquFoF31PreloadTest.java

@@ -17,13 +17,15 @@
 import static org.junit.Assert.fail;
 
 import java.math.BigInteger;
+import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import de.tilman_neumann.jml.factor.FactorAlgorithm;
+import de.tilman_neumann.jml.factor.FactorTestInfrastructure;
 import de.tilman_neumann.jml.factor.TestNumberNature;
 import de.tilman_neumann.jml.factor.TestsetGenerator;
 import de.tilman_neumann.util.ConfigUtil;
@@ -33,14 +35,18 @@ public class SquFoF31PreloadTest {
 
 	private static final Logger LOG = LogManager.getLogger(SquFoF31PreloadTest.class);
 
-	private static SquFoF31Preload squfof31;
-	private static FactorAlgorithm testFactorizer;
+	private static final SquFoF31Preload squfof = new SquFoF31Preload();
+	private static final FactorAlgorithm verificationFactorizer = FactorAlgorithm.getDefault();
 
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
-		squfof31 = new SquFoF31Preload();
-		testFactorizer = FactorAlgorithm.getDefault();
+	}
+	
+	@Test
+	public void testSmallestComposites() {
+		List<Integer> fails = FactorTestInfrastructure.testSmallComposites(100000, squfof);
+		assertEquals("Failed to factor n = " + fails, 0, fails.size());
 	}
 
 	@Test
@@ -61,9 +67,9 @@ public void testRandomComposites() {
 			for (int i=0; i<count; i++) {
 				BigInteger NBig = testNumbers[i];
 				long N = NBig.longValue();
-				long squfofFactor = squfof31.findSingleFactor(N);
+				long squfofFactor = squfof.findSingleFactor(N);
 				if (squfofFactor < 2) {
-					long correctFactor = testFactorizer.findSingleFactor(NBig).longValue();
+					long correctFactor = verificationFactorizer.findSingleFactor(NBig).longValue();
 					if (correctFactor > 1 && correctFactor<N) {
 						LOG.debug("N=" + N + ": SquFoF31Preload failed to find factor " + correctFactor);
 						failCount++;
@@ -85,7 +91,7 @@ public void testRandomComposites() {
 	private void assertFactorizationSuccess(long N, String expectedPrimeFactorizationStr) {
 		BigInteger NBig = BigInteger.valueOf(N);
 		LOG.info("Test " + N + " (" + NBig.bitLength() + " bit)");
-		SortedMultiset<BigInteger> factors = squfof31.factor(NBig);
+		SortedMultiset<BigInteger> factors = squfof.factor(NBig);
 		LOG.info(N + " = " + factors.toString("*", "^"));
 		assertEquals(expectedPrimeFactorizationStr, factors.toString("*", "^"));
 	}

src/test/java/de/tilman_neumann/jml/factor/squfof/SquFoF31Test.java

@@ -17,13 +17,15 @@
 import static org.junit.Assert.fail;
 
 import java.math.BigInteger;
+import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import de.tilman_neumann.jml.factor.FactorAlgorithm;
+import de.tilman_neumann.jml.factor.FactorTestInfrastructure;
 import de.tilman_neumann.jml.factor.TestNumberNature;
 import de.tilman_neumann.jml.factor.TestsetGenerator;
 import de.tilman_neumann.util.ConfigUtil;
@@ -33,14 +35,18 @@ public class SquFoF31Test {
 
 	private static final Logger LOG = LogManager.getLogger(SquFoF31Test.class);
 
-	private static SquFoF31 squfof31;
-	private static FactorAlgorithm testFactorizer;
+	private static final SquFoF31 squfof = new SquFoF31();
+	private static final FactorAlgorithm verificationFactorizer = FactorAlgorithm.getDefault();
 
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
-		squfof31 = new SquFoF31();
-		testFactorizer = FactorAlgorithm.getDefault();
+	}
+	
+	@Test
+	public void testSmallestComposites() {
+		List<Integer> fails = FactorTestInfrastructure.testSmallComposites(100000, squfof);
+		assertEquals("Failed to factor n = " + fails, 0, fails.size());
 	}
 
 	@Test
@@ -61,9 +67,9 @@ public void testRandomComposites() {
 			for (int i=0; i<count; i++) {
 				BigInteger NBig = testNumbers[i];
 				long N = NBig.longValue();
-				long squfofFactor = squfof31.findSingleFactor(N);
+				long squfofFactor = squfof.findSingleFactor(N);
 				if (squfofFactor < 2) {
-					long correctFactor = testFactorizer.findSingleFactor(NBig).longValue();
+					long correctFactor = verificationFactorizer.findSingleFactor(NBig).longValue();
 					if (correctFactor > 1 && correctFactor<N) {
 						LOG.debug("N=" + N + ": SquFoF31 failed to find factor " + correctFactor);
 						failCount++;
@@ -85,7 +91,7 @@ public void testRandomComposites() {
 	private void assertFactorizationSuccess(long N, String expectedPrimeFactorizationStr) {
 		BigInteger NBig = BigInteger.valueOf(N);
 		LOG.info("Test " + N + " (" + NBig.bitLength() + " bit)");
-		SortedMultiset<BigInteger> factors = squfof31.factor(NBig);
+		SortedMultiset<BigInteger> factors = squfof.factor(NBig);
 		LOG.info(N + " = " + factors.toString("*", "^"));
 		assertEquals(expectedPrimeFactorizationStr, factors.toString("*", "^"));
 	}

src/test/java/de/tilman_neumann/jml/factor/squfof/SquFoF63Test.java

@@ -17,13 +17,15 @@
 import static org.junit.Assert.fail;
 
 import java.math.BigInteger;
+import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import de.tilman_neumann.jml.factor.FactorAlgorithm;
+import de.tilman_neumann.jml.factor.FactorTestInfrastructure;
 import de.tilman_neumann.jml.factor.TestNumberNature;
 import de.tilman_neumann.jml.factor.TestsetGenerator;
 import de.tilman_neumann.util.ConfigUtil;
@@ -35,14 +37,18 @@ public class SquFoF63Test {
 
 	private static final Logger LOG = LogManager.getLogger(SquFoF63Test.class);
 
-	private static SquFoF63 squfof63;
-	private static FactorAlgorithm testFactorizer;
+	private static final SquFoF63 squfof = new SquFoF63();
+	private static final FactorAlgorithm verificationFactorizer = FactorAlgorithm.getDefault();
 
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
-		squfof63 = new SquFoF63();
-		testFactorizer = FactorAlgorithm.getDefault();
+	}
+	
+	@Test
+	public void testSmallestComposites() {
+		List<Integer> fails = FactorTestInfrastructure.testSmallComposites(100000, squfof);
+		assertEquals("Failed to factor n = " + fails, 0, fails.size());
 	}
 
 	@Test
@@ -74,9 +80,9 @@ private void testRange(int minBits, int maxBits, int count) {
 			int failCount = 0;
 			for (int i=0; i<count; i++) {
 				BigInteger N = testNumbers[i];
-				BigInteger squfofFactor = squfof63.findSingleFactor(N);
+				BigInteger squfofFactor = squfof.findSingleFactor(N);
 				if (squfofFactor.compareTo(I_1) <= 0) {
-					BigInteger correctFactor = testFactorizer.findSingleFactor(N);
+					BigInteger correctFactor = verificationFactorizer.findSingleFactor(N);
 					if (correctFactor.compareTo(I_1)>0 && correctFactor.compareTo(N)<0) {
 						LOG.debug("N=" + N + ": SquFoF63 failed to find factor " + correctFactor);
 						failCount++;
@@ -98,7 +104,7 @@ private void testRange(int minBits, int maxBits, int count) {
 	private void assertFactorizationSuccess(long N, String expectedPrimeFactorizationStr) {
 		BigInteger NBig = BigInteger.valueOf(N);
 		LOG.info("Test " + N + " (" + NBig.bitLength() + " bit)");
-		SortedMultiset<BigInteger> factors = squfof63.factor(NBig);
+		SortedMultiset<BigInteger> factors = squfof.factor(NBig);
 		LOG.info(N + " = " + factors.toString("*", "^"));
 		assertEquals(expectedPrimeFactorizationStr, factors.toString("*", "^"));
 	}