Changeset 89005e in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9e20b9f7749f3bf1b809cdfca51f8fdbbc25e754

Parents:

7032db2a39319cc0c7a7814003e93cae02793c5ed78356197b75c5a7efd1896ede6a66356bbb6d94

Message:

Merge branch 'sachinkm308-execute' into spielwiese

Location:

Singular/LIB

Files:

• atkins.lib (modified) (1 diff)
• chern.lib (modified) (5 diffs)
• finvar.lib (modified) (6 diffs)
• hnoether.lib (modified) (2 diffs)

Singular/LIB/atkins.lib

@@ -567 +567 @@
           s3=string(t);
 
-          execute("a1="+s1+";");
-          execute("b1="+s2+";");
-          execute("t1="+s3+";");
+          a1=int(a);
+          b1=int(b);
+          t1=int(t);          
           g1=gcd(gcd(a1,b1),t1 div a1);
           setring C;

Singular/LIB/chern.lib

@@ -201 +201 @@
   }
   ring r@ = create_ring(ringlist(basering)[1], l2, "dp", "no_minpoly"); 
-  execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
-  ideal V=F(V);
-  poly f=F(f);
+  ideal V=fetch(br@,V);
+  poly f=fetch(br@,f);
   int i;
   for(i=1; i<=nV; i++)
@@ -3169 +3168 @@
   l13[size(l13)+1] = "u@";
   ring r@ = create_ring(ringlist(basering)[1], l13, "dp", "no_minpoly");
-  execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
-  ideal I=F(I); // the ideal generated by I in the new ring
+  ideal I=fetch(br@,I); // the ideal generated by I in the new ring
   ideal J(0..n); // define n+1 ideals J(0), ... , J(n)
   // compute the ideal of the Rees algebra of the ideal I:
@@ -3269 +3267 @@
   l14[size(l14)+1] = "u@";
   ring r@ = create_ring(ringlist(basering)[1], l14, "dp", "no_minpoly");
-  execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
-  ideal I=F(I); // the ideal generated by I in the new ring
+  ideal I=fetch(br@,I); // the ideal generated by I in the new ring
   ideal J(0..n); // define n+1 ideals J(0), ... , J(n)
   // compute the ideal of the Rees algebra of the ideal I:
@@ -3404 +3401 @@
   def br@=basering; // remember the base ring
   ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+",homvar@)", "dp", "no_minpoly");
-  execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
-  ideal I=F(I);
+  ideal I=fetch(br@,I);
   ideal J=homog(I, homvar@);
   ideal JJ=J, homvar@;
@@ -3988 +3984 @@
   l15[size(l15)+1] = "u@";
   ring r@ = create_ring(ringlist(basering)[1], l15, "dp", "no_minpoly");
-  execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
-  ideal I=F(I);
+  ideal I=fetch(br@,I);
   ideal J(0..n);
   for(i=1; i<=sz; i++)

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+");"); }

Singular/LIB/hnoether.lib

@@ -2016 +2016 @@
  if (parstr(basering)!="") {
    if (charstr(basering)!=string(char(basering))+","+parstr(basering)) {
-     execute
-      ("ring dazu=("+charstr(basering)+"),z(0.."+string(size(v)-1)+"),ls;");
+     list l2;
+     for (int zz = 0; zz <= size(v)-1; zz++)
+     {
+       l2[size(l2)+1] = "z("+string(zz)+")";
+     }
+     ring dazu = create_ring(ringlist(basering)[1], l2, "ls", "no_minpoly");
    }
    else { ring dazu=char(altring),z(0..size(v)-1),ls; }
@@ -2024 +2028 @@
  def displayring=dazu+altring;
 */
- execute("ring displayring=("+charstr(basering)+"),(z(0.."+string(size(v)-1)+"),"+varstr(basering)+"),(ls("+string(size(v))+"),"+ordstr(basering)+");");
+ list l1;
+ for (int zz = 0; zz <= size(v)-1; zz++)
+ {
+   l1[size(l1)+1] = "z("+string(zz)+")";
+ }
+ list l2=ringlist(basering)[2];
+ l1 = l1 + l2;
+ ring displayring = create_ring(ringlist(basering)[1], l1, "(ls("+string(size(v))+"),"+ordstr(basering)+")", "no_minpoly");
  // End change by T. Keilen
  //////////////////////////////////////////////////////////////