Changeset 9e8ae12 in git

Timestamp:

Dec 11, 2013, 5:45:11 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

e57255411cecb6f684d1e9f8dbe4f0cc670307a9

Parents:

8275a9c69d35539035837ac649f76ebc01f927c0

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-12-11 17:45:11+01:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2013-12-11 17:46:46+01:00

Message:

chg: new version of tropical.lib by thomas

File:

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

Singular/LIB/tropical.lib

@@ -1 @@
-///////////////////////////////////////////////////////////
-version="version tropical.lib 4.0.0.0 Jun_2013 "; // $Id$
+//
+version="$Id$";
 category="Tropical Geometry";
 info="
@@ -204 +204 @@
 LIB "elim.lib";
 LIB "linalg.lib";
-LIB "polymake.lib";
+LIB "oldpolymake.lib";
 LIB "primdec.lib";
 LIB "absfact.lib";
@@ -650 +650 @@
           // pass first to a ring where a and @a
           // are variables in order to use maps
-          string @mp= string(minpoly);
+          poly mp=minpoly;
           ring INTERRING=char(LIFTRING),(t,@a,a),dp;
-          execute("poly mp=" + @mp + ";");
+          poly mp=imap(LIFTRING,mp);
           ideal LIFT=imap(LIFTRING,LIFT);
           kill LIFTRING;
@@ -1012 +1012 @@
   {
     def GLOBALRING=basering;
-    string @mp= string(minpoly);
+    number mp=minpoly;
     execute("ring LOCALRING=("+charstr(basering)+"),("+varstr(basering)+"),ds;");
-    execute("minpoly= " + @mp + ";");
     poly f=imap(GLOBALRING,f);
+    minpoly=imap(GLOBALRING,mp);
   }
   // check if a substitution is necessary
@@ -1049 +1049 @@
     if (minpoly!=0)
     {
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       def OLDRING=basering;
       execute("ring NEWRING=0,("+varstr(basering)+","+parstr(basering)+"),ds;");
-      execute("ideal I = " + @mp + ";");
-      I = I,imap(OLDRING,f);
+      ideal I=imap(OLDRING,mp),imap(OLDRING,f);
     }
     else
@@ -1065 +1064 @@
       w=NewtP[jj]-NewtP[jj+1];
       ggteiler=gcd(w[1],w[2]);
-      zw=w[1]/ggteiler;
-      w[1]=w[2]/ggteiler;
+      zw=w[1] div ggteiler;
+      w[1]=w[2] div ggteiler;
       w[2]=zw;
       // if we have introduced a third variable for the parameter, then w needs a third component
@@ -1134 +1133 @@
     else
     {
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       ring degreering=0,a,dp;
-      execute("poly mp=" + @mp + ";");
+      poly mp=imap(countring,mp);
       numberofbranchesfound=numberofbranchesfound+deg(mp);
       setring countring;
@@ -1158 +1157 @@
    ring r=0,(x,y),ds;
    poly f=x2-y4+x5y7;
-   puiseuxExpansion(puiseuxExpansion(f,3));
+   puiseuxExpansion(f,3,"subst");
+   displayPuiseuxExpansion(puiseuxExpansion(f,3));
 }
 
@@ -1540 +1540 @@
       ggt=gcd(normalvector[1],normalvector[2]);   // the gcd of the entries
       zw=normalvector[2];    // create the outward pointing normal vector
-      normalvector[2]=-normalvector[1]/ggt;
-      normalvector[1]=zw/ggt;
+      normalvector[2]=-normalvector[1] div ggt;
+      normalvector[1]=zw div ggt;
       if (size(#)==0) // we are computing w.r.t. minimum
       {
@@ -2718 +2718 @@
         if(k<>j)  // except the unit vector of the non-zero component
         {
-          intvec u; u[size(w)]=0; u[k]=1;
-          O[r,1..size(w)]=u; r=r+1;
+          intvec u;
+          u[size(w)]=0; 
+          u[k]=1;
+          O[r,1..size(w)]=u; 
+          r=r+1;
+          kill u;
         }
       }
@@ -4708 +4712 @@
         wneu=NewtP[1]-NewtP[2];
         int ggteiler=gcd(wneu[1],wneu[2]);
-        wneu[1]=-wneu[1]/ggteiler;
-        wneu[2]=wneu[2]/ggteiler;
+        wneu[1]=-wneu[1] div ggteiler;
+        wneu[2]=wneu[2] div ggteiler;
         if (wneu[1]>0)
         {
@@ -4807 +4811 @@
   for (jj=1;jj<=anzahlvariablen+numberdeletedvariables-1;jj++)
   {
-    PARA[jj]=(PARA[jj]+a[jj+1])*t^(tw[jj+1]*tweight/ww[1]);
+    PARA[jj]=(PARA[jj]+a[jj+1])*t^(tw[jj+1]*tweight div ww[1]);
   }
   // if we have reached the stop-level, i.e. either
@@ -5353 +5357 @@
     if (koeffizienten[j-ord(p)+1]!=0)
     {
-      if ((j-(N*wj)/w1)==0)
+      if ((j-(N*wj) div w1)==0)
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1]);
       }
-      if (((j-(N*wj)/w1)==1) and (N!=1))
+      if (((j-(N*wj) div w1)==1) and (N!=1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^(1/"+string(N)+")";
       }
-      if (((j-(N*wj)/w1)==1) and (N==1))
+      if (((j-(N*wj) div w1)==1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t";
       }
-      if (((j-(N*wj)/w1)==-1) and (N==1))
+      if (((j-(N*wj) div w1)==-1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t";
       }
-      if (((j-(N*wj)/w1)==-1) and (N!=1))
+      if (((j-(N*wj) div w1)==-1) and (N!=1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^(1/"+string(N)+")";
       }
-      if (((j-(N*wj)/w1)>1) and (N==1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^"+string(j-(N*wj)/w1);
-      }
-      if (((j-(N*wj)/w1)>1) and (N!=1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^("+string(j-(N*wj)/w1)+"/"+string(N)+")";
-      }
-      if (((j-(N*wj)/w1)<-1) and (N==1))
+      if (((j-(N*wj) div w1)>1) and (N==1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^"+string(j-(N*wj) div w1);
+      }
+      if (((j-(N*wj) div w1)>1) and (N!=1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*t^("+string(j-(N*wj) div w1)+"/"+string(N)+")";
+      }
+      if (((j-(N*wj) div w1)<-1) and (N==1))
       {
         dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^"+string(wj-j);
       }
-      if (((j-(N*wj)/w1)<-1) and (N!=1))
-      {
-        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^("+string((N*wj)/w1-j)+"/"+string(N)+")";
+      if (((j-(N*wj) div w1)<-1) and (N!=1))
+      {
+        dp=dp+displaycoef(koeffizienten[j-ord(p)+1])+"*1/t^("+string((N*wj) div w1-j)+"/"+string(N)+")";
       }
       if (j<deg(p))
@@ -5495 +5499 @@
     {
       setring LIFTRing;
-      string @mp= string(minpoly);
+      poly mp=minpoly;
       execute("ring TESTRing=("+charstr(LIFTRing)+"),("+varstr(BASERING)+"),dp;");
-      execute("minpoly= " + @mp + ";");
+      minpoly=number(imap(LIFTRing,mp));
       ideal i=imap(BASERING,i);
     }
@@ -5769 +5773 @@
               wneu=NewtP[jjj]-NewtP[jjj+1];
               int ggteiler=gcd(wneu[1],wneu[2]);
-              wneu[1]=-wneu[1]/ggteiler;
-              wneu[2]=wneu[2]/ggteiler;
+              wneu[1]=-wneu[1] div ggteiler;
+              wneu[2]=wneu[2] div ggteiler;
               if (wneu[1]>0)
               {
@@ -5869 +5873 @@
         {
           execute("ring PARARing=("+string(char(basering))+",@a),t,ls;");
-          minpoly=number(imap(PREGFANRING,m)); // ?
+          minpoly=number(imap(PREGFANRING,m));
         }
         else
@@ -5908 +5912 @@
         for (jjj=1;jjj<=anzahlvariablen+numberdeletedvariables-1;jjj++)
         {
-          PARA[jjj]=(PARA[jjj]+zeros[size(zeros)][jjj+1])*t^(ww[jjj+1]*tweight/ww[1]);
+          PARA[jjj]=(PARA[jjj]+zeros[size(zeros)][jjj+1])*t^(ww[jjj+1]*tweight div ww[1]);
         }
         // delete the last entry in zero, since that one has
@@ -6033 +6037 @@
     {
       I=subst(i,var(lastvar),0);
-      while (subst(I[1],t,0)==0)
+      while ((I[1]!=0) and (subst(I[1],t,0)==0))
       {
         I[1]=I[1]/t;
@@ -6910 +6914 @@
 "USAGE:      intmatcoldelete(w,i); w intmat, i int
 RETURN:      intmat, the integer matrix w with the ith comlumn deleted
-NOTE:        the procedure is called by intmatsort and normalFanL"
+NOTE:        the procedure is called by intmatsort and normalFan"
 {
   if ((i<1) or (i>ncols(w)) or (ncols(w)==1))
@@ -7814 +7818 @@
     poly denom=delta*hn^5;
     poly ggt=gcd(num,denom);
-    num=num/ggt;
-    denom=denom/ggt;
+    num=num div ggt;
+    denom=denom div ggt;
     setring BASERING;
     poly num=imap(TRING,num);