Changeset c98410 in git

Timestamp:

Mar 7, 2002, 7:32:10 PM (21 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

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

Children:

ede4b1438e7649ee4804381c07689bd711015cf2

Parents:

6eb633d64f25992a02dea1e0cd0a21e4cf71a100

Message:

*mschulze: division with 3 args


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

Location:

Singular

Files:

• ideals.cc (modified) (5 diffs)
• ideals.h (modified) (2 diffs)
• iparith.cc (modified) (5 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.128 2002-03-07 16:00:58 mschulze Exp $ */
+/* $Id: ideals.cc,v 1.129 2002-03-07 18:32:09 mschulze Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1886 +1886 @@
 
 /*2
-*computes division of P by Q with remainder up to weighted degree n
+*computes division of P by Q with remainder up to (w-weighted) degree n
 *P, Q, and w are not changed
 */
-lists idLiftW(ideal P, ideal Q, int n, short *w)
+lists idLiftW(ideal P,ideal Q,int n,short *w=NULL)
 {
   int N=0;
   int i;
   for(i=IDELEMS(Q)-1;i>=0;i--)
-    N=max(N,pDegW(Q->m[i],w));
+    if(w==NULL)
+      N=max(N,pDeg(Q->m[i]));
+    else
+      N=max(N,pDegW(Q->m[i],w));
   N+=n;
 
@@ -1902 +1905 @@
   for(i=IDELEMS(P)-1;i>=0;i--)
   {
-    poly p=ppJetW(P->m[i],N,w);
+    poly p;
+    if(w==NULL)
+      p=ppJet(P->m[i],N);
+    else
+      p=ppJetW(P->m[i],N,w);
 
     int j=IDELEMS(Q)-1;
@@ -1910 +1917 @@
       {
         poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
-        p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
+        if(w==NULL)
+          p=pJet(pSub(p,ppMult_mm(Q->m[j],p0)),N);
+        else
+          p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
         pNormalize(p);
-        if(pDegW(p0,w)>n)
+        if(w==NULL&&pDeg(p0)>n||w!=NULL&&pDegW(p0,w)>n)
           pDelete(&p0);
         else
@@ -1925 +1935 @@
           pIter(p);
           pNext(p0)=NULL;
-          if(pDegW(p0,w)>n)
+          if(w==NULL&&pDeg(p0)>n||w!=NULL&&pDegW(p0,w)>n)
             pDelete(&p0);
           else

Singular/ideals.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.h,v 1.37 2002-02-28 17:56:33 mschulze Exp $ */
+/* $Id: ideals.h,v 1.38 2002-03-07 18:32:10 mschulze Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -97 +97 @@
              matrix *unit=NULL);
 
-lists   idLiftW (ideal P, ideal Q, int n, short *w);
+lists idLiftW(ideal P,ideal Q,int n,short *w=NULL);
 
 intvec * idMWLift(ideal mod,intvec * weights);

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.279 2002-03-07 16:00:57 mschulze Exp $ */
+/* $Id: iparith.cc,v 1.280 2002-03-07 18:32:08 mschulze Exp $ */
 
 /*
@@ -4816 +4816 @@
 
 static BOOLEAN jjDIVISION4(leftv res, leftv v)
-{
+{ // may have 3 or 4 arguments
   leftv v1=v;
   leftv v2=v1->next;
@@ -4825 +4825 @@
   int i2=iiTestConvert(v2->Typ(),MODUL_CMD);
 
-  if(i1==0||i2==0||v3->Typ()!=INT_CMD||v4->Typ()!=INTVEC_CMD)
-  {
-    WarnS("<module>,<module>,<int>,<intvec> expected!");
+  if(i1==0||i2==0||v3->Typ()!=INT_CMD||(v4!=NULL&&v4->Typ()!=INTVEC_CMD))
+  {
+    WarnS("<module>,<module>,<int>[,<intvec>] expected!");
     return TRUE;
   }
@@ -4838 +4838 @@
 
   int n=(int)v3->Data();
-  short *w=iv2array((intvec *)v4->Data());
-
-  short *w0=w+1;
-  int i=pVariables;
-  while(i>0&&*w0>0)
-  {
-    w0++;
-    i--;
-  }
-  if(i>0)
-    WarnS("not all weights are positive!");
+  short *w=NULL;
+  if(v4!=NULL)
+  {
+    w=iv2array((intvec *)v4->Data());
+    short *w0=w+1;
+    int i=pVariables;
+    while(i>0&&*w0>0)
+    {
+      w0++;
+      i--;
+    }
+    if(i>0)
+      WarnS("not all weights are positive!");
+  }
 
   lists L=idLiftW(P,Q,n,w);
 
-  omFree(w);
+  if(w!=NULL)
+    omFree(w);
 
   L->m[1].rtyp=v1->Typ();
@@ -5504 +5508 @@
 ,{jjCOEF_M,    COEF_CMD,        NONE,               4  }
 ,{jjCALL2ARG,  DIVISION_CMD,    ANY_TYPE/*or set by p*/,2  }
+,{jjDIVISION4, DIVISION_CMD,    ANY_TYPE/*or set by p*/,3  }
 ,{jjDIVISION4, DIVISION_CMD,    ANY_TYPE/*or set by p*/,4  }
 ,{jjDBPRINT,   DBPRINT_CMD,     NONE,               -2 }