wNaf Edwards twisted torsion 16 stage 2 OK

Author: cherubrock-seb

src/modes/RunEcm.cpp

@@ -273,15 +273,32 @@ int App::runECMMarin()
 
     vector<uint64_t> primesB1_v, primesS2_v;
     {
-        uint64_t Pmax = B2 ? B2 : B1;
+        uint64_t Pmax = B1;
+        if (B2 > B1) Pmax = B2;
+
         vector<char> sieve(Pmax + 1, 1);
-        sieve[0]=0; if (Pmax >= 1) sieve[1]=0;
-        for (uint64_t q=2;q*q<=Pmax;++q) if (sieve[q]) for (uint64_t k=q*q;k<=Pmax;k+=q) sieve[k]=0;
-        for (uint64_t q=2;q<=B1;++q) if (sieve[q]) primesB1_v.push_back((uint32_t)q);
-        if (B2 > B1) for (uint64_t q=B1+1;q<=B2;++q) if (sieve[q]) primesS2_v.push_back((uint64_t)q);
-        std::cout<<"[ECM] Prime counts: B1="<<primesB1_v.size()<<", S2="<<primesS2_v.size()<<std::endl;
+        sieve[0] = 0;
+        if (Pmax >= 1) sieve[1] = 0;
+
+        for (uint64_t q = 2; q*q <= Pmax; ++q)
+            if (sieve[q])
+                for (uint64_t k = q*q; k <= Pmax; k += q)
+                    sieve[k] = 0;
+
+        for (uint64_t q = 2; q <= B1; ++q)
+            if (sieve[q])
+                primesB1_v.push_back((uint32_t)q);
+
+        if (B2 > B1)
+            for (uint64_t q = B1 + 1; q <= B2; ++q)
+                if (sieve[q])
+                    primesS2_v.push_back((uint64_t)q);
+
+        std::cout << "[ECM] Prime counts: B1=" << primesB1_v.size()
+                << ", S2=" << primesS2_v.size() << std::endl;
     }
 
+
     vector<uint64_t> s1_factors;
     mpz_class K(1);
     for (uint32_t q : primesB1_v) { uint64_t m = q; while (m <= B1 / q) m *= q; s1_factors.push_back(m); mpz_mul_ui(K.get_mpz_t(), K.get_mpz_t(), m); }

src/modes/RunEcmTwistedEdwards.cpp

@@ -369,7 +369,7 @@ int App::runECMMarinTwistedEdwards()
     vector<uint64_t> primesB1_v, primesS2_v;
     {
         uint64_t Pmax = B1;
-        if (B2 > B1) Pmax = B2;  // on a besoin de max(B1,B2)
+        if (B2 > B1) Pmax = B2;
 
         vector<char> sieve(Pmax + 1, 1);
         sieve[0] = 0;