Changeset 766ae3 in git

Timestamp:

Jan 26, 2015, 6:03:39 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

87a13aa432705563e5a24a51194c2ce8d07ce580

Parents:

f999689a0462639ba7b739684fd5d5bf45a2cab3

Message:

ring definitions for Normal::genus

File:

• Singular/LIB/normal.lib (modified) (3 diffs)

Singular/LIB/normal.lib

@@ -2286 +2286 @@
    if(size(N) < nvars(R0))
    {
-     string newvar=string(N);
-     execute("ring R=("+charstr(R0)+"),("+newvar+"),dp;");
+     list newvar=N[1..ncols(N)];
+     list @rl0=ringlist(R0);
+     @rl0[2]=list(N[1..ncols(N)]);
+     @rl0[3]=list(list("dp",1:ncols(N)),list("C",0));
+     def R=ring(@rl0); kill @rl0;
+     setring R;
      ideal I =imap(R0,I);
-     if((ringlist(R0)[3][1][1]=="dp")&&(size(ringlist(R0)[3])==2))
+     list @rl0=ringlist(R0);
+     if((@rl0[3][1][1]=="dp")&&(size(@rl0[3])==2))
      {
        attrib(I,"isSB",1);
@@ -2297 +2302 @@
        I=std(I);
      }
+     kill @rl0;
    }
    else
@@ -2307 +2313 @@
    if(dim(I)==2)
    {
-      def newR=basering;
+     def newR=basering;
    }
    else
    {
-      short=0;
-      string smp = string(minpoly);
-      if(dim(I)==0)
-      {
-         execute("ring Rhelp=("+charstr(R0)+"),(@s,@t),dp;");
-      }
-      else
-      {
-         execute("ring Rhelp=("+charstr(R0)+"),(@s),dp;");
-      }
-      if (smp!="0")
-      { execute("minpoly = "+smp+";");}
-      def newR=R+Rhelp;
-      setring newR;
-      ideal I=imap(R,I);
-      I=homog(I,@s);
-      attrib(I,"isSB",1);
+     list @rl0=ringlist(R0);
+     if(dim(I)==0)
+     {
+       @rl0[2]=list("@s","@t");
+       @rl0[3]=list(list("dp",1:2),list("C",0));
+     }
+     else
+     {
+       @rl0[2]=list("@s");
+       @rl0[3]=list(list("dp",1),list("C",0));
+     }
+     def Rhelp=ring(@rl0);
+     kill @rl0;
+     def newR=R+Rhelp;
+     setring newR;
+     ideal I=imap(R,I);
+     I=homog(I,@s);
+     attrib(I,"isSB",1);
    }
 
    if((nvars(basering)<=3)&&(size(I)>1))
    {
-       ERROR("This is not equidimensional");
+     ERROR("This is not equidimensional");
    }