Changeset 337001 in git

Timestamp:

Aug 15, 2019, 1:43:56 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

43d23c46c518748a9f4fa43d4d8d51ff7fe69354

Parents:

5718c92447c4b2fbefa062bd04f7931fa74f74f8

Message:

fix: create_ring -> ringlist (at some places)

File:

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

Singular/LIB/tropical.lib

@@ -338 +338 @@
   // we change to a ring where the variables have names t and x(1),...,x(n)
   def ALTERRING=basering;
+  list RL=ringlist(ALTERRING);
   if (nvars(basering)==2)
   {
-    ring BASERING = create_ring(ringlist(ALTERRING)[1], "(t,x(1))", "("+ordstr(ALTERRING)+")", "no_minpoly");
+    RL[2]=list("t","x(1)");
+    ring BASERING = ring(RL);
   }
   else
@@ -349 +351 @@
       V[ii+1] = "x("+string(ii)+")";
     }
-    ring BASERING = create_ring(ringlist(ALTERRING)[1], V, "("+ordstr(ALTERRING)+")", "no_minpoly");
+    RL[2]=V;
+    ring BASERING = ring(RL);
   }
   map altphi=ALTERRING,maxideal(1);
@@ -471 +474 @@
   // for this, unfortunately, t has to be the last variable !!!
   ideal variablen;
+  list RL=ringlist(basering);
   for (j=2;j<=nvars(basering);j++)
   {
     variablen=variablen+var(j);
-  }
-  ring GRUNDRING = create_ring(ringlist(basering)[1], "("+string(variablen)+",t)", "(dp("+string(nvars(basering)-1)+"),lp(1))", "no_minpoly");
+    RL[2][j-1]=RL[2][j];
+  }
+  RL[2][size(RL[2])]="t";
+  RL[3]=list(list("dp",1:(nvars(basering)-1)),list("lp",1));
+  ring GRUNDRING = ring(RL);
+  list RL=ringlist(GRUNDRING);
+  list VARIABLEN;
   ideal variablen;
   for (j=1;j<=nvars(basering)-1;j++)
   {
     variablen=variablen+var(j);
+    VARIABLEN[j]=RL[2][j];
   }
   map GRUNDPHI=BASERING,t,variablen;
@@ -502 +512 @@
   if (iszerodim==0) // do so only if is_dim_zero is not set
   {
-    ring QUOTRING = create_ring("("+charstr(basering)+",t)", "("+string(variablen)+")", "dp");
+    RL=ringlist(basering);
+    RL[1]=list(RL[1],list("t"),list(list("lp",1)),ideal(0));
+    RL[2]=VARIABLEN;
+    RL[3]=list(list("dp",1:size(VARIABLEN)));
+    ring QUOTRING = ring(RL);
     ideal i=groebner(imap(GRUNDRING,i));
     int dd=dim(i);
@@ -578 +592 @@
         // from LIFTRING are present,
         // and where also the variables of CUTDOWNRING live
-        ring REPLACEMENTRING = create_ring(ringlist(LIFTRING)[1], "("+varstr(CUTDOWNRING)+")", "dp", "no_minpoly");
+        list RL=ringlist(LIFTRING);
+        list RL2=ringlist(CUTDOWNRING);
+        RL[2]=RL2[2];
+        RL[3]=list(list("dp",1:nvars(CUTDOWNRING)));
+        ring REPLACEMENTRING = ring(RL);
         list repl=imap(CUTDOWNRING,repl); // get the replacement rules
                                           // from CUTDOWNRING
@@ -1074 +1092 @@
       poly mp=minpoly;
       def OLDRING=basering;
-      ring NEWRING = create_ring(0, "("+varstr(basering)+","+parstr(basering)+")", "ds");
+      list RL=ringlist(OLDRING);
+      RL[2]=RL[2]+RL[1][2];
+      RL[1]=RL[1][1];
+      RL[3]=list(list("ds",1:size(RL[2])));
+      ring NEWRING=ring(RL);
       ideal I=imap(OLDRING,mp),imap(OLDRING,f);
     }
@@ -1722 +1744 @@
     {
       string polynomstring=string(f);
-      ring drawring = create_ring("(0,"+parstr(basering)+")", "("+varstr(basering)+")", "dp");
+      list RL=ringlist(basering);
+      RL[1][1]=0;
+      RL[3]=list(list("dp",1:nvars(basering)));
+      ring drawring = ring(RL);
       execute("poly f="+polynomstring+";");
     }
@@ -2642 +2667 @@
   // THIS IS NOT DOCUMENTED FOR THE GENERAL USER!!!!
   def BASERING=basering;
+  list RL=ringlist(BASERING);
+  list VARIABLEN;
   int j;
   if (size(#)>0)
@@ -2647 +2674 @@
     // we first have to move the variable t to the front again
     ideal variablen=var(nvars(basering));
+    VARIABLEN[1]=RL[2][nvars(basering)];
     for (j=1;j<nvars(basering);j++)
     {
       variablen=variablen+var(j);
+      VARIABLEN[j+1]=RL[2][j];
     }
   }
@@ -2655 +2684 @@
   {
     ideal variablen=maxideal(1);
+    VARIABLEN=RL[2];
   }
   // we want to homogenise the ideal i ....
-  ring HOMOGRING = create_ring(ringlist(basering)[1], "(@s,"+string(variablen)+")", "dp", "no_minpoly");
+  RL=ringlist(basering);
+  RL[2]=list("@s")+RL[2];
+  RL[3]=list(list("dp",1:size(RL[2])));
+  ring HOMOGRING = ring(RL);
   ideal i=homog(std(imap(BASERING,i)),@s);
   // ... and compute a standard basis with
@@ -2672 +2705 @@
   }
   intmat O=weightVectorToOrderMatrix(whomog);
-  ring WEIGHTRING = create_ring(ringlist(basering)[1], "("+varstr(basering)+")", "(M("+string(O)+"))", "no_minpoly");
+  list RL=ringlist(basering);
+  RL[3]=list(list("M",O));
+  ring WEIGHTRING = ring(RL);
   // map i to the new ring and compute a GB of i, then dehomogenise i,
   // so that we can be sure, that the
@@ -2679 +2714 @@
   // compute the w-initial ideal with the help of the procedure tInitialForm;
   setring BASERING;
-  ring COMPINIRING = create_ring(ringlist(basering)[1], "("+string(variablen)+")", "dp", "no_minpoly");
+  RL[2]=VARIABLEN;
+  RL[3]=list(list("dp",1:size(VARIABLEN)));
+  ring COMPINIRING = ring(RL);
   ideal i=imap(WEIGHTRING,i);
   ideal ini;
@@ -2716 +2753 @@
   def BASERING=basering;
   intmat O=weightVectorToOrderMatrix(w);
-  ring INITIALRING = create_ring(ringlist(BASERING)[1], "("+varstr(basering)+")", "M("+string(O)+")", "no_minpoly");
+  list RL=ringlist(basering);
+  RL[3]=list(list("M",O));
+  ring INITIALRING = ring(RL);
   poly f=imap(BASERING,f);
   int GRAD=deg(f);
@@ -2789 +2828 @@
   def BASERING=basering;
   intmat O=weightVectorToOrderMatrix(w);
-  ring INITIALRING = create_ring(ringlist(BASERING)[1], "("+varstr(basering)+")", "M("+string(O)+")", "no_minpoly");
+  list RL=ringlist(BASERING);
+  RL[3]=list(list("M",O));
+  ring INITIALRING = ring(RL);
   ideal i=imap(BASERING,i);
   i=std(i);
@@ -3498 +3539 @@
 {
   def BASERING=basering;
-  ring RADRING = create_ring(ringlist(basering)[1], "(@T,"+varstr(basering)+")", "(dp(1),"+ordstr(basering)+")", "no_minpoly");
+  list RL=ringlist(BASERING);
+  RL[2]=list("@T")+RL[2];
+  RL[3]=list(list("dp",1:1))+RL[3];
+  ring RADRING = ring(RL);
   ideal I=ideal(imap(BASERING,i))+ideal(1-@T*imap(BASERING,f));
   if (reduce(1,std(I))==0)
@@ -4012 +4056 @@
   list erglini;
   list ergl;
+  list VARIABLEN;
+  list RL=ringlist(BASERING);
   for (j1=1;j1<=nvars(basering)-1;j1++)
   {
@@ -4018 +4064 @@
     product=product*var(j1); // make product of all variables
                              // (needed for the initial-monomial-check later
-  }
-  ring QUOTRING = create_ring("("+charstr(basering)+",t)", "("+string(variablen)+")", "dp");
+    VARIABLEN[j1]=RL[2][j1];
+  }
+  RL[1]=list(RL[1],list("t"),list(list("lp",1:1)),ideal(0));
+  RL[2]=VARIABLEN;
+  RL[3]=list(list("dp",1:size(VARIABLEN)));
+  ring QUOTRING = ring(RL);
   setring BASERING;
   // change to quotring where we want to compute the primary decomposition of i
@@ -4206 +4256 @@
         variablen=0;
         j2=0;
+        VARIABLEN=list();
         for(j1=1;j1<=nvars(basering)-1;j1++)
         {
@@ -4219 +4270 @@
             variablen=variablen+var(j1); // read the set of remaining variables
                                          // (needed to make quotring later)
+            VARIABLEN=VARIABLEN+list(RL[2][j1]);
           }
         }
         // return pideal, the initial and the list ergl which tells us
         // which variables we replaced by which form
-        ring BASERINGLESS1 = create_ring(ringlist(BASERING)[1], "("+string(variablen)+",t)", "(dp("+string(ncols(variablen))+"),lp(1))", "no_minpoly");
+        RL=ringlist(BASERING);
+        RL[2]=VARIABLEN+list("t");
+        RL[3]=list(list("dp",1:size(VARIABLEN)),list("lp",1:1));
+        ring BASERINGLESS1 = ring(RL);
         ideal i=imap(BASERING,pideal);
         ideal ini=imap(BASERING,pini); //ideal ini2=tInitialIdeal(i,wvecp,1);
@@ -6313 +6368 @@
   def BASERING=basering;
   string tvar=string(var(nvars(basering)));
+  list RL_BASERING=ringlist(BASERING);
+  list TVAR=RL_BASERING[2];
   int j,k,l; // indices
   // store the weighted degrees of the elements of i in an integer vector
@@ -6339 +6396 @@
   // collect the true variables x_1,...,x_n plus @a, if it is defined in BASERING
   ideal variablen;
+  list VARIABLEN;
+  list RL=ringlist(basering);
   for (j=1;j<=nvars(basering)-1;j++)
   {
     variablen=variablen+var(j);
+    VARIABLEN[j]=RL[2][j];
   }
   // move to a polynomial ring with global monomial ordering
   // - the variable t is superflous,
   // the variable @a is not if it was already present
-  ring INITIALRING = create_ring(ringlist(basering)[1], "("+string(variablen)+")", "dp", "no_minpoly");
+  RL[2]=VARIABLEN;
+  RL[3]=list(list("dp",1:size(VARIABLEN)));
+  ring INITIALRING = ring(RL);
   ideal ini=imap(BASERING,ini);
   // compute the minimal associated primes of the
@@ -6362 +6424 @@
   }
   list extensionringlist; // contains the rings which are to be returned
+  list RL;
   for (j=1;j<=size(maximalideals);j++)
   {
@@ -6368 +6431 @@
     // if some of the maximal ideals needs a field extension,
     // then everything will live in this ring
+    RL=ringlist(BASERING);
     if ((maximalideals[j][1]!=0) and (nvars(BASERING)==anzahlvariablen))
     {
       // define the extension ring which contains
       // the new variable @a, if it is not yet present
-      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+string(imap(BASERING,variablen))+",@a,"+tvar+")", "(dp("+string(anzahlvariablen-1)+"),dp(1),lp(1))", "no_minpoly");
+      RL[2]=VARIABLEN+list("@a")+TVAR;
+      RL[3]=list(list("dp",1:(anzahlvariablen-1)),list("dp",1:1),list("lp",1:1));
+      ring EXTENSIONRING = ring(RL);
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable
@@ -6383 +6449 @@
     else // @a was already present in the BASERING or no
     { // field extension is necessary
-      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+varstr(BASERING)+")", "("+ordstr(BASERING)+")", "no_minpoly");
+      ring EXTENSIONRING = ring(RL);
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable