[Ggnfs-commits] SF.net SVN: ggnfs:[393] trunk/src

[<Ba...@us...>]

Revision: 393
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=393&view=rev
Author:   Batalov
Date:     2010-06-03 21:36:58 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
minor

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

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2010-05-29 21:42:42 UTC (rev 392)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2010-06-03 21:36:58 UTC (rev 393)
@@ -3961,14 +3961,14 @@
       if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
 	mpz_set(large_primes[s1][1],large_primes[s1][0]);
 	nlp[s1]= 2;
-	if(verbose) {
+	if(verbose > 1) {
 	  fprintf(stderr," mpqs on a prime square ");
 	  mpz_out_str(stderr,10,large_primes[s1][0]);
 	  fprintf(stderr,"^2  ");
 	}
 	continue;
       }
-      if(verbose) {
+      if(verbose > 1) {
       fprintf(stderr,"mpqs failed for ");
       mpz_out_str(stderr,10,large_factors[s1]);
       fprintf(stderr,"(a,b): ");

Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c	2010-05-29 21:42:42 UTC (rev 392)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c	2010-06-03 21:36:58 UTC (rev 393)
@@ -2518,6 +2518,18 @@
                           nlp[s1] = 0;
 #endif
                           if (nlp[s1] == 0) {
+			    /* did it fail on a square? */
+			    mpz_sqrtrem(large_primes[s1][0],large_primes[s1][1],large_factors[s1]);
+			    if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
+			      mpz_set(large_primes[s1][1],large_primes[s1][0]);
+			      nlp[s1]= 2;
+			      if(ov > 1) {
+				fprintf(stderr," mpqs on a prime square ");
+				mpz_out_str(stderr,10,large_primes[s1][0]);
+				fprintf(stderr,"^2  ");
+			      }
+			      continue;
+			    }
                             if (ov > 1) {
                               fprintf(stderr, "mpqs failed for ");
                               mpz_out_str(stderr, 10, large_factors[s1]);


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