Changeset f3a82f4 in git

Timestamp:

Feb 21, 2012, 3:45:42 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0b618a776fb1b77afc08df17205c01272c15f277

Parents:

346edc8b6fd87fc9063b76b6ec2fa61d0061899f

git-author:

Martin Lee <martinlee84@web.de>2012-02-21 15:45:42+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-02-22 15:31:05+01:00

Message:

fix: compilation errors with --enable-debugoutput

Location:

factory

Files:

• facBivar.cc (modified) (2 diffs)
• facFqBivar.cc (modified) (3 diffs)
• fac_multihensel.cc (modified) (4 diffs)

factory/facBivar.cc

@@ -233 +233 @@
                           "time for univariate factorization: ");
     DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
-              prod (bufUniFactors)*Lc (bufAeval) == bufAeval);
+              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
 
     TIMING_START (fac_uni_factorizer);
@@ -243 +243 @@
                           "time for univariate factorization in y: ");
     DEBOUTLN (cerr, "Lc (Aeval2)*prod (uniFactors2)== Aeval2 " <<
-              prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2);
+              (prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2));
 
     if (bufUniFactors.getFirst().inCoeffDomain())

factory/facFqBivar.cc

@@ -464 +464 @@
     return result;
   }
-  DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, M) == F " <<
-            (LC (F, 1)*prodMod (factors, M) == F));
+  DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, N) == F " <<
+            (LC (F, 1)*prodMod (factors, N) == F));
   CFList T, S;
 
@@ -5588 +5588 @@
                           "time for univariate factorization: ");
     DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
-              prod (bufUniFactors)*Lc (bufAeval) == bufAeval);
+              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
 
     if (!derivXZero && !fail2)
@@ -5597 +5597 @@
                             "time for univariate factorization in y: ");
       DEBOUTLN (cerr, "Lc (Aeval2)*prod (uniFactors2)== Aeval2 " <<
-                prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2);
+                (prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2));
     }
 

factory/fac_multihensel.cc

@@ -166 +166 @@
         A[i] = remainder( pk( a[i] * C0 ), P0[i], pk );
     DEBOUTLN( cerr, "the first approximation of the correction coefficients is " << A );
-#ifdef DEBUGOUTPUT
+/*#ifdef DEBUGOUTPUT
     if ( check_dummy( A, P, Q ) - C != 0 )
     {
@@ -174 +174 @@
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif
+#endif*/
     for ( m = 0; m <= h && ( m == 0 || Dm != 0 ); m++ )
     {
@@ -216 +216 @@
         DEBOUTLN( cerr, "the correction coefficients at step " << m );
         DEBOUTLN( cerr, "are now " << A );
-#ifdef DEBUGOUTPUT
+/*#ifdef DEBUGOUTPUT
     if ( check_dummy( A, P, Q ) - C != 0 ) {
         DEBOUTLN( cerr, "there is an error detected, the correction coefficients do not" );
@@ -223 +223 @@
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif
+#endif*/
     }
     DEBDECLEVEL( cerr, "findCorrCoeffs" );