Changeset ca3332 in git

Timestamp:

Feb 26, 2002, 1:25:17 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

110345e2447643a55f28c0f99db37a5a1eb15273

Parents:

c38d39f13a88f9cc44ed7a216d923bb8f632cb53

Message:

*mschulze: type conversion and normalize for DIVISION4


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

File:

• Singular/iparith.cc (modified) (5 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.276 2002-02-26 09:01:11 mschulze Exp $ */
+/* $Id: iparith.cc,v 1.277 2002-02-26 12:25:17 mschulze Exp $ */
 
 /*
@@ -4822 +4822 @@
   leftv v4=v3->next;
 
-  if(v1->Typ()!=IDEAL_CMD&&v1->Typ()!=MODUL_CMD&&v1->Typ()!=MATRIX_CMD)
-  {
-    Warn("1st argument must be ideal, module, or matrix!");
+  int i1=iiTestConvert(v1->Typ(),MODUL_CMD);
+  int i2=iiTestConvert(v2->Typ(),MODUL_CMD);
+
+  if(i1==0||i2==0||v3->Typ()!=INT_CMD||v4->Typ()!=INTVEC_CMD)
+  {
+    Warn("<module>,<module>,<int>,<intvec> expected!");
     return TRUE;
   }
-  if(v1->Typ()!=v2->Typ()&&
-    (v1->Typ()!=MATRIX_CMD||v2->Typ()!=MODUL_CMD)&&
-    (v1->Typ()!=MODUL_CMD||v2->Typ()!=MATRIX_CMD))
-  {
-    Warn("2nd argument must be ideal, module, or matrix!");
-    return TRUE;
-  }
-  assumeStdFlag(v2);
-  if(v3->Typ()!=INT_CMD)
-  {
-    Warn("3rd argument must be int!");
-    return TRUE;
-  }
-  if(v4->Typ()!=INTVEC_CMD)
-  {
-    Warn("4th argument must be intvec!");
-    return TRUE;
-  }
-
-  ideal P;
-  if(v1->Typ()==MATRIX_CMD)
-    P=idMatrix2Module(mpCopy((matrix)v1->Data()));
-  else
-    P=(ideal)v1->Data();
-  ideal Q;
-  if(v2->Typ()==MATRIX_CMD)
-    Q=idMatrix2Module(mpCopy((matrix)v2->Data()));
-  else
-    Q=(ideal)v2->Data();
+
+  sleftv w1,w2;
+  iiConvert(v1->Typ(),MODUL_CMD,i1,v1,&w1);
+  iiConvert(v2->Typ(),MODUL_CMD,i2,v2,&w2);
+  ideal P=(ideal)w1.Data();
+  ideal Q=(ideal)w2.Data();
+
   int n=(int)v3->Data();
   short *w=iv2array((intvec *)v4->Data());
@@ -4866 +4847 @@
   matrix T=mpNew(IDELEMS(Q),IDELEMS(P));
   ideal R=idInit(IDELEMS(P),P->rank);
-  matrix U=mpNew(P->rank,P->rank);
-  for(int i=MATROWS(U);i>=1;i--)
-    MATELEM(U,i,i)=pOne();
 
   for(int i=IDELEMS(P)-1;i>=0;i--)
@@ -4880 +4858 @@
       {
         poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
-        p=pSub(p,ppMult_mm(Q->m[j],p0));
+        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);
-        p=ppJetW(p0=p,N,w);
-        pDelete(&p0);
         j=IDELEMS(Q)-1;
       }
@@ -4908 +4885 @@
   }
 
-  if(v1->Typ()==MATRIX_CMD)
-    idDelete(&P);
-  if(v2->Typ()==MATRIX_CMD)
-    idDelete(&Q);
   omFree(w);
 
   lists L=(lists)omAllocBin(slists_bin);
-  L->Init(3);
+  L->Init(2);
   L->m[0].rtyp=MATRIX_CMD;
   L->m[0].data=(void *)T;
-  L->m[1].rtyp=MATRIX_CMD;
-  L->m[1].data=(void *)U;
-  L->m[2].rtyp=v1->Typ();
-  if(v1->Typ()==MATRIX_CMD)
-    L->m[2].data=(void *)idModule2Matrix(R);
+  L->m[1].rtyp=v1->Typ();
+  if(v1->Typ()==POLY_CMD||v1->Typ()==VECTOR_CMD)
+  {
+    L->m[1].data=(void *)pCopy(R->m[0]);
+    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
-    L->m[2].data=(void *)R;
+  {
+    L->m[1].rtyp=MODUL_CMD;
+    L->m[1].data=(void *)R;
+  }
   res->data=L;
   res->rtyp=LIST_CMD;