Changeset 922962 in git

Timestamp:

Sep 24, 2012, 3:30:48 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

095dee7384980b4721524a28443756f110c5faa7

Parents:

f224d8590b63be01aff8b548ab4f2f5dea43b095

Message:

chg: p_Minus_mm_Mult_qq optim.

Location:

libpolys/polys

Files:

• monomials/p_polys.h (modified) (2 diffs)
• nc/nc.h (modified) (1 diff)
• nc/old.gring.cc (modified) (3 diffs)

libpolys/polys/monomials/p_polys.h

@@ -966 +966 @@
                                       const poly spNoether, const ring r)
 {
-#ifdef HAVE_PLURAL
-  if (rIsPluralRing(r))
-  {
-    p = nc_p_Minus_mm_Mult_qq(p, m, q, lp, lq, spNoether, r);
-    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);
@@ -985 +976 @@
 static inline poly p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, const ring r)
 {
-#ifdef HAVE_PLURAL
-  if (rIsPluralRing(r))
-  {
-    int lp, lq = 0;
-    return nc_p_Minus_mm_Mult_qq(p, m, q, lp, lq, NULL, r);
-  }
-#endif
-
   int shorter;
 

libpolys/polys/nc/nc.h

@@ -227 +227 @@
 /// for p_Minus_mm_Mult_qq in pInline2.h
 poly nc_p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, int &lp,
-                                    const int, const poly, const ring r);
+                                    const poly, const ring r);
 
 // // for p_Plus_mm_Mult_qq in pInline2.h

libpolys/polys/nc/old.gring.cc

@@ -195 +195 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-poly nc_p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, int &lp,
-                                    const int, const poly, const ring r)
+poly nc_p_Minus_mm_Mult_qq(poly p, const poly m, const poly q, int &shorter,
+                                    const poly, const ring r)
 {
   poly mc  = p_Neg( p_Copy(m, r), r );
@@ -202 +202 @@
   p_Delete(&mc, r);
 
+  int org_p=pLength(p);
+  int org_q=pLength(q);
+
   p = p_Add_q(p, mmc, r);
 
-  lp = pLength(p); // ring independent!
+  shorter = pLength(p)-org_p-org_q; // ring independent!
 
   return(p);
@@ -3179 +3182 @@
   p_Procs->p_Mult_mm  = rGR->p_Procs->p_Mult_mm  = gnc_p_Mult_mm;
   p_Procs->pp_Mult_mm = rGR->p_Procs->pp_Mult_mm = gnc_pp_Mult_mm;
-  p_Procs->p_Minus_mm_Mult_qq = rGR->p_Procs->p_Minus_mm_Mult_qq = NULL;
-  // gnc_p_Minus_mm_Mult_qq_ign; // should not be used!!!???
-
-
+  p_Procs->p_Minus_mm_Mult_qq = rGR->p_Procs->p_Minus_mm_Mult_qq = nc_p_Minus_mm_Mult_qq;
 
   // non-commutaitve multiplication by monomial from the left