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

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

Revision: 404
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=404&view=rev
Author:   brgladman
Date:     2011-01-15 10:13:47 +0000 (Sat, 15 Jan 2011)

Log Message:
-----------
correct earlier bug fix in the lattice sieve 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 09:02:27 UTC (rev 403)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c	2011-01-15 10:13:47 UTC (rev 404)
@@ -2527,9 +2527,10 @@
 #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]);
+                          nf = rho_factor(small_factors, large_factors[s1]); 
                           if(nf >= 1)
                           {
                               for (i = 0; i < nf; i++) {
@@ -2542,13 +2543,7 @@
                               if (i >= nf)
                                   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.