Changeset 174d71 in git

Timestamp:

Dec 21, 2021, 3:57:00 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

2ef61b64b621826d002089672cfdcaa070b9ea08

Parents:

2dfae43faef0f4b81c2c335c28e365fec2e7bd06

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-12-21 15:57:00+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-12-21 15:58:03+01:00

Message:

new puiseuxexpansions.lib (also renamed from puiseux.lib)

Files:

• Singular/LIB/puiseuxexpansions.lib (moved) (moved from Singular/LIB/puiseux.lib) (20 diffs)
• Singular/singular-libs (modified) (1 diff)
• doc/NEWS.texi (modified) (1 diff)
• doc/singular.doc (modified) (previous)

Singular/LIB/puiseuxexpansions.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="version puiseux.lib 4.2.1.2 Nov_2021 "; // $Id$
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+version="version puiseuxexpansion.lib 4.2.1.3 Dec_2021 "; // $Id$
 category="Commutative Algebra";
 info="
-LIBRARY:  puiseux.lib  Puiseux expansions over algebraic extensions
+LIBRARY:  puiseuxexpansion.lib  Puiseux expansions over algebraic extensions
 AUTHORS:  J. Boehm, j.boehm at mx.uni-saarland.de
           W. Decker, decker at mathematik.uni-kl.de
@@ -17 +19 @@
 PROCEDURES:
  puiseuxList(PP, maxDeg, iVarX, iVarY);     Computes the Puiseux expansion of PP at X = 0
+ makePuiseux(f, denom, fr);       Creates a Puiseux element
+ makePuiseuxFromPoly(poly f);     Converts a polynomail to Puiseux data type
+ printPuiseux(f);                 Prints information for Puiseux elements
+ puiseux(f, maxDeg, atOrigin);    Computes the Puiseux expansions of f
 ";
 
@@ -110 +116 @@
 
 proc makePuiseuxFromPoly(poly f)
+"USAGE: makePuiseuxFromPoly(f); f polynomial in two variables
+RETURN: make a ring independent polynomial over Puiseux series
+EXAMPLE: example makePuiseuxFromPoly, shows an example"
 {
   return(makePuiseux(f,1,1));
 }
-
-proc makePuiseux(poly f, poly d, int fr)
-"USAGE: makePuiseux(f); f polynomial in two variables, d polynomial in
+example
+{
+ "EXAMPLE:"; echo=2;
+ ring R=0,(x,y),dp;
+ poly f=3*x^2+x+1;
+ makePuiseuxFromPoly(f);
+}
+
+proc makePuiseux(poly f, poly denom, int fr)
+"USAGE: makePuiseux(f, denom, fr); f polynomial in two variables, denom polynomial in
         the first variable of the ring, int fr
 RETURN: make a ring independent polynomial over Puiseux series
@@ -123 +139 @@
   F.in=basering;
   F.numer=f;
-  F.denom =d;
+  F.denom =denom;
   F.fraction = fr;
   return(F);
@@ -137 +153 @@
 // Print information for Puiseux elements
 proc printPuiseux(Puiseux f)
+"USAGE: printPuiseux(f); f Puiseux expansion
+RETURN: prints information for Puiseux elements
+EXAMPLE: example printPuiseux, shows an example"
 {
   def R = basering;
@@ -145 +164 @@
   if(minpoly <> 0) {"Minimal polynomial: ", minpoly;}
   setring R;
+}
+example
+{
+ "EXAMPLE:"; echo=2;
+ ring R=0,(x,y),dp;
+ poly f=3*x^2+x*y+1;
+ Puiseux F = makePuiseux(f,x^2,3);
+ printPuiseux(F);
+
 }
 
@@ -238 +266 @@
 // It returns a list containing information about the expansions
 proc puiseux(poly f, int maxDeg, int atOrigin)
+"USAGE: puiseux(f, maxDeg, atOrigin); f polynomial in two variables, int maxDeg, int atOrigin
+RETURN: the Puiseux expansions of f developed up to degree maxDeg. If atOrigin = 1, only the expansions passing through the origin will be returned.
+EXAMPLE: example puiseux, shows an example"
 {
   if(atOrigin == 1)
@@ -249 +280 @@
   return(p);
 }
+example
+{
+ "EXAMPLE:"; echo=2;
+ ring R=0,(x,y),dp;
+ poly f=y^3 + x^2 + x^8;
+ puiseux(f,3,0);
+}
 
 
@@ -254 +292 @@
 // slN is the numerator of the slope
 // slD is the denominator
-proc puiseuxStep(poly f, int slN, int slD){
+static proc puiseuxStep(poly f, int slN, int slD){
   def R = basering;
   poly x = var(1);
@@ -403 +441 @@
 
       fJe = factorize(je);
-      fJe = sortFactors(fJe);
+      fJe = Integralbasis::sortFactors(fJe);
 
       fNew1 = subst(f, var(1), var(1)^slD);
@@ -566 +604 @@
                 }
 
-                def S = splitRingAt(minP, erg);
+                def S = Integralbasis::splitRingAt(minP, erg);
                 setring S;
                 sizeErg = size(erg);
@@ -586 +624 @@
 
               } else {
-                def S = splitRingAt(minP);
+                def S = Integralbasis::splitRingAt(minP);
                 setring S;
                 list minPolys;
@@ -729 +767 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-proc newtonpoly2(poly f, int #)
+static proc newtonpoly2(poly f, int #)
 "USAGE:   newtonpoly2(f);   f poly
 ASSUME:  basering has exactly two variables; @*
@@ -791 +829 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-proc negExp(poly fNew1, poly c1, int slN)
+static proc negExp(poly fNew1, poly c1, int slN)
 {
   // All this is a workaround to work with negative exponents,
@@ -850 +888 @@
 //        - int iVarY, the index of the Y variable for the ring C{X}[Y].
 proc puiseuxList(Puiseux PP, int maxDeg, int iVarX, int iVarY)
+"USAGE:  puiseuxList(PP, maxDeg, iVarX, iVarY);   Puiseux expansion PP, int maxDeg
+         is the integer up to which the Puiseux expansions will be computed
+         (if maxDeg = -1 computes the singular part),
+         int iVarX is the index of the X variable for the ring C{X}[Y],
+         int iVarY, the index of the Y variable for the ring C{X}[Y].
+ASSUME:  basering has exactly two variables; @*
+         f is convenient, that is, f(x,0) != 0 != f(0,y).
+RETURN:  a list with the Puiseux expansions of PP.
+KEYWORDS: Puiseux expansions
+EXAMPLE: example puiseuxList;  shows an example
+"
+
 {
   def R = basering;
@@ -873 +923 @@
   poly f = imap(R_PP, PP_numer);
   list fFacs = factorize(f);
-  fFacs = sortFactors(fFacs);
+  fFacs = Integralbasis::sortFactors(fFacs);
   list p;
   list pTemp;
@@ -982 +1032 @@
   return(out);
 }
-
+example
+{
+ "EXAMPLE:"; echo = 2;
+  ring r=0,(x,y),dp;
+  Puiseux PP = x5+2x3y-x2y2+3xy5+y6+y7;
+  puiseuxList(PP, 5, 1, 2);
+}
 
 // The equation corresponding to a segment of the Newton polygon.
 // Factors of this equation correspong to different groups of
 // conjugate expansions
-proc minEqNewton(poly f, int slN, int slD)
+static proc minEqNewton(poly f, int slN, int slD)
 {
   intvec v = slD, slN;
@@ -996 +1052 @@
     je = jet(f, d, v);
   }
-  je = divideBy(je, var(1))[1];
-  je = divideBy(je, var(2))[1];
+  je = Integralbasis::divideBy(je, var(1))[1];
+  je = Integralbasis::divideBy(je, var(2))[1];
   return(je);
 }
@@ -1006 +1062 @@
 // (it will call splitring and replace the parameter, so if a,b,c,o
 // are in use, it will give an error as in splitring)
-proc splitringParname(poly f, string varName, list #)
+static proc splitringParname(poly f, string varName, list #)
 {
   def R = basering;
-  def S = splitRingAt(f, #);
+  def S = Integralbasis::splitRingAt(f, #);
   //def S = splitring(f, #);
   setring S;
@@ -1032 +1088 @@
 
 // Sum a same number to all elements in the list of integers
-proc sum2All(list l, int k)
+static proc sum2All(list l, int k)
 {
   for(int i = 1; i <= size(l); i++)

Singular/singular-libs

@@ -50 +50 @@
         numerAlg.lib numerDecom.lib \
         olga.lib orbitparam.lib \
-        parallel.lib polyclass.lib polymake.lib polybori.lib puiseux.lib \
+        parallel.lib polyclass.lib polymake.lib polybori.lib \
+        puiseuxexpansion.lib \
         realizationMatroids.lib resources.lib \
         rootisolation.lib rwalk.lib rstandard.lib \

doc/NEWS.texi

@@ -33 +33 @@
 @itemize
 @item sagbigrob.lib: Sagbi-Groebner basis of an ideal of a subalgebra (@nref{sagbigrob_lib})
-@item puiseux.lib: Puiseux expansions over algebraic extensions (@nref{puiseux_lib})
+@item puiseuxexpansion.lib: Puiseux expansions over algebraic extensions (@nref{puiseuxexpansioni_lib})
 @end itemize