Changeset f7bfe5 in git

Timestamp:

Nov 17, 2006, 4:35:48 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

ca3e7b5e9ae94d45a0eebab22cb38d16c7542b01

Parents:

f41bd90135713026d8a1ff50059a2d95d034bf52

Message:

*hannes: mpMult


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

File:

• kernel/matpol.cc (modified) (3 diffs)

kernel/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.8 2006-11-17 14:31:06 Singular Exp $ */
+/* $Id: matpol.cc,v 1.9 2006-11-17 15:35:48 Singular Exp $ */
 
 /*
@@ -194 +194 @@
 {
   int i, j, k;
-  poly s, t, aik, bkj;
   int m = MATROWS(a);
   int p = MATCOLS(a);
@@ -211 +210 @@
   for (i=1; i<=m; i++)
   {
-    for (j=1; j<=q; j++)
-    {
-      t = NULL;
-      for (k=1; k<=p; k++)
-      {
-        poly a_p, b_p;
-        if (((a_p=MATELEM(a,i,k))!=NULL) && ((b_p=MATELEM(b,k,j))!=NULL))
+    for (k=1; k<=p; k++)
+    {
+      poly aik;
+      if ((aik=MATELEM(a,i,k))!=NULL)
+      {
+        for (j=1; j<=q; j++)
         {
-          s = ppMult_qq(a_p /*MATELEM(a,i,k)*/, b_p/*MATELEM(b,k,j)*/);
-          t = pAdd(t,s);
+          poly bkj;
+          if ((bkj=MATELEM(b,k,j))!=NULL)
+          {
+            poly *cij=&(MATELEM(c,i,j));
+            poly s = ppMult_qq(aik /*MATELEM(a,i,k)*/, bkj/*MATELEM(b,k,j)*/);
+            if (/*MATELEM(c,i,j)*/ (*cij)==NULL) (*cij)=s;
+            else (*cij) = pAdd((*cij) /*MATELEM(c,i,j)*/ ,s);
+          }
         }
       }
-      pNormalize(t);
-      MATELEM(c,i,j) = t;
-    }
-  }
+    //  pNormalize(t);
+    //  MATELEM(c,i,j) = t;
+    }
+  }
+  for(i=m*q-1;i>=0;i--) pNormalize(c->m[i]);
   return c;
 }