Changeset 0838d7 in git for dyn_modules/syzextra/syzextra.cc

Timestamp:

Nov 22, 2012, 10:25:46 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

c4138f219380e1837aed8b4bcdfc42c73bee603b

Parents:

4ca3e3c15a08dab1cfe6bed017b0254dc13734b3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-22 22:25:46+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:48+02:00

Message:

Reuse s/k-buckets + removal of CPolynomialSummator

chg: do not explicitly compute length for bucket addition

File:

• dyn_modules/syzextra/syzextra.cc (modified) (9 diffs)

dyn_modules/syzextra/syzextra.cc

@@ -33 +33 @@
 
 #include <polys/kbuckets.h> // for kBucket*
-#include <polys/nc/summator.h> // for CPolynomialSummator
+#include <polys/sbuckets.h> // for sBucket*
+//#include <polys/nc/summator.h> // for CPolynomialSummator
 #include <polys/operations/p_Mult_q.h> // for MIN_LENGTH_BUCKET
 
@@ -237 +238 @@
   extern void id_Delete (ideal*, const ring);
    
- id_Delete(const_cast<ideal*>(&m_idTails), m_rBaseRing); // TODO!!!   
+  id_Delete(const_cast<ideal*>(&m_idTails), m_rBaseRing); // TODO!!!
+
+  if( m_sum_bucket != NULL )
+  {
+    sBucketDestroy(&m_sum_bucket);
+    m_sum_bucket = NULL;
+  }
+
+  if( m_spoly_bucket != NULL )
+  {
+    kBucketDestroy(&m_spoly_bucket);
+    m_spoly_bucket = NULL;
+  }  
 }
   /*
@@ -740 +753 @@
   const ring& R = m_rBaseRing;
 
+  if( m_sum_bucket == NULL )
+    m_sum_bucket = sBucketCreate(R);
+
+  if( m_spoly_bucket == NULL )
+    m_spoly_bucket = kBucketCreate(R);
+
+
   assume( IDELEMS(L) == IDELEMS(T) );
 #ifndef NDEBUG
@@ -941 +961 @@
 
   assume( c >= 0 && c < IDELEMS(T) );
-  kBucket_pt bucket = kBucketCreate(r); kbTest(bucket);
+  sBucket_pt& tail   = m_sum_bucket; assume( tail != NULL );
+  kBucket_pt& bucket = m_spoly_bucket; assume( bucket != NULL ); kbTest(bucket);
+
 
 //  kBucketInit(bucket, NULL, 0); // not needed!?
@@ -947 +969 @@
   poly p = leadmonom(syz_lead, r); // :(  
 //  poly spoly = pp_Mult_qq(p, T->m[c], r);  
-  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], pLength(T->m[c])); // TODO: store length of tails separately!?
+  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // TODO: store pLength(T->m[c]) separately!? 
+  p_Delete(&p, r);
+  
   kbTest(bucket);  
-  p_Delete(&p, r);
 
   c = p_GetComp(syz_2, r) - 1;
@@ -956 +979 @@
   p = leadmonom(syz_2, r); // :(
 //  spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), r);
-  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], pLength(T->m[c]));
+  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // pLength(T->m[c])?!
   kbTest(bucket);
   p_Delete(&p, r);
 
   // TODO: use bucket!?
-  const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(spoly) < MIN_LENGTH_BUCKET);
-  CPolynomialSummator tail(r, bUsePolynomial);
-  tail.AddAndDelete(syz_2, 1);  
-
+//  const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(spoly) < MIN_LENGTH_BUCKET);
+//  CPolynomialSummator tail(r, bUsePolynomial);                       
+  sBucket_Add_p(tail, syz_2, 1); // tail.AddAndDelete(syz_2, 1);  
  
   kbTest(bucket);
@@ -979 +1001 @@
       assume( c >= 0 && c < IDELEMS(T) );
 
-      kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], pLength(T->m[c]));  
+      kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // pLength(T->m[c])?
 //      spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), r);
 
       p_Delete(&p, r);
 
-      tail.AddAndDelete(t, 1);  
+      sBucket_Add_p(tail, t, 1); // tail.AddAndDelete(t, 1);
     } // otherwise discard that leading term altogether!
     kbTest(bucket);
@@ -992 +1014 @@
   kbTest(bucket);
   assume( kBucketClear(bucket) == NULL );
-  kBucketDestroy(&bucket); // TODO: reuse the bucket!!!
-      
-  return tail;
+
+  poly result; int len;
+  sBucketClearAdd(tail, &result, &len); // TODO: use Merge with sBucket???
+  assume( pLength(result) == len );
+     
+  return result;
 }
 
@@ -1028 +1053 @@
   if( (!__TAILREDSYZ__) || m_lcm.Check(multiplier) )
   {
-    const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(tail) < MIN_LENGTH_BUCKET);
-    CPolynomialSummator sum(r, bUsePolynomial);
+//    const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(tail) < MIN_LENGTH_BUCKET);
+    sBucket_pt& sum   = m_sum_bucket; assume( sum != NULL );
+    poly s; int len;
+    
+//    CPolynomialSummator sum(r, bUsePolynomial);
 //    poly s = NULL;
     for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
-      sum += ReduceTerm(multiplier, p, NULL);
-    return sum;
+    {
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      const poly rt = ReduceTerm(multiplier, p, NULL); // TODO: also return/store length?
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      
+      const int lp = pLength(rt);
+      if( rt != NULL && lp != 0 )
+        sBucket_Add_p(sum, rt, lp); 
+    }
+
+    sBucketClearAdd(sum, &s, &len);
+    assume( pLength(s) == len );
+    return s;
   }