Changeset b45eec in git for Singular/LIB/graal.lib

Timestamp:

Apr 19, 2020, 9:57:14 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ffcf715a570941627bf020648e93955f1596f2ef

Parents:

d49a473d44aa25c5ecc3126360ab3179ddb8af7e636fa5455e699fa8c0a820dd60e00a059f96f8ef

Message:

Merge branch 'stable' into lp_Z

File:

• Singular/LIB/graal.lib (modified) (5 diffs)

Singular/LIB/graal.lib

@@ -1 @@
-////////////////////////////////////////////////////////////////////////////
+graalMixed////////////////////////////////////////////////////////////////////////////
 version="version graal.lib 4.1.2.0 Feb_2019 "; // $Id$
 category="Commutative Algebra";
@@ -332 +332 @@
    **/
   ideal H = ringlist(Gr.A)[4];
-  execute("ring Q = "+string(Gr.A)+";");
+  list l3 = ringlist(Gr.A);
+  def Q = ring(l3);
+  setring Q;
   ideal H = fetch(Gr.A,H); H = sort(std(H))[1];
   ideal J = fetch(Gr.A,L) + H; J = sort(std(J))[1];
@@ -358 +360 @@
   else
     { string pars; string vars = varstr(basering); }
-  execute("ring Q0 = ("+charstr(basering)+pars+"),("+vars+"),dp;");
+  ring Q0 = create_ring("("+charstr(basering)+pars+")", "("+vars+")", "dp");
   ideal J0 = imap(Q,J);
   Gr.Q0 = Q0;
@@ -404 +406 @@
   string ostring = ordstr(basering);
   ostring = ostring[1..size(ostring)-2];
-  list l2;
-  for (int ii = 1; ii <= s; ii++)
-  {
-   l2[ii] = "Y("+string(ii)+")";
-  }
-  l2[s+1] = ringlist(basering)[2];
-  execute("ring Q0y = ("+charstr(basering)+"),(Y(1..s),"+varstr(basering)+"),(ds(s),c,"+ostring+")");
+  list l4;
+  for (int zz = 1; zz <= s; zz++)
+  {
+   l4[zz] = "Y("+string(zz)+")";
+  }
+  ring Q0y = create_ring(ringlist(basering)[1], "("+string(l4)+","+varstr(basering)+")", "(ds("+string(s)+"),c,"+ostring+")", "no_minpoly");
   setring Q0y;
   ideal H = imap(Gr.A,H);
@@ -428 +429 @@
    * construct Ky and sigmainI
    **/
-  execute("ring KKy = ("+charstr(Q0)+"),(Y(1..s),"+varstr(Q0,nvars(Q0))+"),(c,dp(s),dp(1));");
+  ring KKy = create_ring(ringlist(Q0)[1], "("+string(l4)+","+varstr(Q0,nvars(Q0))+")", "(c,dp("+string(s)+"),dp(1))", "no_minpoly");
   poly minpolyOfK = imap(Q0,g(n));
   qring Ky = std(minpolyOfK);