Changeset 6e7a34c in git

Timestamp:

Dec 15, 2014, 2:47:22 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

80b6d366c7d9906d194bdb7023d476a11e90d957a52e28861a7384e8117b6cdc93a18273495e071d

Parents:

350269c461fd0afbb2c4d79cc7d38d2793207b12

Message:

ring.lib: changeordTo

Location:

Singular/LIB

Files:

• primdec.lib (modified) (11 diffs)
• ring.lib (modified) (1 diff)

Singular/LIB/primdec.lib

@@ -101 +101 @@
   if(ordstr(basering)[1,2]!="dp")
   {
-    execute("ring @Phelp=("+charstr(@P)+"),("+varstr(@P)+"),(C,dp);");
+    def @Phelp=changeordTo(basering,"dp");
+    setring @Phelp;
     ideal inew=std(imap(@P,id));
     ideal  @h=imap(@P,h);
@@ -1454 +1455 @@
     ready=0;
   }
-  execute( "ring P=("+charstr(R)+"),("+varstr(R)+"),(C,dp);");
+  def P=changeordTo(R,"dp");
+  setring P;
   ideal i=imap(R,i);
   if(npars(basering)==0)
@@ -1875 +1877 @@
 RETURN:  string = to define Kvar(nnp+1),...,var(nvars)[..rest ]
 NOTE:
-EXAMPLE: example independentSet; shows an example
+EXAMPLE: example prepareQuotientring; shows an example
 "
 {
@@ -1915 +1917 @@
    phi;
    setring @Q;
-
 }
 
@@ -2191 +2192 @@
   {
     int di = vdim(i);
-    execute ("ring gnir=("+charstr(P)+"),("+varstr(P)+"),lp;");
+    def gnir=changeordTo(P,"lp");
+    setring gnir;
     ideal J = std(imap(P,i));
     attrib(J, "isSB", 1);
@@ -2318 +2320 @@
   def P=basering;
 
-  execute("ring ir = ("+charstr(basering)+"),("+varstr(basering)+"),(C,lp);");
+  def ir=changeordTo(basering,"lp");
+  setring ir;
   list l=fetch(P,li);
   list @erg;
@@ -2439 +2442 @@
   else
   {
-     execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),dp;");
+     def gnir=changeordTo(basering,"dp");
+     setring gnir;
      ideal i=imap(P,i);
      ideal j=groebner(i);
@@ -2513 +2517 @@
   {
       ERROR(
-      "// Not implemented for this ordering, please change to global ordering."
+      "Not implemented for this ordering, please change to a global ordering."
       );
   }
@@ -2543 +2547 @@
   else
   {
-     execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),dp;");
+     def gnir=changeordTo(basering,"dp");
+     setring gnir;
      ideal i=imap(P,i);
      ideal j=groebner(i);
@@ -2884 +2889 @@
   int lp=islp();
 
-  execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),(C,lp);");
+  def gnir=changeordTo(basering,"lp");
+  setring gnir;
   op=option(get);
   option(redSB);
@@ -3135 +3141 @@
   else
   {
-    execute( "ring @Phelp=("+charstr(gnir)+"),("+varstr(gnir)+"),(C,dp);");
+    def @Phelp=changeordTo(gnir,"dp");
+    setring @Phelp;
   }
 

Singular/LIB/ring.lib

@@ -1112 +1112 @@
 }
 
+proc changeordTo(def r,string o)
+{
+  list rl=ringlist(r);
+  rl[3]=list(list("C",0),list(o,1:nvars(r)));
+  def rr=ring(rl);
+  return(rr);
+}
+example
+{
+  ring r=0,(x,y),lp;
+  def rr=changeordToCdp(r,"dp");
+  rr;
+}
+