[Ecm-commits] r2584 - trunk

cvs commits ecm-commits at lists.gforge.inria.fr
Fri Feb 6 18:31:08 CET 2015


Author: zimmerma
Date: 2015-02-06 18:31:08 +0100 (Fri, 06 Feb 2015)
New Revision: 2584

Modified:
   trunk/rho.c
   trunk/test.ecm
   trunk/test.pm1
Log:
improve coverage of rho.c


Modified: trunk/rho.c
===================================================================
--- trunk/rho.c	2015-02-06 09:27:44 UTC (rev 2583)
+++ trunk/rho.c	2015-02-06 17:31:08 UTC (rev 2584)
@@ -688,10 +688,11 @@
   return prob (B1, B2, N, nr, S, smoothness);
 }
 
+#if defined(TESTDRIVE)
 
 /* Compute probability for primes p == r (mod m) */
 
-double
+static double
 pm1prob_rm (double B1, double B2, double N, double nr, int S, unsigned long r,
             unsigned long m)
 {
@@ -739,8 +740,6 @@
    This function estimates the \Phi(x,y) function via eq. (48) of the 1st
    edition resp. equation (6.49) of the 3rd edition of Tenenbaum's book. */
 
-#if defined(TESTDRIVE)
-
 static double 
 integrand1 (double x, double *y)
 {

Modified: trunk/test.ecm
===================================================================
--- trunk/test.ecm	2015-02-06 09:27:44 UTC (rev 2583)
+++ trunk/test.ecm	2015-02-06 17:31:08 UTC (rev 2584)
@@ -312,7 +312,7 @@
 
 if [ "$MUL" == "modmuln" ]; then
 # exercise batch mode
-echo 33852066257429811148979390609187539760850944806763555795340084882048986912482949506591909041130651770779842162499482875755533111808276172876211496409325473343590723224081353129229935527059488811457730702694849036693756201766866018562295004353153066430367 | $ECM -sigma 1:17 1e6; checkcode $? 0
+echo 33852066257429811148979390609187539760850944806763555795340084882048986912482949506591909041130651770779842162499482875755533111808276172876211496409325473343590723224081353129229935527059488811457730702694849036693756201766866018562295004353153066430367 | $ECM -v -sigma 1:17 1e6; checkcode $? 0
 fi
 
 $ECM -printconfig | grep Tuning

Modified: trunk/test.pm1
===================================================================
--- trunk/test.pm1	2015-02-06 09:27:44 UTC (rev 2583)
+++ trunk/test.pm1	2015-02-06 17:31:08 UTC (rev 2584)
@@ -119,4 +119,7 @@
 # check go with 'N' placeholder
 echo "2^(2^12)+1" | $PM1 -go "N-1" 1e6; checkcode $? 2
 
+# check -v option
+echo 33852066257429811148979390609187539760850944806763555795340084882048986912482949506591909041130651770779842162499482875755533111808276172876211496409325473343590723224081353129229935527059488811457730702694849036693756201766866018562295004353153066430367 | $PM1 -v 1e6; checkcode $? 0
+
 echo "All P-1 tests are ok."



More information about the Ecm-commits mailing list