pc?ul: support -o<n> to test less before printing

Running with -o200, for example, gives up testing in tau_multi_run()
at the point it would start QS for any number of more than 200 bits
(about 60 decimal digits).

Author: hvds

coul.c

@@ -211,6 +211,7 @@ struct {
 } midp_recover;
 uint rough = 0;     /* test roughness if tau >= rough */
 bool opt_print = 0; /* print candidates instead of fully testing them */
+uint opt_flake = 0; /* test less before printing candidates */
 /* If opt_alloc is true and opt_batch < 0, just show the forced-prime
  * allocation; if opt_alloc is true and opt_batch >= 0, just process
  * the specified batch_alloc.
@@ -1618,7 +1619,7 @@ void prep_presquare(void) {
 }
 
 void init_post(void) {
-    init_tau(rough);
+    init_tau(rough, opt_flake);
     init_stats(k);
     alloc_taum(k);
     if (randseed != 1) {
@@ -4328,9 +4329,11 @@ int main(int argc, char **argv, char **envp) {
             opt_alloc = 1;
         else if (arg[1] == 'b')
             set_batch(&arg[2]);
-        else if (arg[1] == 'o')
+        else if (arg[1] == 'o') {
             opt_print = 1;
-        else if (arg[1] == 'c') {
+            if (arg[2])
+                opt_flake = strtoul(&arg[2], NULL, 10);
+        } else if (arg[1] == 'c') {
             if (arg[2] == 'p')
                 check_prime = strtoul(&arg[3], NULL, 10);
             else if (arg[2] == 'r')

coultau.c

@@ -156,9 +156,9 @@ static inline bool ct_trial(factor_state *fs) {
 /* MPUG declares this static, so we must copy it */
 static unsigned short primes_small[NPRIMES_SMALL];
 
-void init_tmfbl(void);
+void init_tmfbl(uint flake);
 void done_tmfbl(void);
-void init_tau(uint rough) {
+void init_tau(uint rough, uint flake) {
     UV pn;
     test_rough = rough;
     PRIME_ITERATOR(iter);
@@ -170,7 +170,7 @@ void init_tau(uint rough) {
     mpz_init(tmf);
     mpz_init(tmf2);
     mpz_init(tmp_lim);
-    init_tmfbl();
+    init_tmfbl(flake);
     for (uint i = 0; i < SIMPQS_SIZE; ++i)
         mpz_init(simpqs_array[i]);
 }
@@ -896,16 +896,21 @@ ulong *tmfbl = NULL;
 uint tmfb_maxb;
 ulong tmfb_lim;
 
-void init_tmfbl(void) {
+/* don't flake out for anything before QS */
+#define NO_FLAKE ((1 << 24) - 1)
+void init_tmfbl(uint flake) {
     tmfb_lim = tmfb[TMFB_MAX - 1].tmf_bits;
     tmfb_maxb = tmfb[TMFB_MAX - 2].maxlen;
+    if (flake && tmfb_maxb > flake)
+        tmfb_lim = tmfb_lim & NO_FLAKE;
+
     tmfbl = (ulong *)malloc((tmfb_maxb + 1) * sizeof(ulong));
     uint i = 0;
     for (uint j = 0; j <= TMFB_MAX - 2; ++j) {
         uint lim = tmfb[j].maxlen;
         ulong bits = tmfb[j].tmf_bits;
         for (; i <= lim; ++i)
-            tmfbl[i] = bits;
+            tmfbl[i] = (flake && i > flake) ? (bits & NO_FLAKE) : bits;
     }
 }
 

coultau.h

@@ -50,7 +50,7 @@ extern t_tm *taum;
 
 typedef uint (*tau_failure_handler)(uint count, t_tm *taum);
 
-extern void init_tau(uint test_rough);
+extern void init_tau(uint test_rough, uint flake);
 extern void done_tau(void);
 extern void fs_init(factor_state* fs);
 extern void fs_clear(factor_state* fs);

ftest.c

@@ -38,7 +38,7 @@ void fail(char *format, ...) {
 int main(int argc, char **argv) {
     _GMP_init();
     set_verbose_level(3);
-    init_tau(0);
+    init_tau(0, 0);
     alloc_taum(1);
     t0 = utime();
 

sq12.c

@@ -156,7 +156,7 @@ void init(void) {
         mpz_init(Z(i));
     init_diag();
     init_time();
-    init_tau(0);
+    init_tau(0, 0);
 }
 
 void ston(mpz_t targ, char *s) {

test_pell.c

@@ -14,7 +14,7 @@ mpz_t zlimit;
 mpz_t zx;
 mpz_t zy;
 
-/* needed for coultau.c; but not used, since we init_tau(0) */
+/* needed for coultau.c; but not used, since we init_tau(0, 0) */
 #include "coul.h"
 t_divisors *divisors = NULL;
 
@@ -62,7 +62,7 @@ int main(int argc, char **argv) {
     mpz_init(zx);
     mpz_init(zy);
     _GMP_init();
-    init_tau(0);
+    init_tau(0, 0);
     init_rootmod(1);
     init_pell();
     new_pell(zA, zD, in, zlimit);