Changeset 31d614 in git for Singular

Timestamp:

Mar 15, 2022, 4:37:20 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c1d1d924a0316c8dd9d96b185d6269552e5dcac3

Parents:

b8cd6e55df305b9b3acc9333479391768183129631f6493f817b702a6f55e8cdcdc8d11d7231b65a

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-03-15 16:37:20+01:00

git-committer:

GitHub <noreply@github.com>2022-03-15 16:37:20+01:00

Message:

Merge pull request #1134 from slap/integral-basis

Bugs fixed in puiseuxexpansions.lib

File:

• Singular/LIB/puiseuxexpansions.lib (modified) (3 diffs)

Singular/LIB/puiseuxexpansions.lib

@@ -368 +368 @@
   int stop;
   int newMaxDeg;
-  list l = newtonpoly2(f);
-
-  //list l = newtonpoly(f);
-
-  //if((l[1][1] == 0) && (l[1][2] == 0))
-  //{
-  //  "ERROR: The polynomial must pass through the origin.";
-  //  list cs = list();
-  //} else
-  //{
 
   poly @c;
@@ -394 +384 @@
   int cod = 0;
   int mi;
+
+  // Case of Puiseux expansions with finite number of terms
+  list dd = Integralbasis::divideBy(f, var(2));
+  if(dd[2]>0)
+  {
+    for(i = 1; i <= dd[2]; i++)
+    {
+      cs[size(cs) + 1] = list(0, 1);
+      cs[size(cs)][6] = list(cod);
+      cod++;
+    }
+    f = dd[1];
+  }
+
+
+  list l = newtonpoly2(f);
+  
+  //list l = newtonpoly(f);
+  
+  //if((l[1][1] == 0) && (l[1][2] == 0))
+  //{
+  //  "ERROR: The polynomial must pass through the origin.";
+  //  list cs = list();
+  //} else 
+  //{
+
 
   //for(i = 1; i<size(l); i++)
@@ -922 +938 @@
   // We compute the Puiseux expansions in this new ring
   poly f = imap(R_PP, PP_numer);
-  list fFacs = factorize(f);
-  fFacs = Integralbasis::sortFactors(fFacs);
   list p;
-  list pTemp;
-  for(i = 1; i <= size(fFacs[1]); i++)
-  {
-    if((fFacs[1][i] != 1) and (deg(fFacs[1][i], intvec(0,1)) > 0))
-    {
-      p = p + puiseuxMain(fFacs[1][i], maxDeg, 0, 0, 1);
-    }
-  }
+
+  // NOT WORKING - WE NEED TO CONSIDER ALSO THE MULTIPLICITIES
+  // If we develop to a fix degree we can split the computations.
+  // If we want to compute the singular parts then we cannot split.
+  //if(maxDeg != -1)
+  //{
+  //  // We compute the Puiseux expansions in this new ring
+  //  list fFacs = factorize(f);
+  //  fFacs = Integralbasis::sortFactors(fFacs);
+  //
+  //  for(i = 1; i <= size(fFacs[1]); i++)
+  //  { 
+  //    if((fFacs[1][i] != 1) and (deg(fFacs[1][i], intvec(0,1)) > 0))
+  //    {
+  //      p = p + puiseuxMain(fFacs[1][i], maxDeg, 0, 0, 1);
+  //    }
+  //  }
+  //} else 
+  //{
+  //  p = puiseuxMain(f, maxDeg, 0, 0, 1);
+  //}
+
+  p = puiseuxMain(f, maxDeg, 0, 0, 1);
 
   // We create a list of type Puiseux with one element for each Puiseux