Changeset 158aae in git for kernel/linear_algebra

Timestamp:

Sep 8, 2017, 4:47:57 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

a6824e9ecfb71a016baed3b3233fd51b39c84713

Parents:

35241ceca001a3e4d078d8120020a753beecb5c0

Message:

(p)pMult_nn: use __(p)p_Mult_nn if possible(no tests for 0,1)

File:

• kernel/linear_algebra/linearAlgebra.cc (modified) (4 diffs)

kernel/linear_algebra/linearAlgebra.cc

@@ -1048 +1048 @@
   MATELEM(c,1,1) = pAdd(pAdd(pAdd(ppMult_qq(MATELEM(H,1,1), MATELEM(H,1,1)),
                                   ppMult_qq(MATELEM(H,1,2), MATELEM(H,2,1))),
-                             ppMult_nn(MATELEM(H,1,1), trace)),
-                        pMult_nn(pOne(), det));
+                             __pp_Mult_nn(MATELEM(H,1,1), trace, currRing)),
+                        __p_Mult_nn(pOne(), det,currRing));
   MATELEM(c,2,1) = pAdd(pMult(pCopy(MATELEM(H,2,1)),
                               pAdd(pCopy(MATELEM(H,1,1)),
                                    pCopy(MATELEM(H,2,2)))),
-                        ppMult_nn(MATELEM(H,2,1), trace));
+                        __pp_Mult_nn(MATELEM(H,2,1), trace,currRing));
   MATELEM(c,3,1) = ppMult_qq(MATELEM(H,2,1), MATELEM(H,3,2));
   nDelete(&trace); nDelete(&det);
@@ -1402 +1402 @@
       {
         for (int r = row; r <= rr; r++)
-          pMult_nn(MATELEM(dMat, r, r), t);
-        pMult_nn(MATELEM(lMat, row, row), t);
+          MATELEM(dMat, r, r)=__p_Mult_nn(MATELEM(dMat, r, r), t,currRing);
+        MATELEM(lMat, row, row)=__p_Mult_nn(MATELEM(lMat, row, row), t,currRing);
       }
       l = pMult(l, pCopy(MATELEM(lMat, row, row)));
@@ -1423 +1423 @@
           {
             poly p = MATELEM(uMat, r, c);
-            pMult_nn(p, f2);
+            p=__p_Mult_nn(p, f2,currRing);
             poly q = pCopy(MATELEM(uMat, row, c));
-            pMult_nn(q, f1); q = pNeg(q);
+            q=__p_Mult_nn(q, f1,currRing); q = pNeg(q);
             MATELEM(uMat, r, c) = pAdd(p, q);
           }
           number tt = nDiv(g, gg);
           nNormalize(tt);   /* this division works without remainder */
-          pMult_nn(MATELEM(lMat, r, r), tt); nDelete(&tt);
+          MATELEM(lMat, r, r)=__p_Mult_nn(MATELEM(lMat, r, r), tt, currRing);
+          nDelete(&tt);
           MATELEM(lMat, r, row) = pCopy(MATELEM(lMat, r, r));
-          pMult_nn(MATELEM(lMat, r, row), f1);
+          MATELEM(lMat, r, row)=__p_Mult_nn(MATELEM(lMat, r, row), f1,currRing);
           nDelete(&f1); nDelete(&f2); nDelete(&g);
         }
-        else pMult_nn(MATELEM(lMat, r, r), t);
+        else
+          MATELEM(lMat, r, r)=__p_Mult_nn(MATELEM(lMat, r, r), t, currRing);
       }
       nDelete(&t); nDelete(&gg);
@@ -1567 +1569 @@
     for (int c = 1; c <= n; c++)
     {
-      pMult_nn(MATELEM(xVec, c, 1), z);
+      MATELEM(xVec, c, 1)=__p_Mult_nn(MATELEM(xVec, c, 1), z,currRing);
       pNormalize(MATELEM(xVec, c, 1));
     }