Changeset e016ba in git

Timestamp:

Feb 10, 2012, 12:28:39 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

c7c7fe472295329d72d18b083413fa9ac6d12400

Parents:

64b8244955360904656883f8cc313e5776722e11

git-author:

Martin Lee <martinlee84@web.de>2012-02-10 12:28:39+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00

Message:

chg: code formatting

Location:

factory

Files:

• facHensel.cc (modified) (6 diffs)
• facMul.cc (modified) (3 diffs)

factory/facHensel.cc

@@ -490 +490 @@
       if (k != 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] +
+        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]+
                      two.coeff())) - M (k + 1, 1) - M (j - k + 2, 1);
           one++;
@@ -499 +500 @@
         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++;
@@ -505 +506 @@
         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++;
@@ -577 +578 @@
               (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++;
@@ -584 +585 @@
           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++;
@@ -590 +591 @@
           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++;

factory/facMul.cc

@@ -952 +952 @@
     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);
     }
@@ -1826 +1826 @@
 #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
@@ -2414 +2415 @@
     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;