Changeset 1b8e048 in git

Timestamp:

Apr 5, 2011, 1:23:42 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

dd80471ad40e2c17828a9b1e6ea8114e3d8a8c76

Parents:

0fb5d0c7780acf58819ceb6dd096be46e796f106

Message:

bug fix in hensel lifting


git-svn-id: file:///usr/local/Singular/svn/trunk@14094 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

factory/facHensel.cc

@@ -1766 +1766 @@
   if (degBuf0 > 0 && degBuf1 > 0)
   {
-    while (one.exp() > j) one++;
-    while (two.exp() > j) two++;
+    while (one.hasTerms() && one.exp() > j) one++;
+    while (two.hasTerms() && two.exp() > j) two++;
     for (k= 1; k <= (int) ceil (j/2.0); k++)
     {
@@ -1795 +1795 @@
         tmp[0] += M (k + 1, 1);
     }
-
+  }
+
+  if (degBuf0 >= j + 1 && degBuf1 >= j + 1)
+  {
     if (j + 2 <= M.rows())
-    {
-      if (degBuf0 >= j + 1 && degBuf1 >= j + 1)
-        tmp [0] += mulNTL ((bufFactors [0] [j + 1]+ bufFactors [0] [0]),
-                           (bufFactors [1] [j + 1] + bufFactors [1] [0]))
-                           - M(1,1) - M (j + 2,1);
-      else if (degBuf0 >= j + 1)
-        tmp[0] += mulNTL (bufFactors [0] [j+1], bufFactors [1] [0]);
-      else if (degBuf1 >= j + 1)
-        tmp[0] += mulNTL (bufFactors [0] [0], bufFactors [1] [j + 1]);
-    }
-  }
+      tmp [0] += mulNTL ((bufFactors [0] [j + 1]+ bufFactors [0] [0]),
+                         (bufFactors [1] [j + 1] + bufFactors [1] [0]))
+                         - M(1,1) - M (j + 2,1);
+  }
+  else if (degBuf0 >= j + 1)
+  {
+    if (degBuf1 > 0)
+      tmp[0] += mulNTL (bufFactors [0] [j+1], bufFactors [1] [0]);
+    else
+      tmp[0] += mulNTL (bufFactors [0] [j+1], bufFactors [1]);
+  }
+  else if (degBuf1 >= j + 1)
+  {
+    if (degBuf0 > 0)
+      tmp[0] += mulNTL (bufFactors [0] [0], bufFactors [1] [j + 1]);
+    else
+      tmp[0] += mulNTL (bufFactors [0], bufFactors [1] [j + 1]);
+  }
+
   Pi [0] += tmp[0]*xToJ*F.mvar();
 
@@ -2169 +2180 @@
   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);
-    else if (degBuf1 > 0)
-      uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
-    else
-      uIZeroJ= 0;
-    Pi [0] += xToJ*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);
+  else if (degBuf1 > 0)
+    uIZeroJ= mulMod (bufFactors[0], buf[1], MOD);
+  else
+    uIZeroJ= 0;
+  Pi [0] += xToJ*uIZeroJ; 
 
   CFArray tmp= CFArray (factors.length() - 1);
@@ -2188 +2199 @@
   if (degBuf0 > 0 && degBuf1 > 0)
   {
-    while (one.exp() > j) one++;
-    while (two.exp() > j) two++;
+    while (one.hasTerms() && one.exp() > j) one++;
+    while (two.hasTerms() && two.exp() > j) two++;
     for (k= 1; k <= (int) ceil (j/2.0); k++)
     {
@@ -2220 +2231 @@
       }
     }
-
+  }
+
+  if (degBuf0 >= j + 1 && degBuf1 >= j + 1)
+  {
     if (j + 2 <= M.rows())
-    {
-      if (degBuf0 >= j + 1 && degBuf1 >= j + 1)
-        tmp [0] += mulMod ((bufFactors [0] [j + 1]+ bufFactors [0] [0]),
-                           (bufFactors [1] [j + 1] + bufFactors [1] [0]), MOD)
-                   - M(1,1) - M (j + 2,1);
-      else if (degBuf0 >= j + 1)
-        tmp[0] += mulMod (bufFactors [0] [j+1], bufFactors [1] [0], MOD);
-      else if (degBuf1 >= j + 1)
-        tmp[0] += mulMod (bufFactors [0] [0], bufFactors [1] [j + 1], MOD);
-    }
+      tmp [0] += mulMod ((bufFactors [0] [j + 1]+ bufFactors [0] [0]),
+                         (bufFactors [1] [j + 1] + bufFactors [1] [0]), MOD)
+                         - M(1,1) - M (j + 2,1);
+  }
+  else if (degBuf0 >= j + 1)
+  {
+    if (degBuf1 > 0)
+      tmp[0] += mulMod (bufFactors [0] [j+1], bufFactors [1] [0], MOD);
+    else
+      tmp[0] += mulMod (bufFactors [0] [j+1], bufFactors [1], MOD);
+  }
+  else if (degBuf1 >= j + 1)
+  {
+    if (degBuf0 > 0)
+      tmp[0] += mulMod (bufFactors [0] [0], bufFactors [1] [j + 1], MOD);
+    else
+      tmp[0] += mulMod (bufFactors [0], bufFactors [1] [j + 1], MOD);
   }
   Pi [0] += tmp[0]*xToJ*F.mvar();