Changeset 5919a7 in git

Timestamp:

Aug 23, 2016, 4:24:56 PM (7 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4c6e9d4ea46ef519f4c5e60541f5dbd83e8cc656

Parents:

74eafed4a90b880a02beba6665b920093bec6aa2

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-08-23 16:24:56+02:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-12-15 12:17:07+01:00

Message:

chg: merge TraverseTail(poly, poly) into ComputeImage()

File:

• kernel/GBEngine/syz4.cc (modified) (2 diffs)

kernel/GBEngine/syz4.cc

@@ -200 +200 @@
 }
 
-static poly ComputeImage_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
-    const CReducersHash_test *m_div, const CReducersHash_test *m_checker)
-{
-  const poly t = m_idTails_test->m[tail];
-  if(t != NULL)
-  {
-    const poly p = TraverseTail_test(multiplier, t, m_idTails_test, m_lcm,
-        m_div, m_checker);
-    return p;
-  }
-  return NULL;
-}
-
 #define BUCKETS 1
 /* 0: use original code (not implemented)
@@ -220 +206 @@
  */
 
-static poly TraverseTail_test(poly multiplier, poly tail,
+static poly ComputeImage_test(poly multiplier, const int t,
     const ideal m_idTails_test, const std::vector<bool> &m_lcm,
     const CReducersHash_test *m_div, const CReducersHash_test *m_checker)
 {
-  const ring r = currRing;
-  if( !CLCM_test_Check(m_lcm, multiplier) )
-  {
-    return NULL;
-  }
+  const poly tail = m_idTails_test->m[t];
+  if(tail != NULL)
+  {
+    const ring r = currRing;
+    if( !CLCM_test_Check(m_lcm, multiplier) )
+    {
+      return NULL;
+    }
 #if BUCKETS == 0
-  SBucketWrapper sum(r, m_sum_bucket_factory);
+    SBucketWrapper sum(r, m_sum_bucket_factory);
 #elif BUCKETS == 1
-  sBucket_pt sum = sBucketCreate(currRing);
+    sBucket_pt sum = sBucketCreate(currRing);
 #else   // BUCKETS == 2
-  poly s = NULL;
+    poly s = NULL;
 #endif   // BUCKETS
-  for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
-  {
-    const poly rt = ReduceTerm_test(multiplier, p, NULL, m_idTails_test, m_lcm,
-        m_div, m_checker);
+    for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
+    {
+      const poly rt = ReduceTerm_test(multiplier, p, NULL, m_idTails_test,
+          m_lcm, m_div, m_checker);
 #if BUCKETS == 0
-    sum.Add(rt);
+      sum.Add(rt);
 #elif BUCKETS == 1
-    sBucket_Add_p(sum, rt, pLength(rt));
+      sBucket_Add_p(sum, rt, pLength(rt));
 #else   // BUCKETS == 2
-    s = p_Add_q(s, rt, r);
+      s = p_Add_q(s, rt, r);
 #endif   // BUCKETS
-  }
+    }
 #if BUCKETS == 0
-  const poly s = sum.ClearAdd();
+    const poly s = sum.ClearAdd();
 #elif BUCKETS == 1
-  poly s;
-  int l;
-  sBucketClearAdd(sum, &s, &l);
-  sBucketDestroy(&sum);
+    poly s;
+    int l;
+    sBucketClearAdd(sum, &s, &l);
+    sBucketDestroy(&sum);
 #else   // BUCKETS == 2
-  // nothing to do
+    // nothing to do
 #endif   // BUCKETS
-  return s;
+    return s;
+  }
+  return NULL;
 }