simplified TDiv.searchFactors()

Author: TilmanNeumann

src/main/java/de/tilman_neumann/jml/factor/tdiv/TDiv.java

@@ -102,21 +102,20 @@ public void searchFactors(FactorArguments args, FactorResult result) {
 		int p_i;
 		for (int i=1; (p_i=SMALL_PRIMES.getPrime(i))<=pLimit; i++) {
 			BigInteger p_i_big = BigInteger.valueOf(p_i);
-			BigInteger[] div = N.divideAndRemainder(p_i_big);
-			if (div[1].equals(I_0)) {
-				// p_i divides N at least once
-				do {
-					addToMap(p_i_big, Nexp, primeFactors);
-					N = div[0];
-					div = N.divideAndRemainder(p_i_big);
-				} while (div[1].equals(I_0));
-
-				// At least one division has occurred; check if we are done.
-				// Probably the check could be improved but it wont make much difference because the divisions are much more expensive.
+			BigInteger[] div;
+			int exp = 0;
+			while ((div = N.divideAndRemainder(p_i_big))[1].equals(I_0)) {
+				N = div[0];
+				exp++;
+			}
+			if (exp > 0) {
+				// At least one exact division has occurred; add to results
+				addToMap(p_i_big, exp*Nexp, primeFactors);
 				if (N.bitLength() < 63) {
+					// Check if we are done
 					long p_i_square = p_i *(long)p_i;
 					if (p_i_square > N.longValue()) {
-						//LOG.debug("N=" + N + " < p^2=" + p_i_square);
+						if (DEBUG) LOG.debug("N=" + N + " < p^2=" + p_i_square);
 						// the remaining N is 1 or prime
 						if (N.compareTo(I_1)>0) addToMap(N, Nexp, primeFactors);
 						result.smallestPossibleFactor = p_i; // may be helpful in following factor algorithms