Changeset 7e30dd in git

Timestamp:

Mar 5, 2001, 5:41:49 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

3be21912509b9d0d48aa864b1627f831fad50bf6

Parents:

07a268cace99ce7229a8b6c651fab8f17e3e5931

Message:

*mschulze: pMinDeg, idMinDeg, pJetW


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

Location:

Singular

Files:

• ideals.cc (modified) (3 diffs)
• ideals.h (modified) (2 diffs)
• polys.h (modified) (2 diffs)
• polys1.cc (modified) (5 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.123 2001-02-27 18:06:34 mschulze Exp $ */
+/* $Id: ideals.cc,v 1.124 2001-03-05 16:41:47 mschulze Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2905 +2905 @@
 }
 
-int idMinDegW(ideal M,intvec *w)
+int idMinDeg(ideal M,intvec *w)
 {
   int d=-1;
   for(int i=0;i<IDELEMS(M);i++)
   {
-    int d0=pMinDegW(M->m[i],w);
+    int d0=pMinDeg(M->m[i],w);
     if(-1<d0&&(d0<d||d==-1))
       d=d0;
@@ -2917 +2917 @@
 }
 
-ideal idSeries(int n,ideal M,matrix U=NULL)
+ideal idSeries(int n,ideal M,matrix U=NULL,intvec *w=NULL)
 {
   for(int i=IDELEMS(M)-1;i>=0;i--)
   {
     if(U==NULL)
-      M->m[i]=pSeries(n,M->m[i]);
+      M->m[i]=pSeries(n,M->m[i],NULL,w);
     else
     {
-      M->m[i]=pSeries(n,M->m[i],MATELEM(U,i+1,i+1));
+      M->m[i]=pSeries(n,M->m[i],MATELEM(U,i+1,i+1),w);
       MATELEM(U,i+1,i+1)=NULL;
     }

Singular/ideals.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.h,v 1.33 2001-02-27 18:06:34 mschulze Exp $ */
+/* $Id: ideals.h,v 1.34 2001-03-05 16:41:48 mschulze Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -129 +129 @@
 ideal   idJet(ideal i,int d);
 ideal   idJetW(ideal i,int d, intvec * iv);
-int idMinDegW(ideal M,intvec *w);
-ideal   idSeries(int n,ideal M,matrix U=NULL);
+int idMinDeg(ideal M,intvec *w=NULL);
+ideal   idSeries(int n,ideal M,matrix U=NULL,intvec *w=NULL);
 
 BOOLEAN idIsZeroDim(ideal i);

Singular/polys.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.h,v 1.55 2001-02-27 18:06:35 mschulze Exp $ */
+/* $Id: polys.h,v 1.56 2001-03-05 16:41:49 mschulze Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate polynomials of the
@@ -403 +403 @@
 poly      pJet(poly p, int m);
 poly      ppJetW(poly p, int m, short * iv);
-int pMinDegW(poly p,intvec *w);
-poly      pSeries(int n,poly p,poly u=NULL);
-poly      pInvers(int n, poly p);
+poly      pJetW(poly p, int m, short * iv);
+int pMinDeg(poly p,intvec *w=NULL);
+poly      pSeries(int n,poly p,poly u=NULL,intvec *w=NULL);
+poly      pInvers(int n, poly p,intvec *w=NULL);
 // maximum weigthed degree of all monomials of p, w is indexed from
 // 1..pVariables

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.65 2001-02-27 18:06:35 mschulze Exp $ */
+/* $Id: polys1.cc,v 1.66 2001-03-05 16:41:48 mschulze Exp $ */
 
 /*
@@ -1158 +1158 @@
   poly t=NULL;
   short *wsave=ecartWeights;
-
   ecartWeights=w;
-
   while (p!=NULL)
   {
@@ -1185 +1183 @@
 }
 
-int pMinDegW(poly p,intvec *w)
+poly pJetW(poly p, int m, short *w)
+{
+  poly t=NULL;
+  short *wsave=ecartWeights;
+  ecartWeights=w;
+  while((p!=NULL) && (totaldegreeWecart(p)>m)) pLmDelete(&p);
+  if (p==NULL) return NULL;
+  poly r=p;
+  while (pNext(p)!=NULL)
+  {
+    if (totaldegreeWecart(pNext(p))>m)
+    {
+      pLmDelete(&pNext(p));
+    }
+    else
+      pIter(p);
+  }
+  ecartWeights=wsave;
+  return r;
+}
+
+int pMinDeg(poly p,intvec *w=NULL)
 {
   if(p==NULL)
     return -1;
-  int n=0;
-  if(w!=NULL)
-    n=w->length();
-  if(pVariables<n)
-    n=pVariables;
   int d=-1;
   while(p!=NULL)
   {
     int d0=0;
-    for(int j=0;j<n;j++)
-      d0+=(*w)[j]*pGetExp(p,j+1);
+    for(int j=0;j<pVariables;j++)
+      if(w==NULL||j>=w->length())
+        d0+=pGetExp(p,j+1);
+      else
+        d0+=(*w)[j]*pGetExp(p,j+1);
     if(d0<d||d==-1)
       d=d0;
@@ -1207 +1224 @@
 }
 
-poly pSeries(int n,poly p,poly u=NULL)
-{
+poly pSeries(int n,poly p,poly u=NULL,intvec *w=NULL)
+{
+  short *ww=iv2array(w);
   if(p!=NULL)
   {
     if(u==NULL)
-      p=pJet(p,n);
+      p=pJetW(p,n,ww);
     else
-      p=pJet(pMult(p,pInvers(n-pTotaldegree(p),u)),n);
-  }
+      p=pJetW(pMult(p,pInvers(n-pMinDeg(p,w),u,w)),n,ww);
+  }
+  omFreeSize((ADDRESS)ww,(pVariables+1)*sizeof(short));
   return p;
 }
 
-poly pInvers(int n,poly u)
-{
+poly pInvers(int n,poly u,intvec *w)
+{
+  short *ww=iv2array(w);
   if(n<0)
     return NULL;
@@ -1227 +1247 @@
   if(n==0)
     return v;
-  poly u1=pJet(pSub(pOne(),pMult_nn(u,u0)),n);
+  poly u1=pJetW(pSub(pOne(),pMult_nn(u,u0)),n,ww);
   if(u1==NULL)
     return v;
   poly v1=pMult_nn(pCopy(u1),u0);
   v=pAdd(v,pCopy(v1));
-  for(int i=n/pTotaldegree(u1);i>1;i--)
-  {
-    v1=pJet(pMult(v1,pCopy(u1)),n);
+  for(int i=n/pMinDeg(u1,w);i>1;i--)
+  {
+    v1=pJetW(pMult(v1,pCopy(u1)),n,ww);
     v=pAdd(v,pCopy(v1));
   }
   pDelete(&u1);
   pDelete(&v1);
+  omFreeSize((ADDRESS)ww,(pVariables+1)*sizeof(short));
   return v;
 }