FindAFactor 3.6.3__tar.gz → 3.6.5__tar.gz

{findafactor-3.6.3 → findafactor-3.6.5}/FindAFactor/_find_a_factor.cpp

@@ -759,7 +759,7 @@ struct Factorizer {
       wheelRadius *= p;
       sqrPrimes.push_back(p * p);
       smoothNumberKeys.push_back(p);
-      smoothNumberValues.emplace_back(primes.size(), false);
+      smoothNumberValues.emplace_back(primes.size(), 0);
       smoothNumberValues.back()[i] = true;
     }
   }
@@ -828,29 +828,29 @@ struct Factorizer {
 
   // Compute the prime factorization modulo 2
   boost::dynamic_bitset<size_t> factorizationVector(BigInteger num) {
-    boost::dynamic_bitset<size_t> vec(primes.size(), false);
-    BigInteger factor = 1U;
-    do {
-      factor = gcd(num, wheelRadius);
+    boost::dynamic_bitset<size_t> vec(primes.size(), 0);
+    while (true) {
+      BigInteger factor = gcd(num, wheelRadius);
       if (factor == 1U) {
         break;
       }
       num /= factor;
+      // Remove smooth primes from factor
       for (size_t pi = 0U; pi < primes.size(); ++pi) {
         const BigInteger& p = primes[pi];
-        if (!(factor % p)) {
-          factor /= p;
-          vec[pi] = !vec[pi];
-          if (factor == 1U) {
-            break;
-          }
+        if (factor % p) {
+          continue;
+        }
+        factor /= p;
+        vec[pi] = !vec[pi];
+        if (factor == 1U) {
+          break;
         }
       }
       if (num == 1U) {
-        break;
+        return vec;
       }
-    } while (factor != 1U);
-
+    };
     if (num != 1U) {
       return boost::dynamic_bitset<size_t>();
     }
@@ -879,7 +879,7 @@ struct Factorizer {
 
     // Now that smooth parts have been shuffled, just multiply down the list until they are larger than square root of toFactor.
     BigInteger smoothNumber = 1U;
-    boost::dynamic_bitset<size_t> fv(primes.size(), false);
+    boost::dynamic_bitset<size_t> fv(primes.size(), 0);
     for (size_t spi = 0U; spi < smoothParts.size(); ++spi) {
       const BigInteger &sp = smoothParts[spi];
       // This multiplies together the factorizations of the smooth parts
@@ -897,7 +897,7 @@ struct Factorizer {
       }
       // Reset "smoothNumber" and its factorization vector.
       smoothNumber = 1U;
-      fv = boost::dynamic_bitset<size_t>(primes.size(), false);
+      fv = boost::dynamic_bitset<size_t>(primes.size(), 0);
     }
   }
 

{findafactor-3.6.3 → findafactor-3.6.5}/FindAFactor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FindAFactor
-Version: 3.6.3
+Version: 3.6.5
 Summary: Find any nontrivial factor of a number
 Home-page: https://github.com/vm6502q/FindAFactor
 Author: Dan Strano

{findafactor-3.6.3 → findafactor-3.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FindAFactor
-Version: 3.6.3
+Version: 3.6.5
 Summary: Find any nontrivial factor of a number
 Home-page: https://github.com/vm6502q/FindAFactor
 Author: Dan Strano

{findafactor-3.6.3 → findafactor-3.6.5}/setup.py

@@ -26,7 +26,7 @@ ext_modules = [
 
 setup(
     name='FindAFactor',
-    version='3.6.3',
+    version='3.6.5',
     author='Dan Strano',
     author_email='dan@unitary.fund',
     description='Find any nontrivial factor of a number',