Changeset abe5c8 in git for libpolys/polys/monomials/p_polys.h

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f224d8590b63be01aff8b548ab4f2f5dea43b095

Parents:

1592b986a21bcaba5633414189a7b08c5cce6213

Message:

chg: removed parameter last from p_*templates

File:

• libpolys/polys/monomials/p_polys.h (modified) (8 diffs)

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