Changeset b78996 in git for libpolys/polys/matpol.cc

Timestamp:

Apr 14, 2011, 3:34:10 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

a665ebdc0e6f023769cadc08a35bd0eb3f3ad935

Parents:

2f5936105b139a5635034b6eb233c5405b3e3e29

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-14 15:34:10+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:30:32+01:00

Message:

FIX: strting to fix sparse matrices (sparsmat.{h, cc})

File:

• libpolys/polys/matpol.cc (modified) (7 diffs)

libpolys/polys/matpol.cc

@@ -30 +30 @@
 #include "monomials/ring.h"
 #include "monomials/p_polys.h"
-// #include <kernel/sparsmat.h>
 
 #include "coeffrings.h"
@@ -365 +364 @@
   int       *qrow, *qcol;
   poly      *Xarray;
-  ring      _R;
+  const ring      _R;
   
   void mpInitMat();
@@ -1094 +1093 @@
         if (ap[jj] != NULL)
         {
-          q2 = SM_MULT(ap[jj], elim, div);
+          q2 = SM_MULT(ap[jj], elim, div, _R);
           if (a[jj] != NULL)
           {
-            q1 = SM_MULT(a[jj], piv, div);
+            q1 = SM_MULT(a[jj], piv, div, _R);
             p_Delete(&a[jj], _R);
             q2 = p_Add_q(q2, q1, _R);
@@ -1104 +1103 @@
         else if (a[jj] != NULL)
         {
-          q2 = SM_MULT(a[jj], piv, div);
+          q2 = SM_MULT(a[jj], piv, div, _R);
         }
         if ((q2!=NULL) && div)
-          SM_DIV(q2, div);
+          SM_DIV(q2, div, _R);
         a[jj] = q2;
       }
@@ -1119 +1118 @@
         if (a[jj] != NULL)
         {
-          q2 = SM_MULT(a[jj], piv, div);
+          q2 = SM_MULT(a[jj], piv, div, _R);
           p_Delete(&a[jj], _R);
           if (div)
-            SM_DIV(q2, div);
+            SM_DIV(q2, div, _R);
           a[jj] = q2;
         }
@@ -1839 +1838 @@
         if (a[j] != NULL)
         {
-          q1 = SM_MULT(a[j], piv, div);
+          q1 = SM_MULT(a[j], piv, div, _R);
           if (ap[j] != NULL)
           {
-            q2 = SM_MULT(ap[j], elim, div);
+            q2 = SM_MULT(ap[j], elim, div, _R);
             q1 = p_Add_q(q1,q2, _R);
           }
         }
         else if (ap[j] != NULL)
-          q1 = SM_MULT(ap[j], elim, div);
+          q1 = SM_MULT(ap[j], elim, div, _R);
         if (q1 != NULL)
         {
           if (div)
-            SM_DIV(q1, div);
+            SM_DIV(q1, div, _R);
           q[j] = q1;
         }
@@ -1862 +1861 @@
         if (a[j] != NULL)
         {
-          q1 = SM_MULT(a[j], piv, div);
+          q1 = SM_MULT(a[j], piv, div, _R);
           if (div)
-            SM_DIV(q1, div);
+            SM_DIV(q1, div, _R);
           q[j] = q1;
         }