Changeset ea7ecf in git

Timestamp:

Oct 17, 2006, 6:24:45 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a5646cd92e186edcb0044afccca5f46fad506c62

Parents:

e690a910bccbd407fbac04569940e04393d249b2

Message:

*hannes: better handling of sparse matrices


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

File:

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

kernel/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.5 2005-10-26 15:35:35 Singular Exp $ */
+/* $Id: matpol.cc,v 1.6 2006-10-17 16:24:45 Singular Exp $ */
 
 /*
@@ -149 +149 @@
   pNormalize(p);
   for (k=m*n-1; k>0; k--)
-  {  
-    a->m[k] = pMult(a->m[k], pCopy(p));
-  }  
+  {
+    if (a->m[k]!=NULL)
+      a->m[k] = pMult(a->m[k], pCopy(p));
+  }
   a->m[0] = pMult(a->m[0], p);
   return a;
@@ -215 +216 @@
       for (k=1; k<=p; k++)
       {
-        s = ppMult_qq(MATELEM(a,i,k), MATELEM(b,k,j));
-        t = pAdd(t,s);
+        if ((MATELEM(a,i,k)!=NULL) && (MATELEM(b,k,j)!=NULL))
+        {
+          s = ppMult_qq(MATELEM(a,i,k), MATELEM(b,k,j));
+          t = pAdd(t,s);
+        }
       }
       pNormalize(t);
@@ -339 +343 @@
 #endif
 /*2
-* entries of a are minors and go to result (only if not in R) 
+* entries of a are minors and go to result (only if not in R)
 */
 void mpMinorToResult(ideal result, int &elems, matrix a, int r, int c,
@@ -1817 +1821 @@
       }
       else if (MATELEM(U,i,j)!=NULL) return FALSE;
-    }  
+    }
   }
   return TRUE;