Changeset 360741 in git for Singular/LIB/zeroset.lib

Timestamp:

Jan 21, 2020, 4:38:40 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

f47408b1fbaa5550e599a333fbef837cbffa286d

Parents:

b262f1218ae1112aa4dde91dcd16243c0b6acfeecbf01b413214dc520717e4af698cf40a2a2954e4

Message:

Merge branch 'sachinkm308-execute' into spielwiese

File:

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

Singular/LIB/zeroset.lib

@@ -421 +421 @@
   int n = nvars(basering);
   def RINB = basering;
-  string ringSTR = "ring RINR = 0, " + string(var(n)) + ", dp;";
-  execute(ringSTR);        // new ring = Q[a]
+  ring RINR = create_ring(0, string(var(n)), "dp");       // new ring = Q[a]
 
   list gcdList;
@@ -637 +636 @@
   if(npars(basering) == 0) { @parName = "0";}
   else { @parName = "(0, " + parstr(basering) + ")"; }
-  @str = "ring @RGCD = " + @parName + ", " + string(var(varIndex)) + ", dp;";
-  execute(@str);
+  ring @RGCD = create_ring(@parName, string(var(varIndex)), "dp");
   if(@mp != "0") { execute ("minpoly = " + @mp + ";"); }
   execute("poly @f = " + @sf + ";");
@@ -717 +715 @@
   g = f;
 
-  ringSTR = "ring SNRM1 = 0, " + string(var(1)) + ", dp;";  // univariate ring
-  execute(ringSTR);
+  ring SNRM1 = create_ring(0, string(var(1)), "dp");     // univariate ring
   poly N, N1, h;        // N, N1 do not contain 'a', use built-in gcd
   h = gcd(imap(SNRMB, N), imap(SNRMB, N1));
@@ -1100 +1097 @@
       // create univariate ring
 
-      ringSTR = "ring RIS1 = 0, (" + string(var(vars[1])) + ", " + string(var(n+1)) + "), lp;";
-      execute(ringSTR);
+      ring RIS1 = create_ring(0, "(" + string(var(vars[1])) + ", " + string(var(n+1)) + ")", "lp");
       ideal mpoly = std(imap(NLZR, mpoly));
       list roots;
@@ -1405 +1401 @@
     minPoly = string(minpoly);
   }
-  ringSTR = "ring TR = 0, (" + varstr(basering) + "," + parName + "), lp;";
-
-  execute(ringSTR);
+  ring TR = create_ring(0, "(" + varstr(basering) + "," + parName + ")", "lp");
   execute("ideal mpoly = std(" + minPoly + ");");
   export(mpoly);
@@ -1444 +1438 @@
   varString = varString + string(var(n-1));
 
-  ringSTR = "ring TR = " + parName + ", (" + varString + "), lp;";
-  execute(ringSTR);
+  ring TR = create_ring(parName, "(" + varString + ")", "lp");
   if(MP) { minpoly = number(imap(BR, mpoly)[1]); }
   setring BR;