Changeset daa4e5 in git

Timestamp:

Nov 21, 2012, 5:43:11 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

da9d522d025bd8d8edf9686d84441705b53f89bd

Parents:

68fedf3295a64608c08e75ff1fba1dc2a5c9ef32

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-21 17:43:11+01:00

git-committer:

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

Message:

Using s/k-buckets in TraverseTail and SchreyerSyzygyNF

TODO: refine!

File:

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

dyn_modules/syzextra/syzextra.cc

@@ -32 +32 @@
 #include <polys/simpleideals.h>
 
+#include <polys/kbuckets.h> // for kBucket*
+#include <polys/nc/summator.h> // for CPolynomialSummator
+#include <polys/operations/p_Mult_q.h> // for MIN_LENGTH_BUCKET
+
 #include <kernel/kstd1.h>
 #include <kernel/polys.h>
@@ -682 +686 @@
 
   poly aa = leadmonom(a, R); assume( aa != NULL); // :(
+
+  
   poly t = TraverseTail(aa, r);
 
@@ -903 +909 @@
 
   assume( c >= 0 && c < IDELEMS(T) );
-
+  kBucket_pt bucket = kBucketCreate(r); kbTest(bucket);
+
+//  kBucketInit(bucket, NULL, 0); // not needed!?
+      
   poly p = leadmonom(syz_lead, r); // :(  
-  poly spoly = pp_Mult_qq(p, T->m[c], 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!?
+  kbTest(bucket);  
   p_Delete(&p, r);
-
 
   c = p_GetComp(syz_2, r) - 1;
@@ -913 +923 @@
 
   p = leadmonom(syz_2, r); // :(
-  spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), 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]));
+  kbTest(bucket);
   p_Delete(&p, r);
 
-  poly tail = syz_2; // TODO: use bucket!?
-
-  while (spoly != NULL)
-  {
-    poly t = m_div.FindReducer(spoly, NULL, m_checker);
-
-    p_LmDelete(&spoly, 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);  
+
+ 
+  kbTest(bucket);
+  for( poly spoly = kBucketExtractLm(bucket); spoly != NULL; p_LmDelete(&spoly, r), spoly = kBucketExtractLm(bucket))
+  {    
+    kbTest(bucket);
+    poly t = m_div.FindReducer(spoly, NULL, m_checker);    
 
     if( t != NULL )
@@ -931 +947 @@
       assume( c >= 0 && c < IDELEMS(T) );
 
-      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]));  
+//      spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), r);
 
       p_Delete(&p, r);
 
-      tail = p_Add_q(tail, t, r);
-    }    
-  }
-
+      tail.AddAndDelete(t, 1);  
+    } // otherwise discard that leading term altogether!
+    kbTest(bucket);
+  }
+
+  // now bucket must be empty!
+  kbTest(bucket);
+  assume( kBucketClear(bucket) == NULL );
+  kBucketDestroy(&bucket); // TODO: reuse the bucket!!!
+      
   return tail;
 }
@@ -970 +993 @@
   assume( T != NULL );
 
-  poly s = NULL;
 
   if( (!__TAILREDSYZ__) || m_lcm.Check(multiplier) )
+  {
+    const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(tail) < MIN_LENGTH_BUCKET);
+    CPolynomialSummator sum(r, bUsePolynomial);
+//    poly s = NULL;
     for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
-      s = p_Add_q(s, ReduceTerm(multiplier, p, NULL), r);  
-
-  return s;
+      sum += ReduceTerm(multiplier, p, NULL);
+    return sum;
+  }
+
+  return NULL;
+
 }