Changeset 7a34bd in git

Timestamp:

Aug 13, 2019, 11:33:07 AM (5 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

5718c92447c4b2fbefa062bd04f7931fa74f74f8

Parents:

3fd81b1df73f61ec1bba8aa42feb184260ea27c3

Message:

Revert "bug: create_ring in tropicalLifting"

This reverts commit 4afedc31e655bd54e5f31232d2e6044d42600468.

File:

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

Singular/LIB/tropical.lib

@@ -344 +344 @@
   else
   {
-    execute("ring BASERING=("+charstr(ALTERRING)+"),(t,x(1.."+string(nvars(ALTERRING)-1)+")),("+ordstr(ALTERRING)+");");
+    ring BASERING = create_ring(ringlist(ALTERRING)[1], "(t,x(1.."+string(nvars(ALTERRING)-1)+"))", "("+ordstr(ALTERRING)+")", "no_minpoly");
   }
   map altphi=ALTERRING,maxideal(1);
@@ -497 +497 @@
   if (iszerodim==0) // do so only if is_dim_zero is not set
   {
-    execute("ring QUOTRING=("+charstr(basering)+",t),("+string(variablen)+"),dp;");
+    ring QUOTRING = create_ring("("+charstr(basering)+",t)", "("+string(variablen)+")", "dp");
     ideal i=groebner(imap(GRUNDRING,i));
     int dd=dim(i);
@@ -3644 +3644 @@
   CHARAKTERISTIK=CHARAKTERISTIK[1..size(CHARAKTERISTIK)-2];
   def BASERING=basering;
-  execute("ring INITIALRING=("+CHARAKTERISTIK+"),("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring INITIALRING = create_ring("("+CHARAKTERISTIK+")", "("+varstr(basering)+")", "("+ordstr(basering)+")");
   list l=solve(imap(BASERING,i));
   l;
@@ -3952 +3952 @@
   }
   def BASERING=basering;
-  execute("ring QUOTRING=("+charstr(basering)+",t),("+string(variablen)+"),dp;");
+  ring QUOTRING = create_ring("("+charstr(basering)+",t)", "("+string(variablen)+")", "dp");
   ideal i=subst(imap(BASERING,i),var(j-1),t^(-wj)*var(j-1));
   for (k=1;k<=size(i);k++)
@@ -4014 +4014 @@
                              // (needed for the initial-monomial-check later
   }
-  execute("ring QUOTRING=("+charstr(basering)+",t),("+string(variablen)+"),dp;");
+  ring QUOTRING = create_ring("("+charstr(basering)+",t)", "("+string(variablen)+")", "dp");
   setring BASERING;
   // change to quotring where we want to compute the primary decomposition of i
@@ -5160 +5160 @@
   if (anzahlvariablen<nvars(basering))
   {
-    execute("ring TINRING=("+charstr(basering)+","+string(Parameter)+"),("+string(variablen)+"),dp;");
+    ring TINRING = create_ring("("+charstr(basering)+","+string(Parameter)+")", "("+string(variablen)+")", "dp");
   }
   else
@@ -5185 +5185 @@
   string PMet=string(par(1));
   def BASERING=basering;
-  execute("ring r=0,"+PMet+",ls;");
+  ring r = create_ring(0, PMet, "ls");
   execute("poly denomi="+denom+";");
   execute("poly numer="+num+";");
@@ -5551 +5551 @@
       setring LIFTRing;
       poly mp=minpoly;
-      execute("ring TESTRing=("+charstr(LIFTRing)+"),("+varstr(BASERING)+"),dp;");
+      ring TESTRing = create_ring(ringlist(LIFTRing)[1], "("+varstr(BASERING)+")", "dp", "no_minpoly");
       minpoly=number(imap(LIFTRing,mp));
       ideal i=imap(BASERING,i);
@@ -5718 +5718 @@
         {
           // pass to a ring which has variables which are suitable for gfan
-          execute("ring GFANRING=("+string(char(basering))+"),(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z),dp;");
+          ring GFANRING = create_ring(string(char(basering)), "(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z)", "dp");
           ideal phiideal=b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z;
           phiideal[nvars(PREGFANRING)]=a; // map t to a
@@ -5934 +5934 @@
         if (anzahlvariablen<nvars(basering))
         {
-          execute("ring PARARing=("+string(char(basering))+",@a),t,ls;");
+          ring PARARing = create_ring("("+string(char(basering))+",@a)", "t", "ls");
           minpoly=number(imap(PREGFANRING,m));
         }
         else
         {
-          execute("ring PARARing=("+charstr(basering)+"),t,ls;");
+          ring PARARing = create_ring(ringlist(basering)[1], "t", "ls", "no_minpoly");
         }
         ideal PARA; // will contain the parametrisation
@@ -6200 +6200 @@
         else
         {
-          execute("ring SATURATERING=("+charstr(basering)+"),("+varstr(basering)+"),("+ordstr(basering)+");");
+          ring SATURATERING = create_ring(ringlist(basering)[1], "("+varstr(basering)+")", "("+ordstr(basering)+")", "no_minpoly");
           ideal i=imap(BASERING,i);
           export(i);
@@ -6341 +6341 @@
   // - the variable t is superflous,
   // the variable @a is not if it was already present
-  execute("ring INITIALRING=("+charstr(basering)+"),("+string(variablen)+"),dp;");
+  ring INITIALRING = create_ring(ringlist(basering)[1], "("+string(variablen)+")", "dp", "no_minpoly");
   ideal ini=imap(BASERING,ini);
   // compute the minimal associated primes of the
@@ -6367 +6367 @@
       // define the extension ring which contains
       // the new variable @a, if it is not yet present
-      execute("ring EXTENSIONRING=("+charstr(BASERING)+"),("+string(imap(BASERING,variablen))+",@a,"+tvar+"),(dp("+string(anzahlvariablen-1)+"),dp(1),lp(1));");
+      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+string(imap(BASERING,variablen))+",@a,"+tvar+")", "(dp("+string(anzahlvariablen-1)+"),dp(1),lp(1))", "no_minpoly");
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable
@@ -6378 +6378 @@
     else // @a was already present in the BASERING or no
     { // field extension is necessary
-      execute("ring EXTENSIONRING=("+charstr(BASERING)+"),("+varstr(BASERING)+"),("+ordstr(BASERING)+");");
+      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+varstr(BASERING)+")", "("+ordstr(BASERING)+")", "no_minpoly");
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable
@@ -7255 +7255 @@
 {
   def BASERING=basering;
-  execute("ring INTERRING=0,("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring INTERRING = create_ring(0, "("+varstr(basering)+")", "("+ordstr(basering)+")");
   poly n=imap(BASERING,n);
-  execute("ring REALRING=(real,50,100),("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring REALRING = create_ring("(real,50,100)", "("+varstr(basering)+")", "("+ordstr(basering)+")");
   map phi=INTERRING,maxideal(1);
   string s=string(phi(n));
@@ -7873 +7873 @@
   {
     def BASERING=basering;
-    execute("ring TRING="+string(char(BASERING))+",t,ds;");
+    ring TRING = create_ring(string(char(BASERING)), "t", "ds");
     poly hn=imap(BASERING,hn);
     poly c4=imap(BASERING,c4);