[Ggnfs-commits] SF.net SVN: ggnfs:[405] trunk/src/lasieve4/gnfs-lasieve4e.c

[<brg...@us...>]

Revision: 405
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=405&view=rev
Author:   brgladman
Date:     2011-01-15 11:32:39 +0000 (Sat, 15 Jan 2011)

Log Message:
-----------
revert my two changes to the siever code

Modified Paths:
--------------
    trunk/src/lasieve4/gnfs-lasieve4e.c

Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c	2011-01-15 10:13:47 UTC (rev 404)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c	2011-01-15 11:32:39 UTC (rev 405)
@@ -2527,23 +2527,22 @@
 #endif
 #define TRY_RHO_ON_FAILURES
 #ifdef TRY_RHO_ON_FAILURES
-                        nlp[s1] = 0;
                         { unsigned long small_factors[10];
 
-                          nf = rho_factor(small_factors, large_factors[s1]); 
-                          if(nf >= 1)
-                          {
-                              for (i = 0; i < nf; i++) {
-                                mpz_set_ui(large_primes[s1][i], small_factors[i]);
-                                if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
-                                  n_mpqsvain[s1]++;
-                                  break;
-                                }
-                              }
-                              if (i >= nf)
-                                  nlp[s1] = nf;
+                          nf = rho_factor(small_factors, large_factors[s1]);
+                          for (i = 0; i < nf; i++) {
+                            mpz_set_ui(large_primes[s1][i], small_factors[i]);
+                            if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
+                              n_mpqsvain[s1]++;
+                              break;
+                            }
                           }
+                          if ((i >= nf) && (nf >= 1))
+                            nlp[s1] = nf;
+                          else { nlp[s1]=0; }
                         }
+#else
+                          nlp[s1] = 0;
 #endif
                           if (nlp[s1] == 0) {
 			    /* did it fail on a square? */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.