This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit d803bf596a20bc45e1943e269497e23cd3b47c76 Author: aherbert <[email protected]> AuthorDate: Fri Nov 8 17:52:26 2019 +0000 Fixed checkstyle in primes. --- .../org/apache/commons/numbers/primes/Primes.java | 7 +- .../apache/commons/numbers/primes/SmallPrimes.java | 63 +++++++------- .../apache/commons/numbers/primes/PrimesTest.java | 96 ++++++++++++---------- .../commons/numbers/primes/SmallPrimesTest.java | 34 ++++---- 4 files changed, 106 insertions(+), 94 deletions(-) diff --git a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/Primes.java b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/Primes.java index 320b411..a971372 100644 --- a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/Primes.java +++ b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/Primes.java @@ -19,16 +19,15 @@ package org.apache.commons.numbers.primes; import java.text.MessageFormat; import java.util.List; - /** - * Methods related to prime numbers in the range of <code>int</code>: + * Methods related to prime numbers in the range of <code>int</code>. * <ul> * <li>primality test</li> * <li>prime number generation</li> * <li>factorization</li> * </ul> */ -public class Primes { +public final class Primes { /** Exception message format when an argument is too small. */ static final String NUMBER_TOO_SMALL = "{0} is smaller than the minimum ({1})"; @@ -105,7 +104,7 @@ public class Primes { } /** - * Prime factors decomposition + * Prime factors decomposition. * * @param n Number to factorize: must be ≥ 2. * @return the list of prime factors of {@code n}. diff --git a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java index badc11c..4097f32 100644 --- a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java +++ b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java @@ -29,7 +29,7 @@ import java.util.Set; /** * Utility methods to work on primes within the <code>int</code> range. */ -class SmallPrimes { +final class SmallPrimes { /** * The first 512 prime numbers. * <p> @@ -37,33 +37,34 @@ class SmallPrimes { * As a result, <code>int</code> numbers which are not reduced by those primes are guaranteed * to be either prime or semi prime. */ - static final int[] PRIMES = {2, - 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, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, - 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, - 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, - 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, - 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, - 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, - 953, 967, 971, 977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069, 1087, - 1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, 1229, - 1231, 1237, 1249, 1259, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, 1327, 1361, 1367, 1373, 1381, - 1399, 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, 1523, - 1531, 1543, 1549, 1553, 1559, 1567, 1571, 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, 1621, 1627, 1637, 1657, 1663, - 1667, 1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, 1823, - 1831, 1847, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, 1951, 1973, 1979, 1987, 1993, - 1997, 1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, 2131, - 2137, 2141, 2143, 2153, 2161, 2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, 2269, 2273, 2281, 2287, 2293, - 2297, 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, 2437, - 2441, 2447, 2459, 2467, 2473, 2477, 2503, 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, 2591, 2593, 2609, 2617, 2621, - 2633, 2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, 2749, - 2753, 2767, 2777, 2789, 2791, 2797, 2801, 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, 2879, 2887, 2897, 2903, 2909, - 2917, 2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, 3083, - 3089, 3109, 3119, 3121, 3137, 3163, 3167, 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, 3229, 3251, 3253, 3257, 3259, - 3271, 3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, 3433, - 3449, 3457, 3461, 3463, 3467, 3469, 3491, 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, 3547, 3557, 3559, 3571, 3581, - 3583, 3593, 3607, 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671}; + static final int[] PRIMES = { + 2, 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, 191, 193, 197, 199, 211, 223, 227, 229, + 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, + 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, + 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, + 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, + 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, + 947, 953, 967, 971, 977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069, + 1087, 1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, + 1217, 1223, 1229, 1231, 1237, 1249, 1259, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, + 1327, 1361, 1367, 1373, 1381, 1399, 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, 1471, 1481, + 1483, 1487, 1489, 1493, 1499, 1511, 1523, 1531, 1543, 1549, 1553, 1559, 1567, 1571, 1579, 1583, 1597, 1601, + 1607, 1609, 1613, 1619, 1621, 1627, 1637, 1657, 1663, 1667, 1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733, + 1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, 1823, 1831, 1847, 1861, 1867, 1871, 1873, 1877, + 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, 1951, 1973, 1979, 1987, 1993, 1997, 1999, 2003, 2011, 2017, + 2027, 2029, 2039, 2053, 2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, 2131, 2137, 2141, 2143, + 2153, 2161, 2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, 2269, 2273, 2281, 2287, 2293, 2297, + 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, + 2437, 2441, 2447, 2459, 2467, 2473, 2477, 2503, 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, 2591, 2593, + 2609, 2617, 2621, 2633, 2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, 2699, 2707, 2711, 2713, + 2719, 2729, 2731, 2741, 2749, 2753, 2767, 2777, 2789, 2791, 2797, 2801, 2803, 2819, 2833, 2837, 2843, 2851, + 2857, 2861, 2879, 2887, 2897, 2903, 2909, 2917, 2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, + 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, 3083, 3089, 3109, 3119, 3121, 3137, 3163, 3167, 3169, 3181, + 3187, 3191, 3203, 3209, 3217, 3221, 3229, 3251, 3253, 3257, 3259, 3271, 3299, 3301, 3307, 3313, 3319, 3323, + 3329, 3331, 3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, 3433, 3449, 3457, 3461, 3463, 3467, + 3469, 3491, 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, 3547, 3557, 3559, 3571, 3581, 3583, 3593, 3607, + 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671}; /** The last number in {@link #PRIMES}. */ static final int PRIMES_LAST = PRIMES[PRIMES.length - 1]; @@ -179,7 +180,8 @@ class SmallPrimes { as prime factors, and c is an integer undivisible by all of those prime numbers; in other words, skipping multiples of these primes */ - int m = PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue()[PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue().length - 1] + 1; + int m = PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue() + [PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue().length - 1] + 1; int km = m * (minFactor / m); int currentEquivalenceClassIndex = Arrays.binarySearch( PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue(), @@ -202,7 +204,8 @@ class SmallPrimes { factors.add(f); done = true; } else { - if (currentEquivalenceClassIndex == PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue().length - 1) { + if (currentEquivalenceClassIndex == + PRIME_NUMBERS_AND_COPRIME_EQUIVALENCE_CLASSES.getValue().length - 1) { km += m; currentEquivalenceClassIndex = 0; } else { diff --git a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/PrimesTest.java b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/PrimesTest.java index 0ca314a..9667a16 100644 --- a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/PrimesTest.java +++ b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/PrimesTest.java @@ -26,36 +26,45 @@ import org.junit.jupiter.api.Test; public class PrimesTest { - public static final int[] PRIMES = {//primes here have been verified one by one using Dario Alejandro Alpern's tool, see http://www.alpertron.com.ar/ECM.HTM - 2,3,5,7,11,13,17,19,23,29,31,43,47,53,71,73,79,89,97, - 107,137,151,157,271,293,331,409,607,617,683,829, - 1049,1103,1229,1657, - 2039,2053,//around first boundary in miller-rabin - 2251,2389,2473,2699,3271,3389,3449,5653,6449,6869,9067,9091, - 11251,12433,12959,22961,41047,46337,65413,80803,91577,92693, - 118423,656519,795659, - 1373639,1373677,//around second boundary in miller-rabin - 588977,952381, - 1013041,1205999,2814001, - 22605091, - 25325981,25326023,//around third boundary in miller-rabin - 100000007,715827881, - 2147483647//Integer.MAX_VALUE - }; - - public static final int[] NOT_PRIMES = {//composite chosen at random + particular values used in algorithms such as boundaries for millerRabin - 4,6,8,9,10,12,14,15,16,18,20,21,22,24,25, - 275, - 2037,2041,2045,2046,2047,2048,2049,2051,2055,//around first boundary in miller-rabin - 9095, - 463465, - 1373637,1373641,1373651,1373652,1373653,1373654,1373655,1373673,1373675,1373679,//around second boundary in miller-rabin - 25325979,25325983,25325993,25325997,25325999,25326001,25326003,25326007,25326009,25326011,25326021,25326025,//around third boundary in miller-rabin - 100000005, - 1073741341,1073741823,2147473649,2147483641,2147483643,2147483645,2147483646}; - - public static final int[] BELOW_2 = { - Integer.MIN_VALUE,-1,0,1}; + static final int[] PRIMES = { + //primes here have been verified one by one using Dario Alejandro Alpern's tool. + //see http://www.alpertron.com.ar/ECM.HTM + 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 43, 47, 53, 71, 73, 79, 89, 97, + 107, 137, 151, 157, 271, 293, 331, 409, 607, 617, 683, 829, + 1049, 1103, 1229, 1657, + 2039, 2053, //around first boundary in miller-rabin + 2251, 2389, 2473, 2699, 3271, 3389, 3449, 5653, 6449, 6869, 9067, 9091, + 11251, 12433, 12959, 22961, 41047, 46337, 65413, 80803, 91577, 92693, + 118423, 656519, 795659, + 1373639, 1373677, //around second boundary in miller-rabin + 588977, 952381, + 1013041, 1205999, 2814001, + 22605091, + 25325981, 25326023, //around third boundary in miller-rabin + 100000007, 715827881, + 2147483647//Integer.MAX_VALUE + }; + + static final int[] NOT_PRIMES = { + //composite chosen at random + particular values used in algorithms such as boundaries for millerRabin + 4, 6, 8, 9, 10, 12, 14, 15, 16, 18, 20, 21, 22, 24, 25, + 275, + 2037, 2041, 2045, 2046, 2047, 2048, 2049, 2051, 2055, //around first boundary in miller-rabin + 9095, + 463465, + 1373637, 1373641, 1373651, 1373652, 1373653, 1373654, 1373655, 1373673, 1373675, 1373679, //around second boundary in miller-rabin + 25325979, 25325983, 25325993, 25325997, 25325999, 25326001, 25326003, 25326007, 25326009, 25326011, 25326021, 25326025, //around third boundary in miller-rabin + 100000005, + 1073741341, 1073741823, 2147473649, 2147483641, 2147483643, 2147483645, 2147483646}; + + static final int[] BELOW_2 = {Integer.MIN_VALUE, -1, 0, 1}; + + static final HashSet<Integer> PRIMES_SET = new HashSet<>(); + static { + for (int p : PRIMES) { + PRIMES_SET.add(p); + } + } void assertPrimeFactorsException(int n, String expected) { try { @@ -65,11 +74,12 @@ public class PrimesTest { Assertions.assertEquals(expected, e.getMessage()); } } - void assertNextPrimeException(int n, String expected){ + + void assertNextPrimeException(int n, String expected) { try { Primes.nextPrime(n); Assertions.fail("Exception not thrown"); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { Assertions.assertEquals(expected, e.getMessage()); } } @@ -86,7 +96,7 @@ public class PrimesTest { for (int i = 0; i < SmallPrimes.PRIMES.length - 1; i++) { for (int j = SmallPrimes.PRIMES[i] + 1; j <= SmallPrimes.PRIMES[i + 1]; j++) { - Assertions.assertEquals(SmallPrimes.PRIMES[i+1], Primes.nextPrime(j)); + Assertions.assertEquals(SmallPrimes.PRIMES[i + 1], Primes.nextPrime(j)); } } @@ -99,9 +109,9 @@ public class PrimesTest { Assertions.assertEquals(Integer.MAX_VALUE, Primes.nextPrime(Integer.MAX_VALUE - 1)); Assertions.assertEquals(Integer.MAX_VALUE, Primes.nextPrime(Integer.MAX_VALUE)); - assertNextPrimeException(Integer.MIN_VALUE, MessageFormat.format(Primes.NUMBER_TOO_SMALL,Integer.MIN_VALUE,0)); - assertNextPrimeException(-1, MessageFormat.format(Primes.NUMBER_TOO_SMALL,-1,0)); - assertNextPrimeException(-13, MessageFormat.format(Primes.NUMBER_TOO_SMALL,-13,0)); + assertNextPrimeException(Integer.MIN_VALUE, MessageFormat.format(Primes.NUMBER_TOO_SMALL, Integer.MIN_VALUE, 0)); + assertNextPrimeException(-1, MessageFormat.format(Primes.NUMBER_TOO_SMALL, -1, 0)); + assertNextPrimeException(-13, MessageFormat.format(Primes.NUMBER_TOO_SMALL, -13, 0)); } @Test @@ -117,13 +127,14 @@ public class PrimesTest { } } - static int sum(List<Integer> numbers){ + static int sum(List<Integer> numbers) { int out = 0; for (int i:numbers) { out += i; } return out; } + static int product(List<Integer> numbers) { int out = 1; for (int i : numbers) { @@ -131,13 +142,8 @@ public class PrimesTest { } return out; } - static final HashSet<Integer> PRIMES_SET = new HashSet<Integer>(); - static { - for (int p : PRIMES) { - PRIMES_SET.add(p); - } - } - static void checkPrimeFactors(List<Integer> factors){ + + static void checkPrimeFactors(List<Integer> factors) { for (int p : factors) { if (!PRIMES_SET.contains(p)) { Assertions.fail("Not found in primes list: " + p); @@ -148,7 +154,7 @@ public class PrimesTest { @Test public void testPrimeFactors() throws Exception { for (int i : BELOW_2) { - assertPrimeFactorsException(i, MessageFormat.format(Primes.NUMBER_TOO_SMALL,i,2)); + assertPrimeFactorsException(i, MessageFormat.format(Primes.NUMBER_TOO_SMALL, i, 2)); } for (int i : NOT_PRIMES) { List<Integer> factors = Primes.primeFactors(i); diff --git a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java index 06023c5..19263d5 100644 --- a/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java +++ b/commons-numbers-primes/src/test/java/org/apache/commons/numbers/primes/SmallPrimesTest.java @@ -26,13 +26,15 @@ import org.junit.jupiter.api.Test; public class SmallPrimesTest { + // CHECKSTYLE: stop MethodName + // Primes larger than the small PRIMES array in SmallPrimes private static final int[] LARGE_PRIME = {3673, 3677}; @Test public void smallTrialDivision_smallComposite() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.smallTrialDivision(3*7*23, factors); + final int result = SmallPrimes.smallTrialDivision(3 * 7 * 23, factors); Assertions.assertEquals(1, result); Assertions.assertEquals(Arrays.asList(3, 7, 23), factors); } @@ -40,7 +42,7 @@ public class SmallPrimesTest { @Test public void smallTrialDivision_repeatedFactors() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.smallTrialDivision(2*2*3*3*3, factors); + final int result = SmallPrimes.smallTrialDivision(2 * 2 * 3 * 3 * 3, factors); Assertions.assertEquals(1, result); Assertions.assertEquals(Arrays.asList(2, 2, 3, 3, 3), factors); } @@ -56,8 +58,8 @@ public class SmallPrimesTest { @Test public void smallTrialDivision_BoundaryPrimes() { final List<Integer> factors = new ArrayList<Integer>(); - final int penultimatePrime = SmallPrimes.PRIMES[SmallPrimes.PRIMES.length-2]; - final int result = SmallPrimes.smallTrialDivision(penultimatePrime*SmallPrimes.PRIMES_LAST, factors); + final int penultimatePrime = SmallPrimes.PRIMES[SmallPrimes.PRIMES.length - 2]; + final int result = SmallPrimes.smallTrialDivision(penultimatePrime * SmallPrimes.PRIMES_LAST, factors); Assertions.assertEquals(1, result); Assertions.assertEquals(Arrays.asList(penultimatePrime, SmallPrimes.PRIMES_LAST), factors); } @@ -65,7 +67,7 @@ public class SmallPrimesTest { @Test public void smallTrialDivision_largeComposite() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.smallTrialDivision(2*5*LARGE_PRIME[0], factors); + final int result = SmallPrimes.smallTrialDivision(2 * 5 * LARGE_PRIME[0], factors); Assertions.assertEquals(LARGE_PRIME[0], result); Assertions.assertEquals(Arrays.asList(2, 5), factors); } @@ -73,15 +75,16 @@ public class SmallPrimesTest { @Test public void smallTrialDivision_noSmallPrimeFactors() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.smallTrialDivision(LARGE_PRIME[0]*LARGE_PRIME[1], factors); - Assertions.assertEquals(LARGE_PRIME[0]*LARGE_PRIME[1], result); + final int result = SmallPrimes.smallTrialDivision(LARGE_PRIME[0] * LARGE_PRIME[1], factors); + Assertions.assertEquals(LARGE_PRIME[0] * LARGE_PRIME[1], result); Assertions.assertEquals(Collections.<Integer>emptyList(), factors); } - + @Test public void boundedTrialDivision_twoDifferentFactors() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0]*LARGE_PRIME[1], Integer.MAX_VALUE, factors); + final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0] * LARGE_PRIME[1], Integer.MAX_VALUE, + factors); Assertions.assertEquals(LARGE_PRIME[1], result); Assertions.assertEquals(Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[1]), factors); } @@ -89,20 +92,21 @@ public class SmallPrimesTest { @Test public void boundedTrialDivision_square() { final List<Integer> factors = new ArrayList<Integer>(); - final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0]*LARGE_PRIME[0], Integer.MAX_VALUE, factors); + final int result = SmallPrimes.boundedTrialDivision(LARGE_PRIME[0] * LARGE_PRIME[0], Integer.MAX_VALUE, + factors); Assertions.assertEquals(LARGE_PRIME[0], result); Assertions.assertEquals(Arrays.asList(LARGE_PRIME[0], LARGE_PRIME[0]), factors); } @Test public void trialDivision_smallComposite() { - final List<Integer> factors = SmallPrimes.trialDivision(5*11*29*103); + final List<Integer> factors = SmallPrimes.trialDivision(5 * 11 * 29 * 103); Assertions.assertEquals(Arrays.asList(5, 11, 29, 103), factors); } @Test public void trialDivision_repeatedFactors() { - final List<Integer> factors = SmallPrimes.trialDivision(2*2*2*2*5*5); + final List<Integer> factors = SmallPrimes.trialDivision(2 * 2 * 2 * 2 * 5 * 5); Assertions.assertEquals(Arrays.asList(2, 2, 2, 2, 5, 5), factors); } @@ -114,13 +118,13 @@ public class SmallPrimesTest { @Test public void trialDivision_largeComposite() { - final List<Integer> factors = SmallPrimes.trialDivision(2*3*LARGE_PRIME[0]); + final List<Integer> factors = SmallPrimes.trialDivision(2 * 3 * LARGE_PRIME[0]); Assertions.assertEquals(Arrays.asList(2, 3, LARGE_PRIME[0]), factors); } @Test public void trialDivision_veryLargeComposite() { - final List<Integer> factors = SmallPrimes.trialDivision(2*LARGE_PRIME[0]*LARGE_PRIME[1]); + final List<Integer> factors = SmallPrimes.trialDivision(2 * LARGE_PRIME[0] * LARGE_PRIME[1]); Assertions.assertEquals(Arrays.asList(2, LARGE_PRIME[0], LARGE_PRIME[1]), factors); } @@ -136,7 +140,7 @@ public class SmallPrimesTest { @Test public void millerRabinPrimeTest_composites() { for (final int n : PrimesTest.NOT_PRIMES) { - if (n %2 == 1) { + if (n % 2 == 1) { Assertions.assertFalse(SmallPrimes.millerRabinPrimeTest(n)); } }
