Changeset 158aae in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

a6824e9ecfb71a016baed3b3233fd51b39c84713

Parents:

35241ceca001a3e4d078d8120020a753beecb5c0

Message:

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

Files:

• Singular/ipshell.cc (modified) (2 diffs)
• kernel/GBEngine/syz0.cc (modified) (1 diff)
• kernel/GBEngine/syz2.cc (modified) (1 diff)
• kernel/GBEngine/syz3.cc (modified) (2 diffs)
• kernel/GBEngine/tgb.cc (modified) (1 diff)
• kernel/GBEngine/units.cc (modified) (1 diff)
• kernel/fglm/fglmcomb.cc (modified) (1 diff)
• kernel/linear_algebra/linearAlgebra.cc (modified) (4 diffs)

Singular/ipshell.cc

@@ -3554 +3554 @@
 
             number inv = nInvers( pGetCoeff( f ) );
-            pMult_nn( search->nf,inv );
+            search->nf=__p_Mult_nn( search->nf,inv,currRing );
             nDelete( &inv );
 
@@ -3613 +3613 @@
             {
               search->nf = pSub( search->nf,
-                                 ppMult_nn( (*node)->nf,pGetCoeff( f ) ) );
+                                 __pp_Mult_nn( (*node)->nf,pGetCoeff( f ),currRing ) );
               pNorm( search->nf );
             }

kernel/GBEngine/syz0.cc

@@ -693 +693 @@
               PrintS("multiplied with: ");nWrite(up);PrintLn();
 #endif
-              pMult_nn(syz,up);
+              syz=__p_Mult_nn(syz,up,currRing);
             }
             nDelete(&up);

kernel/GBEngine/syz2.cc

@@ -669 +669 @@
           number n=nInvers(pGetCoeff(tso.p));
           pNorm(tso.p);
-          pMult_nn(tso.syz,n);
+          tso.syz=__p_Mult_nn(tso.syz,n,currRing);
           nDelete(&n);
         }

kernel/GBEngine/syz3.cc

@@ -894 +894 @@
       n=nInvers(pGetCoeff(tso.p));
       pNorm(tso.p);
-      pMult_nn(tso.syz,n);
+      tso.syz=__p_Mult_nn(tso.syz,n,currRing);
       nDelete(&n);
     }
@@ -1330 +1330 @@
       n=nInvers(pGetCoeff(tso.p));
       pNorm(tso.p);
-      pMult_nn(tso.syz,n);
+      tso.syz=__p_Mult_nn(tso.syz,n,currRing);
       nDelete(&n);
     }

kernel/GBEngine/tgb.cc

@@ -2994 +2994 @@
                                  strat->lenS[j] /*pLength(strat->S[j]) */ ,
                                  strat->kNoether);
-        pMult_nn (res, coef);
+        res=__p_Mult_nn (res, coef, currRing);
         nDelete (&coef);
         h = kBucketGetLm (P.bucket);

kernel/GBEngine/units.cc

@@ -26 +26 @@
     {
       u0=nInvers(pGetCoeff(MATELEM(U0,i+1,i+1)));
-      MATELEM(U0,i+1,i+1)=pMult_nn(MATELEM(U0,i+1,i+1),u0);
-      M->m[i]=pMult_nn(M->m[i],u0);
+      MATELEM(U0,i+1,i+1)=__p_Mult_nn(MATELEM(U0,i+1,i+1),u0,currRing);
+      M->m[i]=__p_Mult_nn(M->m[i],u0,currRing);
     }
   }

kernel/fglm/fglmcomb.cc

@@ -118 +118 @@
         n1= temp;
         n1= nInpNeg( n1 );
-        pMult_nn( p2, n1 );
+        p2=__p_Mult_nn( p2, n1, currRing );
 //         pNormalize( p2 );
         nDelete( & n1 );

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));
     }