FindAFactor 3.6.1__tar.gz → 3.6.2__tar.gz

{findafactor-3.6.1 → findafactor-3.6.2}/FindAFactor/_find_a_factor.cpp

@@ -738,6 +738,7 @@ struct Factorizer {
   BigInteger batchNumber;
   BigInteger batchOffset;
   BigInteger batchTotal;
+  BigInteger wheelRadius;
   size_t wheelEntryCount;
   size_t smoothPartsLimit;
   size_t rowOffset;
@@ -751,10 +752,11 @@ struct Factorizer {
   Factorizer(const BigInteger &tfsqr, const BigInteger &tf, const BigInteger &tfsqrt, const BigInteger &range, size_t nodeCount, size_t nodeId, size_t w, size_t spl,
              const std::vector<BigInteger> &p, ForwardFn fn)
     : rng({}), gen(rng()), dis(0U, p.size() - 1U), toFactorSqr(tfsqr), toFactor(tf), toFactorSqrt(tfsqrt), batchRange(range), batchNumber(0U), batchOffset(nodeId * range), batchTotal(nodeCount * range),
-    wheelEntryCount(w), smoothPartsLimit(spl), rowOffset(p.size()), isIncomplete(true), primes(p), forwardFn(fn)
+    wheelRadius(1U), wheelEntryCount(w), smoothPartsLimit(spl), rowOffset(p.size()), isIncomplete(true), primes(p), forwardFn(fn)
   {
     for (size_t i = 0U; i < primes.size(); ++i) {
       const BigInteger& p = primes[i];
+      wheelRadius *= p;
       sqrPrimes.push_back(p * p);
       smoothNumberKeys.push_back(p);
       smoothNumberValues.emplace_back(primes.size(), false);
@@ -827,18 +829,23 @@ 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);
-    for (size_t i = 0U; i < primes.size(); ++i) {
-      bool count = false;
-      const BigInteger &p = primes[i];
-      while (!(num % p)) {
-        num /= p;
-        count = !count;
+    BigInteger factor = 1U;
+    do {
+      factor = gcd(num, wheelRadius);
+      if (factor == 1U) {
+        break;
+      }
+      num /= factor;
+      for (size_t pi = 0U; pi < primes.size(); ++pi) {
+        if (!(factor % primes[pi])) {
+          vec[pi] = !vec[pi];
+        }
       }
-      vec[i] = count;
       if (num == 1U) {
         break;
       }
-    }
+    } while (factor != 1U);
+
     if (num != 1U) {
       return boost::dynamic_bitset<size_t>();
     }

{findafactor-3.6.1 → findafactor-3.6.2}/FindAFactor.egg-info/PKG-INFO

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

{findafactor-3.6.1 → findafactor-3.6.2}/PKG-INFO

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

{findafactor-3.6.1 → findafactor-3.6.2}/setup.py

@@ -7,7 +7,7 @@ except ImportError:
 import setuptools
 from distutils.core import setup, Extension
 
-cpp_args = ['-std=c++17', '-lpthread']
+cpp_args = ['-std=c++17', '-lpthread', '-O3']
 
 README_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md')
 with open(README_PATH) as readme_file:
@@ -26,7 +26,7 @@ ext_modules = [
 
 setup(
     name='FindAFactor',
-    version='3.6.1',
+    version='3.6.2',
     author='Dan Strano',
     author_email='dan@unitary.fund',
     description='Find any nontrivial factor of a number',