Changeset 77ed181 in git for factory/facHensel.cc

Timestamp:

Feb 18, 2013, 6:25:59 PM (11 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

de27d825ef8e6c2bf0bebcf1629935b1d5a3412f

Parents:

65148c4d2a607796fbd578ae2f3219965019aaae520eaa58f37075554f45501fdb328bb9c37f7f48

Message:

Merge pull request #266 from mohamed-barakat/spielwiese

created a new test: ignoring_denominators_of_coefficients.tst

File:

• factory/facHensel.cc (modified) (4 diffs)

factory/facHensel.cc

@@ -918 +918 @@
     M (j + 1, 1)= mulNTL (bufFactors[0] [j], bufFactors[1] [j], b);
   CanonicalForm uIZeroJ;
-  if (j == 1)
-  {
-    if (degBuf0 > 0 && degBuf1 > 0)
-      uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]),
-                  (bufFactors[1] [0] + buf[1]), b) - M(1, 1) - M(j + 1, 1);
-    else if (degBuf0 > 0)
-      uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b);
-    else if (degBuf1 > 0)
-      uIZeroJ= mulNTL (bufFactors[0], buf[1], b);
-    else
-      uIZeroJ= 0;
-    if (b.getp() != 0)
-      uIZeroJ= b (uIZeroJ);
-    Pi [0] += xToJ*uIZeroJ;
-    if (b.getp() != 0)
-      Pi [0]= b (Pi[0]);
-  }
+
+  if (degBuf0 > 0 && degBuf1 > 0)
+    uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]),
+                    (bufFactors[1] [0] + buf[1]), b) - M(1, 1) - M(j + 1, 1);
+  else if (degBuf0 > 0)
+    uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b);
+  else if (degBuf1 > 0)
+    uIZeroJ= mulNTL (bufFactors[0], buf[1], b);
   else
-  {
-    if (degBuf0 > 0 && degBuf1 > 0)
-      uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]),
-                  (bufFactors[1] [0] + buf[1]), b) - M(1, 1) - M(j + 1, 1);
-    else if (degBuf0 > 0)
-      uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b);
-    else if (degBuf1 > 0)
-      uIZeroJ= mulNTL (bufFactors[0], buf[1], b);
-    else
-      uIZeroJ= 0;
-    if (b.getp() != 0)
-      uIZeroJ= b (uIZeroJ);
-    Pi [0] += xToJ*uIZeroJ;
-    if (b.getp() != 0)
-      Pi [0]= b (Pi[0]);
-  }
+    uIZeroJ= 0;
+  if (b.getp() != 0)
+    uIZeroJ= b (uIZeroJ);
+  Pi [0] += xToJ*uIZeroJ;
+  if (b.getp() != 0)
+    Pi [0]= b (Pi[0]);
+
   CFArray tmp= CFArray (factors.length() - 1);
   for (k= 0; k < factors.length() - 1; k++)
@@ -1445 +1427 @@
     M (j + 1, 1)= mulMod (bufFactors[0] [j], bufFactors[1] [j], MOD);
   CanonicalForm uIZeroJ;
-  if (j == 1)
-  {
-    if (degBuf0 > 0 && degBuf1 > 0)
-      uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]),
+
+  if (degBuf0 > 0 && degBuf1 > 0)
+    uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]),
                   (bufFactors[1] [0] + buf[1]), MOD) - M(1, 1) - M(j + 1, 1);
-    else if (degBuf0 > 0)
-      uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD);
-    else if (degBuf1 > 0)
-      uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
-    else
-      uIZeroJ= 0;
-    Pi [0] += xToJ*uIZeroJ;
-  }
+  else if (degBuf0 > 0)
+    uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD);
+  else if (degBuf1 > 0)
+    uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
   else
-  {
-    if (degBuf0 > 0 && degBuf1 > 0)
-      uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]),
-                  (bufFactors[1] [0] + buf[1]), MOD) - M(1, 1) - M(j + 1, 1);
-    else if (degBuf0 > 0)
-      uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD);
-    else if (degBuf1 > 0)
-      uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
-    else
-      uIZeroJ= 0;
-    Pi [0] += xToJ*uIZeroJ;
-  }
+    uIZeroJ= 0;
+  Pi [0] += xToJ*uIZeroJ;
 
   CFArray tmp= CFArray (factors.length() - 1);
@@ -1887 +1854 @@
       uIZeroJ= mulNTL (uIZeroJ, bufFactors[l + 1]);
     else if (degBuf > 0)
-      uIZeroJ= mulNTL (Pi[l - 1], buf[1]);
+      uIZeroJ= mulNTL (Pi[l - 1], buf[l+1]);
     else
       uIZeroJ= 0;
@@ -2270 +2237 @@
       uIZeroJ= mulMod (uIZeroJ, bufFactors[l + 1], MOD);
     else if (degBuf > 0)
-      uIZeroJ= mulMod (Pi[l - 1], buf[1], MOD);
+      uIZeroJ= mulMod (Pi[l - 1], buf[l + 1], MOD);
     else
       uIZeroJ= 0;