Changeset 327efa2 in git for factory/facHensel.cc

Timestamp:

Sep 14, 2011, 2:38:38 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

09723d9937585aae280f53597c2c61b2b3e6304a

Parents:

725e6002e0b07ad1474e14f72296c0c85a47ae4d

Message:

different lifting  in precomputeLeadingCoeff
extend henselLift122 to lift more than two factors


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

File:

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

factory/facHensel.cc

@@ -2797 +2797 @@
 
   Pi [0] += tmp[0]*xToJ*F.mvar();
+
+  int degPi, degBuf;
+  for (int l= 1; l < factors.length() - 1; l++)
+  {
+    degPi= degree (Pi [l - 1], x);
+    degBuf= degree (bufFactors[l + 1], x);
+    if (degPi > 0 && degBuf > 0)
+    {
+      M (j + 1, l + 1)= mulNTL (Pi [l - 1] [j], bufFactors[l + 1] [j]);
+      if (j + 2 <= M.rows())
+        M (j + 2, l + 1)= mulNTL (Pi [l - 1][j + 1], bufFactors[l + 1] [j + 1]);
+    }
+
+    if (degPi > 0 && degBuf > 0)
+      uIZeroJ= mulNTL (Pi[l -1] [0], buf[l + 1]) +
+               mulNTL (uIZeroJ, bufFactors[l+1] [0]);
+    else if (degPi > 0)
+      uIZeroJ= mulNTL (uIZeroJ, bufFactors[l + 1]);
+    else if (degBuf > 0)
+      uIZeroJ= mulNTL (Pi[l - 1], buf[1]);
+    else
+      uIZeroJ= 0;
+
+    Pi [l] += xToJ*uIZeroJ;
+
+    one= bufFactors [l + 1];
+    two= Pi [l - 1];
+    if (degBuf > 0 && degPi > 0)
+    {
+      while (one.hasTerms() && one.exp() > j) one++;
+      while (two.hasTerms() && two.exp() > j) two++;
+      for (k= 1; k <= (int) ceil (j/2.0); k++)
+      {
+        if (k != j - k + 1)
+        {
+          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] + 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]) - 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())) - M (k + 1, l + 1);
+            two++;
+           }
+        }
+        else
+          tmp[l] += M (k + 1, l + 1);
+      }
+    }
+
+    if (degPi >= j + 1 && degBuf >= j + 1)
+    {
+      if (j + 2 <= M.rows())
+        tmp [l] += mulNTL ((Pi [l - 1] [j + 1]+ Pi [l - 1] [0]),
+                           (bufFactors [l + 1] [j + 1] + bufFactors [l + 1] [0])
+                          ) - M(1,l+1) - M (j + 2,l+1);
+    }
+    else if (degPi >= j + 1)
+    {
+      if (degBuf > 0)
+        tmp[l] += mulNTL (Pi [l - 1] [j+1], bufFactors [l + 1] [0]);
+      else
+        tmp[l] += mulNTL (Pi [l - 1] [j+1], bufFactors [l + 1]);
+    }
+    else if (degBuf >= j + 1)
+    {
+      if (degPi > 0)
+        tmp[l] += mulNTL (Pi [l - 1] [0], bufFactors [l + 1] [j + 1]);
+      else
+        tmp[l] += mulNTL (Pi [l - 1], bufFactors [l + 1] [j + 1]);
+    }
+
+    Pi[l] += tmp[l]*xToJ*F.mvar();
+  }
   return;
 }
@@ -2809 +2895 @@
   CFList bufFactors2= factors;
   bufFactors2.removeFirst();
-  CanonicalForm s,t;
-  extgcd (bufFactors2.getFirst(), bufFactors2.getLast(), s, t);
-  diophant= CFList();
-  diophant.append (t);
-  diophant.append (s);
+  diophant= diophantine (F[0], bufFactors2);
   DEBOUTLN (cerr, "diophant= " << diophant);
 
@@ -2846 +2928 @@
   }
 
+  for (i= 1; i < Pi.size(); i++)
+  {
+    if (degree (Pi[i-1], x) > 0 && degree (bufFactors [i+1], x) > 0)
+    {
+      M (1,i+1)= mulNTL (Pi[i-1] [0], bufFactors[i+1] [0]);
+      Pi [i]= M (1,i+1) + (mulNTL (Pi[i-1] [1], bufFactors[i+1] [0]) +
+                       mulNTL (Pi[i-1] [0], bufFactors [i+1] [1]))*x;
+    }
+    else if (degree (Pi[i-1], x) > 0)
+    {
+      M (1,i+1)= mulNTL (Pi[i-1] [0], bufFactors [i+1]);
+      Pi [i]=  M(1,i+1) + mulNTL (Pi[i-1] [1], bufFactors[i+1])*x;
+    }
+    else if (degree (bufFactors[i+1], x) > 0)
+    {
+      M (1,i+1)= mulNTL (Pi[i-1], bufFactors [i+1] [0]);
+      Pi [i]= M (1,i+1) + mulNTL (Pi[i-1], bufFactors[i+1] [1])*x;
+    }
+    else
+    {
+      M (1,i+1)= mulNTL (Pi [i-1], bufFactors [i+1]);
+      Pi [i]= M (1,i+1);
+    }
+  }
+
   for (i= 1; i < l; i++)
     henselStep122 (F, bufFactors2, bufFactors, diophant, M, Pi, i, LCs);
@@ -2854 +2961 @@
   return;
 }
+
 
 /// solve \f$ E=sum_{i= 1}^{r}{\sigma_{i}prod_{j=1, j\neq i}^{r}{f_{i}}}\f$