[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit bbfeee07b5a0f96b75f0b93e5f738696493a44e2
Author: Martin Lee <martinlee84 at web.de>
Date:   Tue Feb 21 15:45:42 2012 +0100

    fix: compilation errors with --enable-debugoutput

diff --git a/factory/facBivar.cc b/factory/facBivar.cc
index ad29493..d9c61a5 100644
--- a/factory/facBivar.cc
+++ b/factory/facBivar.cc
@@ -228,7 +228,7 @@ CFList biFactorize (const CanonicalForm& F, const Variable& v)
     TIMING_END_AND_PRINT (fac_uni_factorizer,
                           "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);
     if (extension)
@@ -238,7 +238,7 @@ CFList biFactorize (const CanonicalForm& F, const Variable& v)
     TIMING_END_AND_PRINT (fac_uni_factorizer,
                           "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())
       bufUniFactors.removeFirst();
diff --git a/factory/facFqBivar.cc b/factory/facFqBivar.cc
index 83d6649..f90e5d3 100644
--- a/factory/facFqBivar.cc
+++ b/factory/facFqBivar.cc
@@ -461,8 +461,8 @@ factorRecombination (CFList& factors, CanonicalForm& F,
     F= 1;
     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;
 
   CanonicalForm M= N;
@@ -5585,7 +5585,7 @@ biFactorize (const CanonicalForm& F, const ExtensionInfo& info)
     TIMING_END_AND_PRINT (fac_uni_factorizer,
                           "time for univariate factorization: ");
     DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
-              prod (bufUniFactors)*Lc (bufAeval) == bufAeval);
+              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
 
     if (!derivXZero && !fail2)
     {
@@ -5594,7 +5594,7 @@ biFactorize (const CanonicalForm& F, const ExtensionInfo& info)
       TIMING_END_AND_PRINT (fac_uni_factorizer,
                             "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.length() == 1 ||
diff --git a/factory/fac_multihensel.cc b/factory/fac_multihensel.cc
index 27d0e50..c9e99f6 100644
--- a/factory/fac_multihensel.cc
+++ b/factory/fac_multihensel.cc
@@ -164,7 +164,7 @@ findCorrCoeffs ( const CFArray & P, const CFArray & Q, const CFArray & P0, const
     for ( i = 1; i <= r; i++ )
         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 )
     {
         DEBOUTLN( cerr, "there is an error detected, the correction coefficients do not" );
@@ -172,7 +172,7 @@ findCorrCoeffs ( const CFArray & P, const CFArray & Q, const CFArray & P0, const
         DEBOUTLN( cerr, "corresponding P " << P );
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif
+#endif*/
     for ( m = 0; m <= h && ( m == 0 || Dm != 0 ); m++ )
     {
         Dm = pk( evalF( P, Q, A, r ) - C );
@@ -214,14 +214,14 @@ findCorrCoeffs ( const CFArray & P, const CFArray & Q, const CFArray & P0, const
         }
         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" );
         DEBOUTLN( cerr, "fulfill equation F(A)" );
         DEBOUTLN( cerr, "corresponding P " << P );
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif
+#endif*/
     }
     DEBDECLEVEL( cerr, "findCorrCoeffs" );
     return A;

-- 
an open source computer algebra system