Changeset 374d8e in git

Timestamp:

Jan 20, 2015, 5:35:00 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4e33058a3cced5901e5f2b51d7435047555c71ca

Parents:

cb2f4dcda8e5924cc3380177aa5fd95eca0f231b

Message:

add: addvarsTo/addNvarsTo to ring.lib

Location:

Singular/LIB

Files:

• ring.lib (modified) (3 diffs)
• rinvar.lib (modified) (3 diffs)
• sagbi.lib (modified) (2 diffs)

Singular/LIB/ring.lib

@@ -33 +33 @@
  isQuotientRing(rng)      ring is a qotient ring
  isSubModule(I,J)         check if I is in J as submodule
+
+ changeordTo(r,o)         change the ordering of a ring to a simple one
+ addvarsTo(r,vars,i)      add variables to a ring
+ addNvarsTo(r,N,name,i)   add N variables to a ring
 ";
 
@@ -1113 +1117 @@
 
 proc changeordTo(def r,string o)
+"USAGE:  changeordTo(ring, string s);
+RETURN:  a ring with the oderinging changed to the (simple) ordering s
+EXAMPLE: example changeordTo(); shows an example
+"
 {
   list rl=ringlist(r);
@@ -1121 +1129 @@
 example
 {
+  "EXAMPLE:"; echo = 2;
   ring r=0,(x,y),lp;
-  def rr=changeordToCdp(r,"dp");
+  def rr=changeordTo(r,"dp");
   rr;
 }
 
+proc addvarsTo(def r,list vars,int blockorder)
+"USAGE:  addvarsTo(ring,list_of_strings, int);
+         int may be: 0:ordering: dp
+                     1:ordering dp,dp
+                     2:oring.ordering,dp
+RETURN:  a ring with the addtional variables
+EXAMPLE: example addvarsTo(); shows an example
+"
+{
+  list rl=ringlist(r);
+  int n=nvars(r);
+  rl[2]=rl[2]+vars;
+  if (blockorder==0)
+  {
+    rl[3]=list(list("C",0),list("dp",1:(nvars(r)+size(vars))));
+  }
+  else
+  {
+    if (blockorder==2)
+    {
+      rl[3]=rl[3]+list(list("dp",1:size(vars)));
+    }
+    else
+    {
+      rl[3]=list(list("C",0),list("dp",1:nvars(r)),list("dp",1:size(vars)));
+    }
+  }
+  def rr=ring(rl);
+  return(rr);
+}
+example
+{
+  "EXAMPLE:"; echo = 2;
+  ring r=0,(x,y),lp;
+  def rr=addvarsTo(r,list("a","b"),0);
+  rr; kill rr;
+  def rr=addvarsTo(r,list("a","b"),1);
+  rr; kill rr;
+  def rr=addvarsTo(r,list("a","b"),2);
+  rr;
+}
+proc addNvarsTo(def r,int N,string n,int blockorder)
+"USAGE:  addNvarsTo(ring,int N, string name, int b);
+         b may be: 0:ordering: dp
+                   1:ordering dp,dp
+                   2:oring.ordering,dp
+RETURN:  a ring with N addtional variables
+EXAMPLE: example addNvarsTo(); shows an example
+"
+{
+  list v;
+  for(int i=N;i>0;i--) { v[i]=n+"("+string(i)+")"; }
+  return(addvarsTo(r,v,blockorder));
+}
+example
+{
+  "EXAMPLE:"; echo = 2;
+  ring r=0,(x,y),lp;
+  def rr=addNvarsTo(r,2,"@",0);
+  rr; kill rr;
+  def rr=addNvarsTo(r,2,"@",1);
+  rr; kill rr;
+  def rr=addNvarsTo(r,2,"@",2);
+  rr;
+}

Singular/LIB/rinvar.lib

@@ -34 +34 @@
 LIB "elim.lib";
 LIB "zeroset.lib";
+LIB "ring.lib";
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -286 +287 @@
   int i, dbPrt, nrNewVars;
   intvec wt, wth, hs1;
-  string ringSTR1, ringSTR2, order;
-
   def RARB = basering;
-  nrNewVars = size(F);
+  nrNewVars = ncols(F);
 
   dbPrt = printlevel-voice+2;
@@ -299 +298 @@
 
   string @mPoly = string(minpoly);
-  order = "(dp(" + string(nvars(basering)) + "), dp);";
-  ringSTR1 = "ring RAR1 = (" + charstr(basering) + "), (" + varstr(basering) + ", Y(1.." + string(nrNewVars) + ")), " + order;
-  ringSTR2 = "ring RAR2 = (" + charstr(basering) + "), Y(1.." + string(nrNewVars) + "), dp;";
-  execute(ringSTR1);
-  execute("minpoly = number(" + @mPoly + ");");
+  def RAR1=addNvarsTo(basering,nrNewVars,"Y",1); setring RAR1;
+  string ringSTR2 = "ring RAR2 = (" + charstr(basering) + "), Y(1.." + string(nrNewVars) + "), dp;";
 
   ideal I, J1, J2, Fm;

Singular/LIB/sagbi.lib

@@ -31 +31 @@
 LIB "toric.lib";
 LIB "algebra.lib";
+LIB "ring.lib";
 //////////////////////////////////////////////////////////////////////////////
 
@@ -1111 +1112 @@
 
     //------------- change the basering bsr to bsr[@(0),...,@(z)] ----------
-    execute("ring s=("+charstr(basering)+"),("+varstr(basering)+",@(0..z)),dp;");
+    def s=addNvarsTo(basering,z+1,,"@",0); setring s;
     // Ev hier die Reihenfolge der Vars aendern. Dazu muss unten aber entsprechend
     // geaendert werden: