Sophie

Sophie

distrib > Mandriva > 2011.0 > x86_64 > by-pkgid > 2c214796e52ba6a3a1066f92d27d874a > files > 2

cm-0.1-4.src.rpm

--- trunk/lib/class/class.c	2010/02/23 11:43:30	78
+++ trunk/lib/class/class.c	2010/02/23 12:21:40	79
@@ -57,8 +57,9 @@
 
 /* the remaining functions are put separately as their code is quite long    */
 static void real_compute_minpoly (cm_class_t c, mpc_t *conjugate,
-   cm_form_t *nsystem, bool print);
-static void complex_compute_minpoly (cm_class_t c, mpc_t *conjugate, bool print);
+   cm_form_t *nsystem, bool print, bool verbose);
+static void complex_compute_minpoly (cm_class_t c, mpc_t *conjugate,
+   bool print, bool verbose);
 static int doubleeta_compute_parameter (int_cl_t disc);
 static mpz_t* weber_cm_get_j_mod_P (cm_class_t c, mpz_t root, mpz_t P,
    int *no, bool verbose);
@@ -1050,9 +1051,9 @@
 
    cm_timer_start (clock_local);
    if (c.field == CM_FIELD_REAL)
-      real_compute_minpoly (c, conjugate, nsystem, print);
+      real_compute_minpoly (c, conjugate, nsystem, print, verbose);
    else
-      complex_compute_minpoly (c, conjugate, print);
+      complex_compute_minpoly (c, conjugate, print, verbose);
    cm_timer_stop (clock_local);
    if (verbose)
       printf ("--- Time for polynomial reconstruction: %.1f\n",
@@ -1080,7 +1081,7 @@
 /*****************************************************************************/
 
 static void real_compute_minpoly (cm_class_t c, mpc_t *conjugate,
-   cm_form_t *nsystem, bool print)
+   cm_form_t *nsystem, bool print, bool verbose)
    /* computes the minimal polynomial of the function over Q                 */
    /* frees conjugates                                                       */
 
@@ -1129,7 +1130,7 @@
    }
 
    mpfrx_init (mpol, c.minpoly_deg + 1, factors [0]->prec);
-   mpfrx_reconstruct (mpol, factors, (c.h1+1)/2 + c.h2);
+   mpfrx_reconstruct (mpol, factors, (c.h1+1)/2 + c.h2, verbose);
    for (i = 0; i < (c.h1+1)/2 + c.h2; i++)
       mpfrx_clear (factors [i]);
    free (factors);
@@ -1200,7 +1201,7 @@
 /*****************************************************************************/
 
 static void complex_compute_minpoly (cm_class_t c, mpc_t *conjugate,
-   bool print)
+   bool print, bool verbose)
    /* computes the minimal polynomial of the function over Q (sqrt D)        */
    /* frees conjugates                                                       */
 
@@ -1225,7 +1226,7 @@
    free (conjugate);
 
    mpcx_init (mpol, c.minpoly_deg + 1, factors [0]->prec);
-   mpcx_reconstruct (mpol, factors, c.h12);
+   mpcx_reconstruct (mpol, factors, c.h12, verbose);
    for (i = 0; i < c.h12; i++)
       mpcx_clear (factors [i]);
    free (factors);