[Ggnfs-commits] branch_0/src clsieve.c,1.2,1.3

[Greg <fr...@us...>]

Update of /cvsroot/ggnfs/branch_0/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/src

Modified Files:
	clsieve.c 
Log Message:
Applied a patch by Jason Papadopoulos to the classical sieve to fix an incorrect initialization when the factor base is very small (under 65536).

Index: clsieve.c
===================================================================
RCS file: /cvsroot/ggnfs/branch_0/src/clsieve.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** clsieve.c	26 Jun 2005 18:36:04 -0000	1.2
--- clsieve.c	7 Jul 2005 05:23:24 -0000	1.3
***************
*** 262,266 ****
        break;
    }
!   conf.tiny_rfb_size = i+1;
  
    for (i=0; i<conf.rfb_size; i++) {
--- 262,266 ----
        break;
    }
!   conf.tiny_rfb_size = MIN(conf.rfb_size, i+1);
  
    for (i=0; i<conf.rfb_size; i++) {
***************
*** 268,272 ****
        break;
    }
!   conf.med_rfb_size = i+1;
  
    /************************************
--- 268,272 ----
        break;
    }
!   conf.med_rfb_size = MIN(conf.rfb_size, i+1);
  
    /************************************
***************
*** 333,337 ****
      }
    }
!   conf.tiny_afb_size = i+1;
  
    for (i=1,j=0; i<conf.afb_size; i++) {
--- 333,337 ----
      }
    }
!   conf.tiny_afb_size = MIN(conf.afb_size, i+1);
  
    for (i=1,j=0; i<conf.afb_size; i++) {
***************
*** 341,345 ****
      }
    }
!   conf.med_afb_size = i+1;
  
    mpz_init_set_si(conf.LP1_max_a, FB->maxP_a);
--- 341,345 ----
      }
    }
!   conf.med_afb_size = MIN(conf.afb_size, i+1);
  
    mpz_init_set_si(conf.LP1_max_a, FB->maxP_a);