Changeset 7d7d24 in git

Timestamp:

Sep 17, 2019, 3:06:21 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

54f7977545741955f5f91b1a913510dfee7e7acd

Parents:

8f5259270995467397bb2f930d7ccf6f7e0688f7972221336f146ec8874444749dead4ee4cff5642

Message:

Merge branch 'sachinkm308-execute' into spielwiese

Location:

Singular/LIB

Files:

• arcpoint.lib (modified) (1 diff)
• control.lib (modified) (2 diffs)
• graal.lib (modified) (2 diffs)
• 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/graal.lib

@@ -358 +358 @@
   else
     { string pars; string vars = varstr(basering); }
-  ring Q0 = create_ring("("+charstr(basering)+pars+")", "("+vars+")", "dp");
+  execute("ring Q0 = ("+charstr(basering)+pars+"),("+vars+"),dp;");
   ideal J0 = imap(Q,J);
   Gr.Q0 = Q0;
@@ -410 +410 @@
   }
   l2[s+1] = ringlist(basering)[2];
-  ring Q0y = create_ring(ringlist(basering)[1], l2, "(ds(s),c,"+ostring+")", "no_minpoly");
+  execute("ring Q0y = ("+charstr(basering)+"),(Y(1..s),"+varstr(basering)+"),(ds(s),c,"+ostring+")");
   setring Q0y;
   ideal H = imap(Gr.A,H);

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;