Changeset 3b8515 in git

Timestamp:

Feb 26, 2002, 10:01:11 AM (21 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

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

Children:

3c1bbe74e9f803249a7ac22c4a3f339963ec0a1b

Parents:

97403d7b5d41e537394fcbd7c261d7b70302488c

Message:

*mschulze: division for matrix


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.275 2002-02-25 18:13:45 mschulze Exp $ */
+/* $Id: iparith.cc,v 1.276 2002-02-26 09:01:11 mschulze Exp $ */
 
 /*
@@ -153 +153 @@
   { "dim",         0, DIM_CMD ,           CMD_1},
   { "div",         0, INTDIV_CMD ,        MULDIV_OP},
-  { "division",    0, DIVISION_CMD ,      CMD_2},
+  { "division",    0, DIVISION_CMD ,      CMD_M},
 #ifdef DRING
   { "dring",       0, DRING_CMD ,         DRING_CMD},
@@ -4817 +4817 @@
 static BOOLEAN jjDIVISION4(leftv res, leftv v)
 {
-  int typ=v->Typ();
-  if(v->Typ()!=MODUL_CMD&&v->Typ()!=IDEAL_CMD)
-  {
-    Warn("1st argument must be an ideal or module!");
+  leftv v1=v;
+  leftv v2=v1->next;
+  leftv v3=v2->next;
+  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!");
     return TRUE;
   }
-  ideal P=(ideal)v->Data();
-  v=v->next;
-  if(v->Typ()!=typ)
-  {
-    Warn("2nd argument must be an ideal or module!");
+  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(v);
-  ideal Q=(ideal)v->Data();
-  v=v->next;
-  if(v->Typ()!=INT_CMD)
-  {
-    Warn("3rd argument must be an int!");
+  assumeStdFlag(v2);
+  if(v3->Typ()!=INT_CMD)
+  {
+    Warn("3rd argument must be int!");
     return TRUE;
   }
-  int n=(int)v->Data();
-  v=v->next;
-  if(v->Typ()!=INTVEC_CMD)
-  {
-    Warn("4th argument must be an intvec!");
+  if(v4->Typ()!=INTVEC_CMD)
+  {
+    Warn("4th argument must be intvec!");
     return TRUE;
   }
-  short *w=iv2array((intvec *)v->Data());
+
+  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();
+  int n=(int)v3->Data();
+  short *w=iv2array((intvec *)v4->Data());
 
   int N=0;
@@ -4868 +4880 @@
       {
         poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
+        p=pSub(p,ppMult_mm(Q->m[j],p0));
         if(pDegW(p0,w)>n)
           pDelete(&p0);
         else
           MATELEM(T,j+1,i+1)=pAdd(MATELEM(T,j+1,i+1),p0);
-        p0=ksOldSpolyRed(Q->m[j],p,0);
-        p=ppJetW(p0,N,w);
+        p=ppJetW(p0=p,N,w);
         pDelete(&p0);
         j=IDELEMS(Q)-1;
@@ -4896 +4908 @@
   }
 
+  if(v1->Typ()==MATRIX_CMD)
+    idDelete(&P);
+  if(v2->Typ()==MATRIX_CMD)
+    idDelete(&Q);
   omFree(w);
 
@@ -4904 +4920 @@
   L->m[1].rtyp=MATRIX_CMD;
   L->m[1].data=(void *)U;
-  L->m[2].rtyp=typ;
-  L->m[2].data=(void *)R;
+  L->m[2].rtyp=v1->Typ();
+  if(v1->Typ()==MATRIX_CMD)
+    L->m[2].data=(void *)idModule2Matrix(R);
+  else
+    L->m[2].data=(void *)R;
   res->data=L;
   res->rtyp=LIST_CMD;
@@ -5540 +5559 @@
 ,{jjCALL2ARG,  COEF_CMD,        MATRIX_CMD,         2  }
 ,{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*/,4  }
 ,{jjDBPRINT,   DBPRINT_CMD,     NONE,               -2 }
 ,{jjCALL1ARG,  IDEAL_CMD,       IDEAL_CMD,          1  }