Changeset 110345 in git

Timestamp:

Feb 28, 2002, 6:56:34 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

52dd16ad91baa99ad289271833061020c2611bab

Parents:

ca333242d1ba897a923f436babbc49409e97d8ff

Message:

*mschulze: DIVISION4 moved to idLiftW


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

Location:

Singular

Files:

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

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.126 2002-01-19 14:48:16 obachman Exp $ */
+/* $Id: ideals.cc,v 1.127 2002-02-28 17:56:33 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
+*P, Q, and w are not changed
+*/
+lists idLiftW(ideal P, ideal Q, int n, short *w)
+{
+  int N=0;
+  int i;
+  for(i=IDELEMS(Q)-1;i>=0;i--)
+    N=max(N,pDegW(Q->m[i],w));
+  N+=n;
+
+  matrix T=mpNew(IDELEMS(Q),IDELEMS(P));
+  ideal R=idInit(IDELEMS(P),P->rank);
+
+  for(i=IDELEMS(P)-1;i>=0;i--)
+  {
+    poly p=ppJetW(P->m[i],N,w);
+
+    int j=IDELEMS(Q)-1;
+    while(p!=NULL)
+    {
+      if(pDivisibleBy(Q->m[j],p))
+      {
+        poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
+        p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
+        pNormalize(p);
+        if(pDegW(p0,w)>n)
+          pDelete(&p0);
+        else
+          MATELEM(T,j+1,i+1)=pAdd(MATELEM(T,j+1,i+1),p0);
+        j=IDELEMS(Q)-1;
+      }
+      else
+      {
+        if(j==0)
+        {
+          poly p0=p;
+          pIter(p);
+          pNext(p0)=NULL;
+          if(pDegW(p0,w)>n)
+            pDelete(&p0);
+          else
+            R->m[i]=pAdd(R->m[i],p0);
+          j=IDELEMS(Q)-1;
+        }
+        else
+          j--;
+      }
+    }
+  }
+
+  lists L=(lists)omAllocBin(slists_bin);
+  L->Init(2);
+  L->m[0].rtyp=MATRIX_CMD;
+  L->m[0].data=(void *)T;
+  L->m[1].rtyp=MODUL_CMD;
+  L->m[1].data=(void *)R;
+
+  return L;
+}
+
+/*2
 *computes the quotient of h1,h2 : interanl routine for idQuot
 *BEWARE: the returned ideals may contain incorrected orderd polys !

Singular/ideals.h

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.277 2002-02-26 12:25:17 mschulze Exp $ */
+/* $Id: iparith.cc,v 1.278 2002-02-28 17:56:34 mschulze Exp $ */
 
 /*
@@ -4827 +4827 @@
   if(i1==0||i2==0||v3->Typ()!=INT_CMD||v4->Typ()!=INTVEC_CMD)
   {
-    Warn("<module>,<module>,<int>,<intvec> expected!");
+    WarnS("<module>,<module>,<int>,<intvec> expected!");
     return TRUE;
   }
@@ -4840 +4840 @@
   short *w=iv2array((intvec *)v4->Data());
 
-  int N=0;
-  for(int i=IDELEMS(Q)-1;i>=0;i--)
-    N=max(N,pDegW(Q->m[i],w));
-  N+=n;
-
-  matrix T=mpNew(IDELEMS(Q),IDELEMS(P));
-  ideal R=idInit(IDELEMS(P),P->rank);
-
-  for(int i=IDELEMS(P)-1;i>=0;i--)
-  {
-    poly p=ppJetW(P->m[i],N,w);
-
-    int j=IDELEMS(Q)-1;
-    while(p!=NULL)
-    {
-      if(pDivisibleBy(Q->m[j],p))
-      {
-        poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
-        p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
-        pNormalize(p);
-        if(pDegW(p0,w)>n)
-          pDelete(&p0);
-        else
-          MATELEM(T,j+1,i+1)=pAdd(MATELEM(T,j+1,i+1),p0);
-        j=IDELEMS(Q)-1;
-      }
-      else
-      {
-        if(j==0)
-        {
-          poly p0=p;
-          pIter(p);
-          pNext(p0)=NULL;
-          if(pDegW(p0,w)>n)
-            pDelete(&p0);
-          else
-            R->m[i]=pAdd(R->m[i],p0);
-          j=IDELEMS(Q)-1;
-        }
-        else
-          j--;
-      }
-    }
-  }
+  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);
 
-  lists L=(lists)omAllocBin(slists_bin);
-  L->Init(2);
-  L->m[0].rtyp=MATRIX_CMD;
-  L->m[0].data=(void *)T;
   L->m[1].rtyp=v1->Typ();
+  ideal R=(ideal)L->m[1].data;
   if(v1->Typ()==POLY_CMD||v1->Typ()==VECTOR_CMD)
   {
-    L->m[1].data=(void *)pCopy(R->m[0]);
+    L->m[1].data=(void *)R->m[0];
+    R->m[0]=NULL;
     idDelete(&R);
   }
-  else if(v1->Typ()==IDEAL_CMD||v1->Typ()==MODUL_CMD)
-    L->m[1].data=(void *)R;
   else if(v1->Typ()==MATRIX_CMD)
     L->m[1].data=(void *)idModule2Matrix(R);
-  else
-  {
+  else if(v1->Typ()!=IDEAL_CMD&&v1->Typ()!=MODUL_CMD)
     L->m[1].rtyp=MODUL_CMD;
-    L->m[1].data=(void *)R;
-  }
   res->data=L;
   res->rtyp=LIST_CMD;