Changeset 89005e in git for Singular/LIB/finvar.lib

Timestamp:

Jul 4, 2020, 4:54:16 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9e20b9f7749f3bf1b809cdfca51f8fdbbc25e754

Parents:

7032db2a39319cc0c7a7814003e93cae02793c5ed78356197b75c5a7efd1896ede6a66356bbb6d94

Message:

Merge branch 'sachinkm308-execute' into spielwiese

File:

• Singular/LIB/finvar.lib (modified) (6 diffs)

Singular/LIB/finvar.lib

@@ -717 +717 @@
       else
       { chst=chst[i..size(chst)];
-        execute
-        ("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
+        list rl=ringlist(br);
+        if (typeof(rl[1]=="int"))
+        {
+          rl[1]=0;
+        }
+        else
+        {
+          rl[1][1]=0;
+        }  
+        def newring=ring(rl);
+        setring newring;
         
       }
@@ -726 +735 @@
       minp=minp[2..size(minp)-1];
       chst=chst[i..size(chst)];
-      execute("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
+      list rl=ringlist(br);
+      if (typeof(rl[1]=="int"))
+      {
+        rl[1]=0;
+      }
+      else
+      {
+        rl[1][1]=0;
+      }  
+      def newring=ring(rl);
+      setring newring;
       execute("minpoly="+minp);
     }
@@ -1112 +1131 @@
     if (minpoly==0)
     { if (i>size(chst))
-      { execute("ring newring=0,("+varstr(br)+"),("+ordstr(br)+")");
+      { 
+         ring newring = create_ring(0, "("+varstr(br)+")", "("+ordstr(br)+")");
       }
       else
       { chst=chst[i..size(chst)];
-        execute
-        ("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
+        list rl=ringlist(br);
+        if (typeof(rl[1]=="int"))
+        {
+          rl[1]=0;
+        }
+        else
+        {
+          rl[1][1]=0;
+        }  
+        def newring=ring(rl);
+        setring newring; 
       }
     }
@@ -1124 +1153 @@
       minp=minp[2..size(minp)-1];
       chst=chst[i..size(chst)];
-      execute("ring newring=(0"+chst+"),("+varstr(br)+"),("+ordstr(br)+")");
+      list rl=ringlist(br);
+      if (typeof(rl[1]=="int"))
+      {
+        rl[1]=0;
+      }
+      else
+      {
+        rl[1][1]=0;
+      }  
+      def newring=ring(rl);
+      setring newring;  
       execute("minpoly="+minp);
     }
@@ -7172 +7211 @@
     { I[i]=I[i]-y(i); }
     I=elim(I,1..n);
-    execute("ring newring=("+charstr(br)+"),(y(1..m)),dp(m);");
+    list l3;
+    for (int zz = 1; zz <= m; zz++)
+    {
+      l3[zz] = "y("+string(zz)+")";
+    }
+    ring newring = create_ring(ringlist(br)[1], l3, "dp("+string(m)+")", "no_minpoly");
     if (mp!="0")
     { execute("minpoly=number("+mp+");"); }
@@ -7417 +7461 @@
     }
     G=compress(G);
-    execute("ring newring=("+charstr(br)+"),(y(1..m)),lp;");
+    list l4;
+    for (int zz = 1; zz <= m; zz++)
+    {
+      l4[zz] = "y("+string(zz)+")";
+    }
+    ring newring = create_ring(ringlist(br)[1], l4, "lp", "no_minpoly");
     if (mp!="0")
     { execute("minpoly=number("+mp+");"); }