Changeset 409dbae in git

Timestamp:

Aug 13, 2001, 1:40:58 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

be1d412d2c7e4f64347b834e72628fc8d354858b

Parents:

891438c7813df48556c4efdb0148577dddef063b

Message:

*mschulze: bug fixed


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

File:

• Singular/LIB/gaussman.lib (modified) (19 diffs)

Singular/LIB/gaussman.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: gaussman.lib,v 1.49 2001-08-09 08:39:54 mschulze Exp $";
+version="$Id: gaussman.lib,v 1.50 2001-08-13 11:40:58 mschulze Exp $";
 category="Singularities";
 
@@ -377 +377 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-static proc maxorddif(matrix H)
-{
-  int i,j,d;
-  int d0,d1=-1,-1;
-  for(i=nrows(H);i>=1;i--)
-  {
-    for(j=ncols(H);j>=1;j--)
-    {
-      d=ord(H[i,j]);
-      if(d>=0)
-      {
-        if(d0<0||d<d0)
-        {
-          d0=d;
-        }
-        if(d1<0||d>d1)
-        {
-          d1=d;
-        }
-      }
-    }
-  }
-  return(d1-d0);
-}
-///////////////////////////////////////////////////////////////////////////////
-
 proc monodromy(poly t,list #)
-"USAGE:    monodromy(t[,opt]); poly t[, int opt]
+"USAGE:    monodromy(t[,opt]); poly t, int opt
 ASSUME:   basering with characteristic 0 and local degree ordering,
           t with isolated singularity at 0
 RETURN:
 @format
-if opt=0:
+if opt<=0:
 list l:
   ideal l[1]: exp(-2*pi*i*l[1]) are the eigenvalues of the monodromy
-if opt=1:
+if opt>=1:
 list l: Jordan data jordan(M) of a monodromy matrix exp(-2*pi*i*M)
 default: opt=1
@@ -438 +412 @@
   ideal r=gmspoly*gmsbasis;
   list l;
-  matrix U=freemodule(mu);
   matrix A0[mu][mu],C;
   module H,H1=freemodule(mu),freemodule(mu);
@@ -448 +421 @@
     dbprint(printlevel-voice+2,"// k="+string(k));
     dbprint(printlevel-voice+2,"// compute matrix A of t");
-    if(opt==0)
+    if(opt<=0)
     {
       l=gmscoeffs(r,k,mu);
@@ -468 +441 @@
   dbprint(printlevel-voice+2,"// compute basis of saturation of H''");
   H=std(H0);
-  int d0=maxorddif(H)/deg(s);
+  int d0=maxdeg1(H);
   dbprint(printlevel-voice+2,"// k="+string(d0+1));
   dbprint(printlevel-voice+2,"// compute matrix A of t");
-  if(opt==0)
+  if(opt<=0)
   {
     l=gmscoeffs(r,d0+1,d0+1);
@@ -477 +450 @@
   else
   {
-    l=gmscoeffs(r,d0+1,d0+1+n);
+    l=gmscoeffs(r,d0+1,d0+n+1);
   }
   C,r=l[1..2];
@@ -492 +465 @@
   dbprint(printlevel-voice+2,"// m="+string(m));
 
-  if(opt==0)
+  if(opt<=0)
   {
     setring(R);
@@ -503 +476 @@
   dbprint(printlevel-voice+2,"// d1="+string(d1));
 
+  module U;
   if(d1>0)
   {
@@ -625 +599 @@
 
 proc sppairs(poly t,list #)
-"USAGE:    sppairs(t[,opt]); poly t[, int opt]
+"USAGE:    sppairs(t[,opt]); poly t, int opt
 ASSUME:   basering with characteristic 0 and local degree ordering,
           t with isolated singularity at 0
@@ -663 +637 @@
   ideal r=gmspoly*gmsbasis;
   list l;
-  matrix U=freemodule(mu);
   matrix A0[mu][mu],C;
   module H0;
@@ -673 +646 @@
     dbprint(printlevel-voice+2,"// k="+string(k));
     dbprint(printlevel-voice+2,"// compute matrix A of t");
-    l=gmscoeffs(r,k,mu+n);
+    if(opt<=0)
+    {
+      l=gmscoeffs(r,k,mu);
+    }
+    else
+    {
+      l=gmscoeffs(r,k,mu+n);
+    }
     C,r=l[1..2];
     A0=A0+C;
@@ -686 +666 @@
   dbprint(printlevel-voice+2,"// compute basis of saturation of H''");
   H=std(H0);
-  int d0=maxorddif(H)/deg(s);
+  int d0=maxdeg1(H);
   dbprint(printlevel-voice+2,"// transform H'' to saturation of H''");
   l=division(H,freemodule(mu)*s^k);
@@ -693 +673 @@
   dbprint(printlevel-voice+2,"// k="+string(d0+1));
   dbprint(printlevel-voice+2,"// compute matrix A of t");
-  l=gmscoeffs(r,d0+1,d0+1+n);
+  if(opt<=0)
+  {
+    l=gmscoeffs(r,d0+1,d0+1);
+  }
+  else
+  {
+    l=gmscoeffs(r,d0+1,d0+n+1);
+  }
   C,r=l[1..2];
   A0=A0+C;
@@ -701 +688 @@
 
   int i,j;
-  matrix V;
+  module U,V;
   if(opt<=0)
   {
@@ -820 +807 @@
   }
 
-  dbprint(printlevel-voice+2,"// transform to Jordan basis");
+  dbprint(printlevel-voice+2,"// compute weight filtration basis");
   intvec w0;
   l=jordanbasis(A);
   U,w0=l[1..2];
   V=lift(U,freemodule(mu));
-  A0=V*A*U;
-
-  dbprint(printlevel-voice+2,"// compute weight filtration basis");
+  A0=jet(V*A*U,0);
   vector u;
   i=1;
-  while(i<ncols(A))
+  while(i<ncols(A0))
   {
     j=i+1;
-    while(j<ncols(A)&&A[i,i]==A[j,j])
+    while(j<ncols(A0)&&A0[i,i]==A0[j,j])
     {
       if(w0[i]<w0[j])
@@ -846 +831 @@
       j++;
     }
-    if(j==ncols(A)&&A[i,i]==A[j,j]&&w0[i]<w0[j])
+    if(j==ncols(A0)&&A0[i,i]==A0[j,j]&&w0[i]<w0[j])
     {
       k=w0[i];
@@ -926 +911 @@
   ideal r=gmspoly*gmsbasis;
   list l;
-  matrix U=freemodule(mu);
   matrix A[mu][mu],C;
   module H,H1=freemodule(mu),freemodule(mu);
@@ -951 +935 @@
   dbprint(printlevel-voice+2,"// compute basis of saturation of H''");
   H=std(H0);
-  int d0=maxorddif(H)/deg(s);
+  int d0=maxdeg1(H);
   dbprint(printlevel-voice+2,"// k="+string(d0+N));
   dbprint(printlevel-voice+2,"// compute matrix A of t");
@@ -1202 +1186 @@
   dbprint(printlevel-voice+2,"// compute multiplication in Jacobian algebra");
   list M;
-  matrix U=freemodule(ncols(m));
+  module U=freemodule(ncols(m));
   for(i=ncols(m);i>=1;i--)
   {