Changeset a7c2db in git

Timestamp:

Feb 20, 2002, 4:50:34 PM (21 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

15d67dbe0d26f75f69401431c375a9cc6f137faa

Parents:

900cea1b1461e5dcef8e13aba10034edc5914c65

Message:

*** empty log message ***


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

Location:

Singular

Files:

• eigenval.cc (modified) (8 diffs)
• gms.cc (modified) (4 diffs)

Singular/eigenval.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: eigenval.cc,v 1.9 2002-02-16 18:26:07 mschulze Exp $ */
+/* $Id: eigenval.cc,v 1.10 2002-02-20 15:50:34 mschulze Exp $ */
 /*
 * ABSTRACT: eigenvalues of constant square matrices
@@ -63 +63 @@
           int j=(int)h->Data();
           res->rtyp=MATRIX_CMD;
-          res->data=(void*)evSwap(mpCopy(M),i,j);
+          res->data=(void *)evSwap(mpCopy(M),i,j);
           return FALSE;
         }
@@ -84 +84 @@
 
   for(int l=1;l<=MATCOLS(M);l++)
-    MATELEM(M,i,l)=pSub(MATELEM(M,i,l),pMult(pCopy(p),pCopy(MATELEM(M,j,l))));
+    MATELEM(M,i,l)=pSub(MATELEM(M,i,l),ppMult_qq(p,MATELEM(M,j,l)));
 
   for(int l=1;l<=MATROWS(M);l++)
-    MATELEM(M,l,j)=pAdd(MATELEM(M,l,j),pMult(pCopy(p),pCopy(MATELEM(M,l,i))));
+    MATELEM(M,l,j)=pAdd(MATELEM(M,l,j),ppMult_qq(p,MATELEM(M,l,i)));
 
   pDelete(&p);
@@ -115 +115 @@
             int k=(int)h->Data();
             res->rtyp=MATRIX_CMD;
-            res->data=(void*)evRowElim(mpCopy(M),i,j,k);
+            res->data=(void *)evRowElim(mpCopy(M),i,j,k);
             return FALSE;
           }
@@ -137 +137 @@
 
   for(int l=1;l<=MATROWS(M);l++)
-    MATELEM(M,l,i)=pSub(MATELEM(M,l,i),pMult(pCopy(p),pCopy(MATELEM(M,l,j))));
+    MATELEM(M,l,i)=pSub(MATELEM(M,l,i),ppMult_qq(p,MATELEM(M,l,j)));
 
   for(int l=1;l<=MATCOLS(M);l++)
-    MATELEM(M,j,l)=pAdd(MATELEM(M,j,l),pMult(pCopy(p),pCopy(MATELEM(M,i,l))));
+    MATELEM(M,j,l)=pAdd(MATELEM(M,j,l),ppMult_qq(p,MATELEM(M,i,l)));
 
   pDelete(&p);
@@ -168 +168 @@
             int k=(int)h->Data();
             res->rtyp=MATRIX_CMD;
-            res->data=(void*)evColElim(mpCopy(M),i,j,k);
+            res->data=(void *)evColElim(mpCopy(M),i,j,k);
             return FALSE;
           }
@@ -212 +212 @@
       matrix M=(matrix)h->Data();
       res->rtyp=MATRIX_CMD;
-      res->data=(void*)evHessenberg(mpCopy(M));
+      res->data=(void *)evHessenberg(mpCopy(M));
       return FALSE;
     }
@@ -372 +372 @@
       matrix M=(matrix)h->Data();
       res->rtyp=LIST_CMD;
-      res->data=(void*)evEigenvals(mpCopy(M));
+      res->data=(void *)evEigenvals(mpCopy(M));
       return FALSE;
     }

Singular/gms.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: gms.cc,v 1.5 2002-02-16 13:49:03 mschulze Exp $ */
+/* $Id: gms.cc,v 1.6 2002-02-20 15:50:34 mschulze Exp $ */
 /*
 * ABSTRACT: Gauss-Manin system normal form
@@ -21 +21 @@
 #include "gms.h"
 
+
 lists gmsNF(ideal p,ideal g,matrix B,int D,int K)
 {
   ideal r=idInit(IDELEMS(p),1);
   ideal q=idInit(IDELEMS(p),1);
+
+  matrix B0=mpNew(MATROWS(B),MATCOLS(B));
+  for(int i=1;i<=MATROWS(B0);i++)
+    for(int j=1;j<=MATCOLS(B0);j++)
+      if(MATELEM(B,i,j)!=NULL)
+        MATELEM(B0,i,j)=pDiff(MATELEM(B,i,j),i+1);
+
+  for(int k=0;k<IDELEMS(p);k++)
+  {
+    while(p->m[k]!=NULL&&pGetExp(p->m[k],1)<=K)
+    {
+      int j=0;
+      while(j<IDELEMS(g)&&!pLmDivisibleBy(g->m[j],p->m[k]))
+        j++;
+
+      if(j<IDELEMS(g))
+      {
+        poly m=pDivideM(pHead(p->m[k]),pHead(g->m[j]));
+        p->m[k]=pSub(p->m[k],ppMult_mm(g->m[j],m));
+        pIncrExp(m,1);
+        pSetm(m);
+        for(int i=0;i<MATROWS(B);i++)
+        {
+          poly m0=pDiff(m,i+2);
+          if(MATELEM(B0,i+1,j+1)!=NULL)
+            p->m[k]=pAdd(p->m[k],ppMult_mm(MATELEM(B0,i+1,j+1),m));
+          if(MATELEM(B,i+1,j+1)!=NULL&&m0!=NULL)
+            p->m[k]=pAdd(p->m[k],ppMult_mm(MATELEM(B,i+1,j+1),m0));
+          pDelete(&m0);
+        }
+        pDelete(&m);
+      }
+      else
+      {
+        poly p0=p->m[k];
+        pIter(p->m[k]);
+        pNext(p0)=NULL;
+        r->m[k]=pAdd(r->m[k],p0);
+      }
+
+      while(p->m[k]!=NULL&&pGetExp(p->m[k],1)<=K&&pWTotaldegree(p->m[k])>D)
+      {
+        int i=pGetExp(p->m[k],1);
+        do
+        {
+          poly p0=p->m[k];
+          pIter(p->m[k]);
+          pNext(p0)=NULL;
+          q->m[k]=pAdd(q->m[k],p0);
+        }while(p->m[k]!=NULL&&pGetExp(p->m[k],1)==i);
+      }
+
+      pNormalize(p->m[k]);
+    }
+
+    q->m[k]=pAdd(q->m[k],p->m[k]);
+    p->m[k]=NULL;
+  }
+  idDelete(&p);
+  idDelete((ideal *)&B0);
+
+  idNormalize(r);
+  idNormalize(q);
 
   lists l=(lists)omAllocBin(slists_bin);
@@ -34 +98 @@
   l->m[1].data=q;
 
-  int i,j,k;
-  poly d;
-  for(k=0;k<IDELEMS(p);k++)
-  {
-    while(p->m[k]!=NULL&&pGetExp(p->m[k],1)<=K)
-    {
-      j=0;
-      while(j<IDELEMS(g)&&!pLmDivisibleBy(g->m[j],p->m[k]))
-        j++;
-
-      if(j<IDELEMS(g))
-      {
-        d=pDivideM(pHead(p->m[k]),pHead(g->m[j]));
-        p->m[k]=pSub(p->m[k],pMult(pCopy(d),pCopy(g->m[j])));
-        pSetExp(d,1,pGetExp(d,1)+1);
-        pSetm(d);
-        for(i=0;i<MATROWS(B);i++)
-          p->m[k]=pAdd(p->m[k],
-            pDiff(pMult(pCopy(d),pCopy(MATELEM(B,i+1,j+1))),i+2));
-      }
-      else
-      {
-        r->m[k]=pAdd(r->m[k],pHead(p->m[k]));
-        pDeleteLm(&p->m[k]);
-      }
-
-      while(p->m[k]!=NULL&&pWTotaldegree(p->m[k])>D&&pGetExp(p->m[k],1)<=K)
-      {
-        q->m[k]=pAdd(q->m[k],pHead(p->m[k]));
-        pDeleteLm(&p->m[k]);
-      }
-    }
-
-    q->m[k]=pAdd(q->m[k],pCopy(p->m[k]));
-  }
-
   return l;
 }
+
 
 BOOLEAN gmsNF(leftv res,leftv h)
@@ -97 +126 @@
               int K=(int)h->Data();
               res->rtyp=LIST_CMD;
-              res->data=(void*)gmsNF(idCopy(p),g,B,D,K);
+              res->data=(void *)gmsNF(idCopy(p),g,B,D,K);
               return FALSE;
             }