[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 72d97e060df50b25b49d9293806060f231eea871
Author: Martin Lee <martinlee84 at web.de>
Date:   Fri Feb 10 12:28:39 2012 +0100

    chg: code formatting

diff --git a/factory/facHensel.cc b/factory/facHensel.cc
index 22fe683..974cd55 100644
--- a/factory/facHensel.cc
+++ b/factory/facHensel.cc
@@ -485,22 +485,23 @@ henselStep12 (const CanonicalForm& F, const CFList& factors,
     {
       if (k != j - k + 1)
       {
-        if ((one.hasTerms() && one.exp() == j - k + 1) && (two.hasTerms() && two.exp() == j - k + 1))
+        if ((one.hasTerms() && one.exp() == j - k + 1)
+             && (two.hasTerms() && two.exp() == j - k + 1))
         {
-          tmp[0] += mulNTL ((bufFactors[0] [k] + one.coeff()), (bufFactors[1] [k] +
+          tmp[0] += mulNTL ((bufFactors[0][k]+one.coeff()), (bufFactors[1][k]+
                      two.coeff())) - M (k + 1, 1) - M (j - k + 2, 1);
           one++;
           two++;
         }
         else if (one.hasTerms() && one.exp() == j - k + 1)
         {
-          tmp[0] += mulNTL ((bufFactors[0] [k] + one.coeff()), bufFactors[1] [k]) -
+          tmp[0] += mulNTL ((bufFactors[0][k]+one.coeff()), bufFactors[1][k])-
                      M (k + 1, 1);
           one++;
         }
         else if (two.hasTerms() && two.exp() == j - k + 1)
         {
-          tmp[0] += mulNTL (bufFactors[0] [k], (bufFactors[1] [k] + two.coeff())) -
+          tmp[0] += mulNTL (bufFactors[0][k], (bufFactors[1][k]+two.coeff()))-
                     M (k + 1, 1);
           two++;
         }
@@ -572,20 +573,20 @@ henselStep12 (const CanonicalForm& F, const CFList& factors,
           if ((one.hasTerms() && one.exp() == j - k + 1) &&
               (two.hasTerms() && two.exp() == j - k + 1))
           {
-            tmp[l] += mulNTL ((bufFactors[l + 1] [k] + one.coeff()), (Pi[l - 1] [k] +
+            tmp[l] += mulNTL ((bufFactors[l+1][k] + one.coeff()), (Pi[l-1][k] +
                        two.coeff())) - M (k + 1, l + 1) - M (j - k + 2, l + 1);
             one++;
             two++;
           }
           else if (one.hasTerms() && one.exp() == j - k + 1)
           {
-            tmp[l] += mulNTL ((bufFactors[l + 1] [k] + one.coeff()), Pi[l - 1] [k]) -
+            tmp[l] += mulNTL ((bufFactors[l+1][k]+one.coeff()), Pi[l-1][k]) -
                        M (k + 1, l + 1);
             one++;
           }
           else if (two.hasTerms() && two.exp() == j - k + 1)
           {
-            tmp[l] += mulNTL (bufFactors[l + 1] [k], (Pi[l - 1] [k] + two.coeff())) -
+            tmp[l] += mulNTL (bufFactors[l+1][k], (Pi[l-1][k] + two.coeff())) -
                       M (k + 1, l + 1);
             two++;
           }
diff --git a/factory/facMul.cc b/factory/facMul.cc
index 27e3b2f..96dab9a 100644
--- a/factory/facMul.cc
+++ b/factory/facMul.cc
@@ -951,7 +951,7 @@ reverseSubstReciproQ (const fmpz_poly_t F, const fmpz_poly_t G, int d, int k)
     fmpz_poly_init2 (buf3, repLengthBuf2 + d);
     for (ind= 0; ind < repLengthBuf1; ind++)
     {
-      fmpz_poly_get_coeff_fmpz (tmp1, buf1, ind);  //oder fmpz_set (fmpz_poly_get_coeff_ptr (buf3, ind),fmpz_poly_get_coeff_ptr (buf1, ind))
+      fmpz_poly_get_coeff_fmpz (tmp1, buf1, ind);
       fmpz_poly_set_coeff_fmpz (buf3, ind, tmp1);
     }
     for (ind= repLengthBuf1; ind < d; ind++)
@@ -1825,7 +1825,8 @@ CanonicalForm mulMod2 (const CanonicalForm& A, const CanonicalForm& B,
 
 #ifdef HAVE_FLINT
   Variable alpha;
-  if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha) && ! hasFirstAlgVar (G, alpha))
+  if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha)
+      && !hasFirstAlgVar (G, alpha))
     return mulMod2FLINTQ (F, G, M);
 #endif
 
@@ -2413,7 +2414,8 @@ void divrem2 (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q,
     divrem (A, B, Q, R);
     return;
   }
-  if (!(B.level() == 1 && B.isUnivariate()) && (A.level() == 1 && A.isUnivariate()))
+  if (!(B.level() == 1 && B.isUnivariate()) &&
+      (A.level() == 1 && A.isUnivariate()))
   {
     Q= 0;
     R= A;

-- 
an open source computer algebra system