Changeset e14e1b0 in git

Timestamp:

Mar 8, 2010, 2:27:18 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

32785f98c022f9341d401098c78dafff2aff4437

Parents:

c1a5fdccad23660f683eef44f4ca207fa4050c1c

Message:

fixes trac ticket #206

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

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/matpol.cc (modified) (1 diff)
• kernel/matpol.h (modified) (1 diff)

Singular/iparith.cc

@@ -1131 +1131 @@
 static BOOLEAN jjTIMES_MA_P2(leftv res, leftv u, leftv v)
 {
-  return jjTIMES_MA_P1(res,v,u);
+  poly p=(poly)u->CopyD(POLY_CMD);
+  int r=pMaxComp(p);/* recompute the rank for the case ideal*vector*/
+  ideal I= (ideal)pMultMp(p,(matrix)v->CopyD(MATRIX_CMD));
+  if (r>0) I->rank=r;
+  idNormalize(I);
+  res->data = (char *)I;
+  return FALSE;
 }
 static BOOLEAN jjTIMES_MA_N1(leftv res, leftv u, leftv v)
@@ -3375 +3381 @@
 ,{jjTIMES_P,   '*',            VECTOR_CMD,     VECTOR_CMD, POLY_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_MA_P1,'*',           IDEAL_CMD,      IDEAL_CMD,  POLY_CMD, ALLOW_PLURAL | ALLOW_RING}
-,{jjTIMES_MA_P2,'*',           IDEAL_CMD,      POLY_CMD,   IDEAL_CMD, NO_PLURAL | ALLOW_RING}
+,{jjTIMES_MA_P2,'*',           IDEAL_CMD,      POLY_CMD,   IDEAL_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_ID,  '*',            IDEAL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_MA_P1,'*',           MODUL_CMD,      IDEAL_CMD,  VECTOR_CMD, ALLOW_PLURAL | ALLOW_RING}
-,{jjTIMES_MA_P2,'*',           MODUL_CMD,      VECTOR_CMD, IDEAL_CMD, NO_PLURAL | ALLOW_RING}
+,{jjTIMES_MA_P2,'*',           MODUL_CMD,      VECTOR_CMD, IDEAL_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_ID,  '*',            MODUL_CMD,      IDEAL_CMD,  MODUL_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_ID,  '*',            MODUL_CMD,      MODUL_CMD,  IDEAL_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_MA_P1,'*',           MATRIX_CMD,     MATRIX_CMD, POLY_CMD, ALLOW_PLURAL | ALLOW_RING}
-,{jjTIMES_MA_P2,'*',           MATRIX_CMD,     POLY_CMD,   MATRIX_CMD, NO_PLURAL | ALLOW_RING}
+,{jjTIMES_MA_P2,'*',           MATRIX_CMD,     POLY_CMD,   MATRIX_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_MA_N1,'*',           MATRIX_CMD,     MATRIX_CMD, NUMBER_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjTIMES_MA_N2,'*',           MATRIX_CMD,     NUMBER_CMD, MATRIX_CMD, ALLOW_PLURAL | ALLOW_RING}

kernel/matpol.cc

@@ -197 +197 @@
   }
   a->m[0] = pMult(a->m[0], p);
+  return a;
+}
+
+/*2
+* multiply a poly 'p' by a matrix 'a', destroy the args
+*/
+matrix pMultMp(poly p, matrix a)
+{
+  int k, n = a->nrows, m = a->ncols;
+
+  pNormalize(p);
+  for (k=m*n-1; k>0; k--)
+  {
+    if (a->m[k]!=NULL)
+      a->m[k] = pMult(pCopy(p), a->m[k]);
+  }
+  a->m[0] = pMult(p, a->m[0]);
   return a;
 }

kernel/matpol.h

@@ -38 +38 @@
 matrix mpMultI(matrix a, int f);
 matrix mpMultP(matrix a, poly p);
+matrix pMultMp(poly p, matrix a);
 matrix mpAdd(matrix a, matrix b);
 matrix mpSub(matrix a, matrix b);