Changeset 78d776 in git

Timestamp:

Mar 19, 2014, 9:01:55 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

35f51c1498caac698f88edaebe09d65cb380aec7

Parents:

706597eca3628b2f2f0d581d93c41b9e6ac6f466b4ccb21068b8fec038ce45006522ec978dbf8324

Message:

Merge pull request #545 from YueRen/spielwiese

chg: new version of tropical.lib by Thomas

File:

• Singular/LIB/tropical.lib (modified) (19 diffs)

Singular/LIB/tropical.lib

@@ -531 +531 @@
   // to start all over again;
   // this is controlled by the while-loop
+  intvec ordnungskontrollvektor=N,-w[2]; // used with the option puiseux
   while (size(liftrings)==0)
   {
@@ -540 +541 @@
     else // use absolute primary decomposition
     {
-      list TP=tropicalparametrise(i,w,ordnung,gfanold,findall,nogfan,puiseux,ini);
+      list TP=tropicalparametrise(i,w,ordnung,ordnungskontrollvektor,gfanold,findall,nogfan,puiseux,ini);
     }
     // compute the liftrings by resubstitution
@@ -731 +732 @@
       w=precutdownw;
 */
-      ~
+
     }
   }
@@ -741 +742 @@
   }
   ///////////////////////////////////////////////////////////
-  if (voice+printlevel>=2)
+  if (printlevel-voice+2>=0)
   {
 
@@ -777 +778 @@
 {
    "EXAMPLE:";
+   int oldprintlevel=printlevel;
+   printlevel=1;
    echo=2;
    ////////////////////////////////////////////////////////
@@ -823 +826 @@
    setring R;
    displayTropicalLifting(LIST,"subst");
+   printlevel=oldprintlevel;
 }
 
@@ -966 +970 @@
 RETURN:  list, where each entry of the list l describes the Newton-Puiseux
 @*             parametrisations of one branch of the plane curve singularity
-@*             at the origin defined by f; only the first n terms of each
+@*             at the origin defined by f; only the terms up to order n of each
 @*             parametetrisation are computed
 @*             l[i][1] = is a ring
@@ -979 +983 @@
            the new base field will have a parameter and a new minimal polynomial,
            and LIFT[2] describes how the old parameter can be computed from the new one
+@*       - if a field extension with minimal polynomial of degree k was necessary,
+           then to the one extension produced acutally k extensions correspond by replacing
+           the parameter a successively by all zeros of the minimal polynomial
 @*       - if the option subst was set l[i][3] contains the polynomial where
            y has been substituted by y(t^{1/N}) as a string
@@ -1155 +1162 @@
    "EXAMPLE:";
    echo=2;
+   printlevel=1;
    ring r=0,(x,y),ds;
    poly f=x2-y4+x5y7;
@@ -4678 +4686 @@
         "AND HIT THE RETURN BUTTON TWICE (!!!) - NOTE, THE LAST 0 IS OMITTED";
         "IF YOU WANT wneu TO BE TESTED, THEN SET goon=0;";
-        ~
+
         // THIS IS NOT NECESSARY !!!! IF WE COMPUTE NOT ONLY THE
         // TROPICAL PREVARIETY
@@ -4687 +4695 @@
           {
             "CHOOSE A DIFFERENT RAY";
-            ~
+
           }
           else
@@ -4724 +4732 @@
       {
         "Set intvec wneu!";
-        ~
+
       }
     }
@@ -5548 +5556 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-static proc tropicalparametrise (ideal i,intvec ww,int ordnung,int gfanold,int findall,int nogfan,int puiseux,list #)
+static proc tropicalparametrise (ideal i,intvec ww,int ordnung,intvec ordnungskontrollvektor,int gfanold,int findall,int nogfan,int puiseux,list #)
 "USAGE:  tropicalparametrise(i,tw,ord,gf,fa,ng,pu[,#]); i ideal, tw intvec, ord int, gf,fa,ng,pu int, # opt. list
 ASSUME:  - i is an ideal in Q[t,x_1,...,x_n,@a], tw=(w_0,w_1,...,w_n,0)
@@ -5620 +5628 @@
   list wneulist; // carries all newly computed weight vector
   intvec wneu;   // carries the newly computed weight vector
+  intvec okvneu; // carries the newly computed ordnungskontrollvektor
   int tweight;   // carries the weight of t
   list PARALIST; // carries the result when tropicalparametrise
@@ -5722 +5731 @@
             "AND HIT THE RETURN BUTTON - NOTE, THE LAST 0 IS OMITTED";
             "IF YOU WANT wneu TO BE TESTED, THEN SET goon=0;";
-            ~
+
             // THIS IS NOT NECESSARY !!!! IF WE COMPUTE NOT ONLY
             // THE TROPICAL PREVARIETY
@@ -5731 +5740 @@
               {
                 "CHOOSE A DIFFERENT RAY";
-                ~
+
               }
               else
@@ -5793 +5802 @@
             {
               "Set wneulist!";
-              ~
+
             }
             else
             {
               "Set intvec wneu!";
-              ~
+
               wneulist[1]=wneu;
             }
@@ -5810 +5819 @@
       // if all variables were deleted, then i=0 and thus anzahlvariablen==0
       lll=0;
-      if ((ordnung>1) and (anzahlvariablen>1))
+      if (((puiseux==0) and (ordnung>1)) or ((puiseux==1) and (ordnungskontrollvektor[2]<ordnungskontrollvektor[1]*ordnung)) and (anzahlvariablen>1))
       {
         partliftings=list(); // initialise partliftings
@@ -5822 +5831 @@
         {
           wneu=wneulist[kk];
-          PARALIST=tropicalparametrise(i,wneu,ordnung-1,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero);
+          okvneu=-ordnungskontrollvektor[1]*wneu[1],-ordnungskontrollvektor[2]*wneu[1]-wneu[2];
+          if (puiseux==0)
+          {
+            PARALIST=tropicalparametrise(i,wneu,ordnung-1,okvneu,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero);
+          }
+          else
+          {
+            PARALIST=tropicalparametrise(i,wneu,ordnung,okvneu,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero);
+          }
           // the output will be a ring, in which the
           // parametrisation lives, and a string, which contains