Changeset a96a75 in git for Singular/LIB/puiseuxexpansions.lib

Timestamp:

Mar 25, 2022, 9:47:17 PM (2 years ago)

Author:

slap <slaplagne@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

36b837d5b06f149cd26135419d1e9b415137afec

Parents:

4ccfc07e7eeceaffdba21722d69b04440a736a71

Message:

Bugs fixed

1. Puiseux expansions were erroneously marked as belonging to different classes.
2. The maximum degree of the expansions is incremented when in one computing Hensel factors to avoid erroneous truncations.

File:

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

Singular/LIB/puiseuxexpansions.lib

@@ -462 +462 @@
       for(ii = 2; ii <= size(fJe[1]); ii++)
       {
-        cod++;
+        if((ii == 2) || (nonRatCoeff(fJe[1][ii]) == 0))  // If the factor is over the ground field then it is a new conjugacy class.
+        {
+          cod++;
+        }
         fTemp = subst(fJe[1][ii]^(fJe[2][ii]), var(1), var(1)^slD);
         // Checks if a new extension is needed.
@@ -665 +668 @@
                 {
                   poly fNew2 = subst(fNew1, var(2), (newA + var(2))*var(1)^slN);
-                } else {
+                } else 
+                {
                   poly fNew2 = negExp(fNew1, newA, slN);
                 }
                 fNew2= sat(ideal(fNew2), var(1))[1][1];
-                if(maxDeg > 0){
+                if(maxDeg > 0)
+                {
                   newMaxDeg = maxDeg * slD - slN;
                 } else {
@@ -675 +680 @@
                 }
                 list csTS = puiseuxMain(fNew2, newMaxDeg, slN, 1, 0);
-                for(k = 1; k<=size(csTS); k++){
-                  if(typeof(csTS[k]) == "ring"){
+                for(k = 1; k<=size(csTS); k++)
+                {
+                  if(typeof(csTS[k]) == "ring")
+                  {
                     def RT = csTS[k];
                     setring RT;
@@ -1129 +1136 @@
 
 
+// Checks if the coefficents of a polynomial are rational or contain some parameter
+static proc nonRatCoeff(poly p)
+{
+  matrix cc = coef(p, var(1)*var(2));
+  int nonRat = 0;
+  for(int i = 1; i <= ncols(cc); i++)
+  {
+    if(pardeg(number(cc[2,i])) > 0)
+    {
+      nonRat = 1;
+    }
+  }
+  return(nonRat);
+}