Changeset a9cf54 in git

Timestamp:

May 10, 2000, 2:56:13 PM (23 years ago)

Author:

Gerhard Pfister <pfister@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b15ad03af9e72370358f8fc319adab20d9bb7b3f

Parents:

84d6c3acfb225a96db6c41d288dc83808f18b486

Message:

bug in equidim gefixed


git-svn-id: file:///usr/local/Singular/svn/trunk@4308 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/primdec.lib (modified) (8 diffs)

Singular/LIB/primdec.lib

@@ -1 @@
-// $Id: primdec.lib,v 1.59 2000-05-09 13:26:10 pfister Exp $
+// $Id: primdec.lib,v 1.60 2000-05-10 12:56:13 pfister Exp $
 ///////////////////////////////////////////////////////////////////////////////
 // primdec.lib                                                               //
@@ -11 +11 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: primdec.lib,v 1.59 2000-05-09 13:26:10 pfister Exp $";
+version="$Id: primdec.lib,v 1.60 2000-05-10 12:56:13 pfister Exp $";
 info="
 LIBRARY: primdec.lib   PROCEDURES FOR PRIMARY DECOMPOSITION
@@ -1774 +1774 @@
   list eq;
   intvec w;
-  int n;
+  int n,ra;
   ideal te=1;
   int a=attrib(i,"isSB");
   int homo=homog(i);
+  if( typeof(attrib(i,"isRadical"))=="int" )
+  {
+     if(attrib(i,"isRadical")==1)
+     { 
+        ra=1;
+     }
+  }
   if(size(#)!=0)
   {
@@ -1808 +1815 @@
   list equ,equi,indep;
   int b;
+  if((size(reduce(te,j))==0)&&(deg(te[1])>0))
+  {
+    setring P;
+    return(eq);
+  }
   if(homo==1)
   {
@@ -1818 +1830 @@
   if ((dim(j)==-1)||(size(j)==0)||(nvars(basering)==1)||(dim(j)==0))
   {
-    if((size(reduce(te,j))==0)&&(deg(te[1])>0))
-    {
-      setring P;
-      return(eq);
-    }
     setring P;
     i=imap(gnir,j);
@@ -1861 +1868 @@
   kill quring;
   list l=minSat(j,h);
-
-  j=std(j,l[2]);
   attrib(l[1],"isSB",1);
+  
+  if(ra==1)
+  {
+     option(returnSB);  
+     j=quotient(j,l[1]);
+     option(noreturnSB);
+     attrib(j,"isSB",1);
+     attrib(j,"isRadical",1);
+  }
+  else
+  {
+     j=std(sat(j,l[1])[1]);  
+  }
   if(size(reduce(te,l[1]))!=0)
   {
     te=intersect(te,l[1]);
     equi=equidim(j,te);  
-    if(dim(l[1])==dim(j))
+    if((dim(l[1])==dim(j))&&(size(equi)>0))
     {
       equi[size(equi)]=intersect(l[1],equi[size(equi)]);
@@ -1946 +1964 @@
   {
     setring P;
-    eq=i;
-    return(eq);
+    return(i);
   }
 
   indep=maxIndependSet(j);
-  string va=string(maxideal(1));
+
   execute "ring gnir1 = ("+charstr(basering)+"),("+indep[1][1]+"),("
                               +indep[1][2]+");";
-  execute "map phi=gnir,"+va+";";
   if(homo==1)
   {
-     ideal j=std(phi(i),hil,w);
+     ideal j=std(imap(gnir,i),hil,w);
   }
   else
   {
-     ideal j=groebner(phi(i));
+     ideal j=groebner(imap(gnir,i));
   }
   string quotring=prepareQuotientring(nvars(basering)-indep[1][3]);
@@ -1973 +1989 @@
      h[n]=leadcoef(j[n]);
   }
-
   setring gnir;
   ideal h=imap(quring,h);
   kill quring;
-
   list l=minSat(j,h);
   equ=l[1];
   attrib(equ,"isSB",1);
-  
+ 
   j=std(j,l[2]);
-
-  equi=equidimMax(j);
-  attrib(equi,"isSB",1);
-
-  if(dim(equ)==dim(equi))
-  {
+  if(dim(equ)==dim(j))
+  {
+    equi=equidimMax(j);
     equ=intersect(equ,equi);
   }