Changeset 0366c4 in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Feb 11, 2013, 4:55:42 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

066b2f73d6d0f598eb063fc56982fb77c0db67b2

Parents:

c462b60ab56fe1781c7f591d40ccd2799acd6c92

Message:

opt: avoid pAdd, use pReverse in chinrem

from master

File:

• libpolys/polys/monomials/p_polys.cc (modified) (25 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -136 +136 @@
     else
     {
+      //Print("new mon:");pWrite(h);
       p_SetCoeff(h,n,R);
-      //Print("new mon:");pWrite(h);
-      res_p=p_Add_q(res_p,h,R);
-    }
-  }
+      pNext(h)=res_p;
+      res_p=h; // building res_p in reverse order!
+    }
+  }
+  res_p=pReverse(res_p);
+  pTest(res_p);
   return res_p;
 }
@@ -234 +237 @@
 
           const short len_gen= o->data.am.len_gen;
-          
+
           if ((c > 0) && (c <= len_gen))
           {
@@ -241 +244 @@
             ord += w[c];
           }
-          
+
           p->exp[o->data.am.place] = ord;
           break;
@@ -436 +439 @@
 
             assume( c < IDELEMS(F) ); // What about others???
-            
+
             const poly pp = F->m[c]; // get reference monomial!!!
 
             if(pp == NULL)
               break;
-            
+
             assume(pp != NULL);
 
@@ -1571 +1574 @@
   for (int i=rVar(r); i; --i)
     p_SetExp(m,i, si_max( p_GetExp(a,i,r), p_GetExp(b,i,r)),r);
-  
+
   p_SetComp(m, si_max(p_GetComp(a,r), p_GetComp(b,r)),r);
   /* Don't do a pSetm here, otherwise hres/lres chockes */
@@ -1998 +2001 @@
   assume( ph != NULL );
 
-  assume( r != NULL ); assume( r->cf != NULL ); 
+  assume( r != NULL ); assume( r->cf != NULL );
 
 
@@ -2016 +2019 @@
   }
 #endif
-  
-  
+
+
 #ifdef HAVE_RINGS
   if (rField_is_Ring(r))
@@ -2064 +2067 @@
       p_Test(ph, r); n_Test(pGetCoeff(ph), r->cf);
       assume(n_GreaterZero(pGetCoeff(ph), r->cf)); // ??
-      
+
       // if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);
       return;
     }
 #endif
-    
+
     n_Normalize(pGetCoeff(ph),r->cf);
     if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);
@@ -2122 +2125 @@
 //    }
 #endif
-    if (rField_is_Q_a(r)) 
+    if (rField_is_Q_a(r))
     {
       // we only need special handling for alg. ext.
@@ -2446 +2449 @@
 
   assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
-  
+
 #if CLEARENUMERATORS
   if( 0 )
@@ -2488 +2491 @@
 
   assume(p != NULL);
-  
+
   if(pNext(p)==NULL)
   {
@@ -2507 +2510 @@
     assume( n_GreaterZero(pGetCoeff(ph),C) );
     if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
-    
+
     return start;
   }
@@ -2525 +2528 @@
     assume(n_GreaterZero(pGetCoeff(ph), C)); // ??
 //    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
-    
+
     return start;
   }
@@ -2624 +2627 @@
   assume( n_GreaterZero(pGetCoeff(ph),C) );
   if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
-  
+
   return start;
 }
@@ -2643 +2646 @@
 
     n_ClearDenominators(itr, d, C); // multiply with common denom. d
-    n_ClearContent(itr, h, C); // divide by the content h 
-
-    c = n_Div(d, h, C); // d/h 
+    n_ClearContent(itr, h, C); // divide by the content h
+
+    c = n_Div(d, h, C); // d/h
 
     n_Delete(&d, C);
@@ -2664 +2667 @@
   }
 #endif
-  
-  
+
+
   if( pNext(p) == NULL )
   {
@@ -2677 +2680 @@
       c = n_Neg(c, C);
     }
-    
+
     return;
   }
 
   assume( pNext(p) != NULL );
-  
+
 #if CLEARENUMERATORS
   if( nCoeff_is_Q(C) || nCoeff_is_Q_a(C) )
   {
     CPolyCoeffsEnumerator itr(ph);
-    
+
     n_ClearDenominators(itr, d, C); // multiply with common denom. d
-    n_ClearContent(itr, h, C); // divide by the content h 
-
-    c = n_Div(d, h, C); // d/h 
+    n_ClearContent(itr, h, C); // divide by the content h
+
+    c = n_Div(d, h, C); // d/h
 
     n_Delete(&d, C);
@@ -2711 +2714 @@
 #endif
 
-  
-  
+
+
 
   if(1)
@@ -2802 +2805 @@
     c = n_Neg(c, C);
   }
-  
+
 }
 
@@ -3619 +3622 @@
   assume(dst != NULL);
   assume(dst->cf != NULL);
-  
+
   while (p != NULL)
   {
@@ -3633 +3636 @@
 
       p_GetCoeff(qq, dst) = n;// Note: n can be a ZERO!!!
-      // coef may be zero:  
+      // coef may be zero:
 //      p_Test(qq, dst);
     }
@@ -3648 +3651 @@
       if ( nCoeff_is_algExt(dst->cf) )
         p_Normalize(aq,dst);
-      
+
       if (aq == NULL)
         p_SetCoeff(qq, n_Init(0, dst->cf),dst); // Very dirty trick!!!
@@ -4038 +4041 @@
   assume( r1 == r2 || rSamePolyRep(r1, r2) ); // will be used in rEqual!
   assume( r1->cf == r2->cf );
-  
+
   while ((p1 != NULL) && (p2 != NULL))
   {
@@ -4046 +4049 @@
     if (! p_ExpVectorEqual(p1, p2, r1, r2))
       return FALSE;
-    
+
     if (! n_Equal(p_GetCoeff(p1,r1), p_GetCoeff(p2,r2), r1->cf ))
       return FALSE;
-    
+
     pIter(p1);
     pIter(p2);
@@ -4120 +4123 @@
     {
       a = next;
-      next = pNext(a);      
+      next = pNext(a);
       l++;
     }