Changeset d08c42 in git

Timestamp:

Sep 11, 2019, 12:08:36 AM (5 years ago)

Author:

Sachin <sachinkm308@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

972221336f146ec8874444749dead4ee4cff5642

Parents:

6f4f9c5f32e92a56440ec018a1ec228b6ae04f2c

Message:

replacing execute with create_ring(7)

Location:

Singular/LIB

Files:

• arcpoint.lib (modified) (1 diff)
• control.lib (modified) (2 diffs)
• dmodvar.lib (modified) (1 diff)
• ehv.lib (modified) (1 diff)
• equising.lib (modified) (5 diffs)
• graal.lib (modified) (2 diffs)
• hnoether.lib (modified) (1 diff)
• mprimdec.lib (modified) (2 diffs)
• primdec.lib (modified) (1 diff)

Singular/LIB/arcpoint.lib

@@ -327 +327 @@
 RETURN:  string, the nth letter of the alphabet"
 {
- string s="ring r=0,("+A_Z("a",n)+"),ds;";
- execute(s);
+ ring r = create_ring(0, "("+A_Z("a",n)+")", "ds");
  return (string(var(n)));
 }

Singular/LIB/control.lib

@@ -774 +774 @@
   string newvars = parstr(basering);
   def save = basering;
-  string NewRing = "ring @NR =" +string(char(basering))+",("+newvars+"),Dp;";
-  execute(NewRing);
+  ring @NR = create_ring("string(char(basering))", "("+newvars+")", "Dp");
   // get params as variables
   // create a list of non-monomials
@@ -838 +837 @@
   string newvars = parstr(basering);
   def save = basering;
-  string NewRing = "ring @NR =(" +string(char(basering))+"),("+newvars+"),Dp;";
-  execute(NewRing);
+  ring @NR = create_ring("("+string(char(basering))+")", "("+newvars+")", "Dp");
   ideal F;
   ideal Den = imap(save,Den);

Singular/LIB/dmodvar.lib

@@ -136 +136 @@
   /* convert an ordering defined in NN variables in the  */
   /* string form into the same ordering in the list form */
-  string st;
-  st = "ring @Z = 0,z(1.." + string(NN) + "),";
-  st = st + ORD + ";";
-  execute(st); kill st;
+  list l2;
+  for (int ii = 1; ii <= NN; ii++)
+  {
+   l2[ii] = "z("+string(ii)+")";
+  }
+  ring @Z = create_ring(0, l2, "ORD");
   list L = ringlist(@Z)[3];
   kill @Z;

Singular/LIB/ehv.lib

@@ -821 +821 @@
   def base = basering;
   j = j[1,size(j)-1];
-  j = "ring @r = (" + charstr(basering) + "),(" + j + "),(" + ordstr(basering) + ");";
-  execute(j);
+  ring @r = create_ring(ringlist(basering)[1], "(" + j + ")", "(" + ordstr(basering) + ")", "no_minpoly");
   ideal J = imap(base,J);
 

Singular/LIB/equising.lib

@@ -346 +346 @@
   int i;
   string helpStr;
+  int ii;
   int nDefParams = nvars(r_old)-2;
 
@@ -352 +353 @@
   if ((npars(basering)==0) and (minPolyStr==""))
   {
-    helpStr = "ring myRing1 ="
-              + string(chara)+ ", (t(1..nDefParams), x, y),("+ ordStr +");";
-    execute(helpStr);
+   list l2;
+   for (ii = 1; ii<= nDefParams; ii++)
+   {
+    l2[ii] = "t("+string(ii)+")";
+   }
+   l2[nDefParams+1] = "x";
+   l2[nDefParams+2] = "y";
+   ring myRing1 = create_ring("string(chara)", l2, "("+ ordStr +")");
   }
   else
@@ -363 +369 @@
       if (minPolyStr<>"")
       {
-        helpStr = "ring myRing1 =
-                 (" + string(chara) + ",a),
-                 (t(1..nDefParams), x, y),(" + ordStr + ");";
-        execute(helpStr);
+        list l3;
+        for (ii = 1; ii<= nDefParams; ii++)
+         {
+          l3[ii] = "t("+string(ii)+")";
+         }
+        l3[nDefParams+1] = "x";
+        l3[nDefParams+2] = "y";
+        ring myRing1 = create_ring("(" + string(chara) + ",a)", l3, "("+ ordStr +")");
 
         execute (minPolyStr);
@@ -372 +382 @@
       else // no minpoly given
       {
-        helpStr = "ring myRing1 =
-                  (" + string(chara) + ",a(1..npars(basering)) ),
-                  (t(1..nDefParams), x, y),(" + ordStr + ");";
-        execute(helpStr);
+        string l6 = "(" + string(chara) + "";
+        for (ii = 1; ii <= npars(basering); ii++)
+        {
+         l6 = l6+",a("+string(ii)+")";
+        }
+        l6 = l6+")";
+        list l7;
+        for (ii = 1; ii<= nDefParams; ii++)
+        {
+         l7[ii] = "t("+string(ii)+")";
+        }
+        l7[size(l7)+1] = "x";
+        l7[size(l7)+1] = "y";
+        ring myRing1 = create_ring(l6, l7, "(" + ordStr + ")");
       }
     }
@@ -399 +419 @@
     {
       ordStr = "(dp("+string(no_b)+"),"+ordStr+")";
-      helpStr = "ring myRing ="
-                + string(chara)+ ", (b(1..no_b), t(1..nDefParams), x, y),"
-                + ordStr +";";
-      execute(helpStr);
+      list l4;
+      for (ii = 1; ii<= no_b; ii++)
+      {
+       l4[ii] = "b("+string(ii)+")";
+      }
+      list l5;
+      for (ii = 1; ii<= nDefParams; ii++)
+      {
+       l5[ii] = "t("+string(ii)+")";
+      }
+      l4 = l4 + l5;
+      l4[size(l4)+1] = "x";
+      l4[size(l4)+1] = "y";
+      ring myRing = create_ring("string(chara)", l4, "ordStr"); 
     }
     else

Singular/LIB/graal.lib

@@ -404 +404 @@
   string ostring = ordstr(basering);
   ostring = ostring[1..size(ostring)-2];
+  int ii;
   list l2;
-  for (int ii = 1; ii <= s; ii++)
+  for (ii = 1; ii <= s; ii++)
   {
    l2[ii] = "Y("+string(ii)+")";
   }
-  l2[s+1] = ringlist(basering)[2];
+  l2 = l2+ringlist(basering)[2];
   ring Q0y = create_ring(ringlist(basering)[1], l2, "(ds(s),c,"+ostring+")", "no_minpoly");
   setring Q0y;
@@ -428 +429 @@
    * construct Ky and sigmainI
    **/
-  execute("ring KKy = ("+charstr(Q0)+"),(Y(1..s),"+varstr(Q0,nvars(Q0))+"),(c,dp(s),dp(1));");
+  list l3;
+  for (ii = 1; ii <= s; ii++)
+  {
+   l3[ii] = "Y("+string(ii)+")";
+  }
+  l3 = l3+ringlist(Q0)[2][nvars(Q0)];
+  ring KKy = create_ring(ringlist(Q0)[1], l3, "(c,dp(s),dp(1))", "no_minpoly");
   poly minpolyOfK = imap(Q0,g(n));
   qring Ky = std(minpolyOfK);

Singular/LIB/hnoether.lib

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

Singular/LIB/mprimdec.lib

@@ -287 +287 @@
                                   // this is also a standard basis in (R[U])[A]
       @A[size(@A)]=")";
-      execute("ring Rloc=("+charstr(basering)+","+@U+",("+@A+",(C,dp);");
+      ring Rloc = create_ring("("+charstr(basering)+","+@U, "("+@A, "(C,dp)");
       module @N=imap(RAU,@N);
       ideal @h;
@@ -673 +673 @@
   module @N=std(imap(BAS,@N));  // this is also a standard basis in (R[U])[A]
   @A[size(@A)]=")";
-  execute("ring Rloc=("+charstr(basering)+","+@U+",("+@A+",(C,dp);");
+  ring Rloc = create_ring("("+charstr(basering)+","+@U, "("+@A, "(C,dp)");
   module @N=imap(RAU,@N);
   kill RAU;

Singular/LIB/primdec.lib

@@ -5273 +5273 @@
       I=std(I);            // the standard basis in (R[U])[A]
       A[size(A)]=")";
-      execute("ring Rloc=("+charstr(basering)+","+U+",("+A+",dp;");
+      ring Rloc = create_ring("("+charstr(basering)+","+U, "("+A, "dp");
       ideal I=imap(RAU,I);
       //"std in lokalisierung:"+newline,I;