Changeset abe5c8 in git

Timestamp:

Sep 24, 2012, 12:41:08 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

f224d8590b63be01aff8b548ab4f2f5dea43b095

Parents:

1592b986a21bcaba5633414189a7b08c5cce6213

Message:

chg: removed parameter last from p_*templates

Files:

• kernel/kInline.h (modified) (1 diff)
• kernel/kspoly.cc (modified) (1 diff)
• kernel/kutil.cc (modified) (2 diffs)
• libpolys/polys/kbuckets.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (8 diffs)
• libpolys/polys/nc/ncSAMult.cc (modified) (1 diff)
• libpolys/polys/nc/old.gring.cc (modified) (1 diff)
• libpolys/polys/nc/sca.cc (modified) (1 diff)
• libpolys/polys/templates/p_Minus_mm_Mult_qq__T.cc (modified) (2 diffs)
• libpolys/polys/templates/p_Procs.h (modified) (1 diff)
• libpolys/polys/templates/pp_Mult_mm_Noether__T.cc (modified) (3 diffs)

kernel/kInline.h

@@ -599 +599 @@
 
     pNext(_p) = p_Minus_mm_Mult_qq( pNext(_p), m, q, pLength, lq, 
-                                    spNoether, last, tailRing );
+                                    spNoether, tailRing );
 //    tailRing->p_Procs->p_Minus_mm_Mult_qq(pNext(_p), m, q, shorter,spNoether, tailRing, last);
 //    pLength += lq - shorter;

kernel/kspoly.cc

@@ -445 +445 @@
   {
     l2 = -1;
-    a2 = tailRing->p_Procs->pp_Mult_mm_Noether(a2, m2, spNoether, l2, tailRing,last);
+    a2 = tailRing->p_Procs->pp_Mult_mm_Noether(a2, m2, spNoether, l2, tailRing);
     assume(l2 == pLength(a2));
   }
   else
-    a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing,last);
+    a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing);
 #ifdef HAVE_RINGS
   if (!(rField_is_Domain(currRing))) l2 = pLength(a2);

kernel/kutil.cc

@@ -1786 +1786 @@
 #endif
   // get multiplied signatures for testing
-  pSigMult = currRing->p_Procs->pp_Mult_mm(pSigMult,m1,currRing,last);
+  pSigMult = currRing->p_Procs->pp_Mult_mm(pSigMult,m1,currRing);
   pSigMultNegSev = ~p_GetShortExpVector(pSigMult,currRing);
-  sSigMult = currRing->p_Procs->pp_Mult_mm(sSigMult,m2,currRing,last);
+  sSigMult = currRing->p_Procs->pp_Mult_mm(sSigMult,m2,currRing);
   sSigMultNegSev = ~p_GetShortExpVector(sSigMult,currRing);
   
@@ -6021 +6021 @@
           p_SetCompP (q, p_GetComp(strat->sig[k], currRing), currRing);
           strat->syz[ctr] = p_Add_q (strat->syz[ctr], q, currRing);
-#ifdef DEBUGF5 || DEBUGF51
+#if defined(DEBUGF5) || defined(DEBUGF51)
           pWrite(strat->syz[ctr]);
 #endif

libpolys/polys/kbuckets.cc

@@ -699 +699 @@
   int i, l1;
   poly p1 = p;
-  poly last;
   ring r = bucket->bucket_ring;
 
@@ -753 +752 @@
     {
       l1 = -1;
-      p1 = r->p_Procs->pp_Mult_mm_Noether(p1, m, spNoether, l1, r, last);
+      p1 = r->p_Procs->pp_Mult_mm_Noether(p1, m, spNoether, l1, r);
       i = pLogLength(l1);
     }
-    else {
-      p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
+    else
+    {
+      p1 = r->p_Procs->pp_Mult_mm(p1, m, r);
 #ifdef HAVE_RINGS
       if (rField_is_Ring(r) && !(rField_is_Domain(r)))
@@ -804 +804 @@
   int i, l1;
   poly p1 = p;
-  poly last;
   ring r = bucket->bucket_ring;
 
@@ -892 +891 @@
     //p_GetCoeff0(n, swap_n,r);
     #endif
-    p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
+    p1 = r->p_Procs->pp_Mult_mm(p1, m, r);
     #ifdef USE_COEF_BUCKETS
     //m may not be changed

libpolys/polys/monomials/p_polys.h

@@ -950 +950 @@
   else
   {
-    poly last;
-    return r->p_Procs->pp_Mult_mm(p, m, r, last);
+    return r->p_Procs->pp_Mult_mm(p, m, r);
   }
 }
@@ -964 +963 @@
 }
 
-// like p_Minus_mm_Mult_qq, except that if lp == pLength(lp) lq == pLength(lq)
-// then result = p-m*q, lp == pLength(result), last == pLast(result)
-static inline poly p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, int &lp, int lq,
-                                 const poly spNoether, poly& last, const ring r)
-{
-  int l; 
-#ifdef HAVE_PLURAL
-  if (rIsPluralRing(r))
-  {
-    p = nc_p_Minus_mm_Mult_qq(p, m, q, lp, lq, spNoether, r);
-    last = p_Last(p, l, r);
-    assume( lp == l );
-    assume( lp == pLength(p) );
-    return p;
-  }
-#endif
-
-  int shorter;
-  const poly res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, spNoether, r, last);
-  lp = (lp + lq) - shorter;
-  assume( last == p_Last(res, l, r) );
-  assume( lp == l );
-  assume( lp == pLength(res) );
-  return res;
-}
-
-
-// like p_Minus_mm_Mult_qq (above) but without last 
 static inline poly p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, int &lp, int lq,
                                       const poly spNoether, const ring r)
@@ -1004 +975 @@
 #endif
 
-  int shorter; poly last;
-  const poly res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, spNoether, r, last);
+  int shorter;
+  const poly res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, spNoether, r);
   lp += lq - shorter;
   assume( lp == pLength(res) );
@@ -1023 +994 @@
 
   int shorter;
-  poly last;
-
-  return r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r, last); // !!!
+
+  return r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r);
 }
 
@@ -1106 +1076 @@
 static inline poly pp_Mult_qq(poly p, poly q, const ring r)
 {
-  poly last;
   if (p == NULL || q == NULL) return NULL;
 
@@ -1115 +1084 @@
       return nc_mm_Mult_pp(p, q, r);
 #endif
-    return r->p_Procs->pp_Mult_mm(q, p, r, last);
+    return r->p_Procs->pp_Mult_mm(q, p, r);
   }
 
   if (pNext(q) == NULL)
   {
-    return r->p_Procs->pp_Mult_mm(p, q, r, last);
+    return r->p_Procs->pp_Mult_mm(p, q, r);
   }
 
@@ -1150 +1119 @@
 
 // this should be implemented more efficiently
-  poly res, last;
+  poly res;
   int shorter;
   number n_old = pGetCoeff(m);
@@ -1156 +1125 @@
   n_neg = n_Neg(n_neg, r->cf);
   pSetCoeff0(m, n_neg);
-  res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r, last);
+  res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r);
   lp = (lp + lq) - shorter;
   pSetCoeff0(m, n_old);

libpolys/polys/nc/ncSAMult.cc

@@ -51 +51 @@
 
 // poly functions defined in p_Procs: ;
-static poly ggnc_pp_Mult_mm(const poly p, const poly m, const ring r, poly& last)
+static poly ggnc_pp_Mult_mm(const poly p, const poly m, const ring r)
 {
   if( (p == NULL) || (m == NULL) )

libpolys/polys/nc/old.gring.cc

@@ -434 +434 @@
 
 /* poly functions defined in p_Procs : */
-poly gnc_pp_Mult_mm(const poly p, const poly m, const ring r, poly &last)
+poly gnc_pp_Mult_mm(const poly p, const poly m, const ring r)
 {
   return( gnc_p_Mult_mm_Common(p_Copy(p,r), m, 1, r) );

libpolys/polys/nc/sca.cc

@@ -464 +464 @@
 
 // return new poly = pPoly * pMonom; preserve pPoly and pMonom.
-poly sca_pp_Mult_mm(const poly pPoly, const poly pMonom, const ring rRing, poly &)
+poly sca_pp_Mult_mm(const poly pPoly, const poly pMonom, const ring rRing)
 {
   assume( rIsSCA(rRing) );

libpolys/polys/templates/p_Minus_mm_Mult_qq__T.cc

@@ -17 +17 @@
  *
  ***************************************************************/
-LINKAGE poly p_Minus_mm_Mult_qq__T(poly p, poly m, poly q, int& Shorter, const poly spNoether, const ring r, poly &last)
+LINKAGE poly p_Minus_mm_Mult_qq__T(poly p, poly m, poly q, int& Shorter, const poly spNoether, const ring r)
 {
   p_Test(p, r);
@@ -134 +134 @@
   {
     pNext(a) = p;
-    if (p == NULL) last = a;
   }
   else  // append (- m*q) to result
   {
     pSetCoeff0(m, tneg);
-    last = a;
     if (spNoether != NULL)
     {
       int ll = 0;
-      pNext(a) = r->p_Procs->pp_Mult_mm_Noether(q, m, spNoether, ll, r, last);
+      pNext(a) = r->p_Procs->pp_Mult_mm_Noether(q, m, spNoether, ll, r);
       shorter += ll;
     }
     else
     {
-      pNext(a) = r->p_Procs->pp_Mult_mm(q, m, r, last);
+      pNext(a) = r->p_Procs->pp_Mult_mm(q, m, r);
 #ifdef HAVE_RINGS
       if (! rField_is_Domain(r))

libpolys/polys/templates/p_Procs.h

@@ -22 +22 @@
 typedef poly (*p_Mult_mm_Proc_Ptr)(poly p, const poly m, const ring r);
 typedef poly (*pp_Mult_mm_Proc_Ptr)(poly p, const poly m,
-                                    const ring r,
-                                    poly &last);
+                                    const ring r);
 typedef poly (*pp_Mult_mm_Noether_Proc_Ptr)(poly p, const poly m,
                                             const poly spNoether, int &ll,
-                                            const ring r, poly &last);
+                                            const ring r);
 typedef poly (*p_Add_q_Proc_Ptr)(poly p, poly q, int & shorter, const ring r);
 typedef poly (*p_Minus_mm_Mult_qq_Proc_Ptr)(poly p, poly m, poly q,
                                             int &shorter, const poly spNoether,
-                                            const ring r, poly &last);
+                                            const ring r);
 typedef poly (*p_Neg_Proc_Ptr)(poly p, const ring r);
 typedef poly (*pp_Mult_Coeff_mm_DivSelect_Proc_Ptr)(poly p, const poly m,

libpolys/polys/templates/pp_Mult_mm_Noether__T.cc

@@ -17 +17 @@
  *
  ***************************************************************/
-LINKAGE poly pp_Mult_mm_Noether__T(poly p, const poly m, const poly spNoether, int &ll, const ring ri, poly &last)
+LINKAGE poly pp_Mult_mm_Noether__T(poly p, const poly m, const poly spNoether, int &ll, const ring ri)
 {
   p_Test(p, ri);
@@ -25 +25 @@
   {
     ll = 0;
-    last = NULL;
     return NULL;
   }
@@ -64 +63 @@
     ll = pLength(p);
 
-  if (q != &rp)
-    last = q;
   pNext(q) = NULL;