Changeset 7abd61 in git

Timestamp:

Nov 13, 2017, 5:19:33 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

be94d37e5ac5d3409d99769283ea1d0f0e365d51

Parents:

bf6fa79192a542ca1e14fd45a92837cdd6ef38d2

Message:

opt: conversion from factory, sbuckets

Location:

libpolys/polys

Files:

• clapconv.cc (modified) (4 diffs)
• monomials/p_polys.h (modified) (2 diffs)
• sbuckets.cc (modified) (2 diffs)

libpolys/polys/clapconv.cc

@@ -68 +68 @@
   else
   {
-    poly term = p_Init(r);
-    pNext( term ) = NULL;
-    for ( int i = 1; i <= r->N; i++ )
-      p_SetExp( term, i, exp[i], r);
-    pGetCoeff( term )=r->cf->convFactoryNSingN(f, r->cf);
-    p_Setm( term, r );
-    if ( n_IsZero(pGetCoeff(term), r->cf) )
-    {
-      p_Delete(&term,r);
+    number n=r->cf->convFactoryNSingN(f, r->cf);
+    if ( n_IsZero(n, r->cf) )
+    {
+      n_Delete(&n,r->cf);
     }
     else
     {
+      poly term = p_Init(r);
+      //pNext( term ) = NULL; // done by p_Init
+      pGetCoeff(term)=n;
+      p_SetExpV(term,exp,r);
       sBucket_Merge_m(result,term);
     }
   }
 }
-
 
 CanonicalForm convSingPFactoryP( poly p, const ring r )
@@ -178 +176 @@
     {
       poly term = p_Init(r);
-      pNext( term ) = NULL;
+      //pNext( term ) = NULL; // done by p_Init
       int i;
       for ( i = rVar(r); i>0 ; i-- )
@@ -257 +255 @@
 {
   poly a=NULL;
-  poly t;
   for( CFIterator i=f; i.hasTerms(); i++)
   {
-    t= p_Init (r->cf->extRing);
-    p_GetCoeff(t, r->cf->extRing)= convFactoryNSingAN( i.coeff(), r );
-    if (n_IsZero(p_GetCoeff(t,r->cf->extRing),r->cf->extRing->cf))
-    {
-      p_Delete(&t,r->cf->extRing);
+    number n= convFactoryNSingAN( i.coeff(), r );
+    if (n_IsZero(n,r->cf->extRing->cf))
+    {
+      n_Delete(&n,r->cf->extRing->cf);
     }
     else
     {
+      poly t= p_Init (r->cf->extRing);
+      pGetCoeff(t)=n;
       p_SetExp(t,1,i.exp(),r->cf->extRing);
+      //p_Setm(t,r->cf->extRing);// not needed for rings with 1 variable
       a=p_Add_q(a,t,r->cf->extRing);
     }
@@ -349 +348 @@
   {
     poly term = p_Init(r);
-    pNext( term ) = NULL;
+    //pNext( term ) = NULL; // done by p_Init
     for ( int i = rVar(r); i>0; i-- )
       p_SetExp( term, i ,exp[i], r);

libpolys/polys/monomials/p_polys.h

@@ -905 +905 @@
   int shorter;
   poly res = r->p_Procs->p_Add_q(p, q, shorter, r);
-  lp = (lp + lq) - shorter;
+  lp += lq - shorter;
   return res;
 }
@@ -1482 +1482 @@
       p_SetExp(p, j, ev[j], r);
 
-  p_SetComp(p, ev[0],r);
+  if(ev[0]!=0) p_SetComp(p, ev[0],r);
   p_Setm(p, r);
 }

libpolys/polys/sbuckets.cc

@@ -189 +189 @@
   while (bucket->buckets[i].p != NULL)
   {
-    p = p_Add_q(p, bucket->buckets[i].p, length, bucket->buckets[i].length,
-                bucket->bucket_ring);
+    int shorter;
+    p = bucket->bucket_ring->p_Procs->p_Add_q(p, bucket->buckets[i].p,
+                shorter, bucket->bucket_ring);
+    length+=bucket->buckets[i].length-shorter;
     bucket->buckets[i].p = NULL;
     bucket->buckets[i].length = 0;
@@ -218 +220 @@
   while (bucket->buckets[i].p != NULL)
   {
-    p = p_Add_q(p, bucket->buckets[i].p, length, bucket->buckets[i].length,
+    int shorter;
+    p = bucket->bucket_ring->p_Procs->p_Add_q(p, bucket->buckets[i].p, shorter,
                 bucket->bucket_ring);
+    length+= bucket->buckets[i].length-shorter;
     bucket->buckets[i].p = NULL;
     bucket->buckets[i].length = 0;