Changeset 31cb04b in git

Timestamp:

Jun 29, 1999, 3:03:31 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

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

Children:

a97e04ed1d1c861bf4bcd335a5d9baa9fcc17445

Parents:

0d698758164dfebc988cdf6f7290970b1bf8432d

Message:

arithmetic from sparsmat


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

File:

• Singular/matpol.cc (modified) (4 diffs)

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.23 1999-03-11 16:32:55 Singular Exp $ */
+/* $Id: matpol.cc,v 1.24 1999-06-29 13:03:31 pohl Exp $ */
 
 /*
@@ -24 +24 @@
 #include "intvec.h"
 #include "ring.h"
+#include "sparsmat.h"
 #include "matpol.h"
 
@@ -1048 +1049 @@
     if (elim != NULL)
     {
+      elim = pNeg(elim);
       for (j=s_n-1; j>=0; j--)
       {
         q2 = NULL;
         jj = qcol[j];
-        q1 = a[jj];
         if (ap[jj] != NULL)
         {
-          q2 = pNeg(pCopy(ap[jj]));
-          q2 = pMult(q2, pCopy(elim));
-          if (q1 != NULL)
+          q2 = smMultDiv(ap[jj], elim, div);
+          if (a[jj] != NULL)
           {
-            q1 = pMult(q1,pCopy(piv));
+            q1 = smMultDiv(a[jj], piv, div);
+            pDelete(&a[jj]);
             q2 = pAdd(q2, q1);
           }
         }
-        else if (q1 != NULL)
+        else if (a[jj] != NULL)
         {
-          q2 = pMult(q1, pCopy(piv));
+          q2 = smMultDiv(a[jj], piv, div);
         }
         if ((q2!=NULL) && div)
-          q2 = mpDivide(q2, div);
+          smSpecialPolyDiv(q2, div);
         a[jj] = q2;
       }
@@ -1078 +1079 @@
       {
         jj = qcol[j];
-        q1 = a[jj];
-        if (q1 != NULL)
+        if (a[jj] != NULL)
         {
-          q1 = pMult(q1, pCopy(piv));
+          q2 = smMultDiv(a[jj], piv, div);
+          pDelete(&a[jj]);
           if (div)
-            q1 = mpDivide(q1, div);
-          a[jj] = q1;
+            smSpecialPolyDiv(q2, div);
+          a[jj] = q2;
         }
       }