Changeset 675c62c in git

Timestamp:

Mar 21, 2013, 12:13:33 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

db6e7a98045a733d7ba595de0942788d4be78d4e

Parents:

70bf04b2c457945aee9cb5bd27b38d416f07691e

git-author:

Martin Lee <martinlee84@web.de>2013-03-21 12:13:33+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-22 15:54:21+01:00

Message:

fix: bug in hensel lifting part2

File:

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

factory/facHensel.cc

@@ -2145 +2145 @@
       M (j + 2, 1)= mulMod (bufFactors[0] [j + 1], bufFactors[1] [j + 1], MOD);
   }
+  else
+    M (j + 1, 1)= 0;
+
   CanonicalForm uIZeroJ;
-
   if (degBuf0 > 0 && degBuf1 > 0)
     uIZeroJ= mulMod (bufFactors[0] [0], buf[1], MOD) +
              mulMod (bufFactors[1] [0], buf[0], MOD);
   else if (degBuf0 > 0)
-    uIZeroJ= mulMod (buf[0], bufFactors[1], MOD);
+    uIZeroJ= mulMod (buf[0], bufFactors[1], MOD) +
+             mulMod (buf[1], bufFactors[0][0], MOD);
   else if (degBuf1 > 0)
-    uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
+    uIZeroJ= mulMod (bufFactors[0], buf[1], MOD) +
+             mulMod (buf[0], bufFactors[1][0], MOD);
   else
-    uIZeroJ= 0;
+    uIZeroJ= mulMod (bufFactors[0], buf[1], MOD) +
+             mulMod (buf[0], bufFactors[1], MOD);
   Pi [0] += xToJ*uIZeroJ;
 
@@ -2237 +2242 @@
                                   MOD);
     }
+    else
+      M (j + 1, l + 1)= 0;
 
     if (degPi > 0 && degBuf > 0)
-      uIZeroJ= mulMod (Pi[l -1] [0], buf[l + 1], MOD) +
-               mulMod (uIZeroJ, bufFactors[l+1] [0], MOD);
+      uIZeroJ= mulMod (Pi[l - 1] [0], buf[l + 1], MOD) +
+               mulMod (uIZeroJ, bufFactors[l + 1] [0], MOD);
     else if (degPi > 0)
-      uIZeroJ= mulMod (uIZeroJ, bufFactors[l + 1], MOD);
+      uIZeroJ= mulMod (uIZeroJ, bufFactors[l + 1], MOD) +
+               mulMod (Pi[l - 1][0], buf[l + 1], MOD);
     else if (degBuf > 0)
-      uIZeroJ= mulMod (Pi[l - 1], buf[l + 1], MOD);
-    else
-      uIZeroJ= 0;
+      uIZeroJ= mulMod (Pi[l - 1], buf[l + 1], MOD) +
+               mulMod (uIZeroJ, bufFactors[l + 1][0], MOD);
+    else
+      uIZeroJ= mulMod (Pi[l - 1], buf[l + 1], MOD) +
+               mulMod (uIZeroJ, bufFactors[l + 1], MOD);
 
     Pi [l] += xToJ*uIZeroJ;