Changeset 2c2e17 in git

Timestamp:

Sep 15, 2016, 3:54:39 PM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8fb89b97de39c2d1d200a48219687931114688c9

Parents:

f106eb8a184635eaecf317a1da8db8fadd937143

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-09-15 15:54:39+02:00

git-committer:

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

Message:

chg: get rid of m_idTails_test

File:

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

kernel/GBEngine/syz4.cc

@@ -25 +25 @@
 
 static poly TraverseTail_test(poly multiplier, const int tail,
-   const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+   const ideal previous_module, const std::vector<bool> &m_lcm,
    const CReducersHash_test *m_div, const CReducersHash_test *m_checker);
 static poly ComputeImage_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const ideal previous_module, const std::vector<bool> &m_lcm,
     const CReducersHash_test *m_div, const CReducersHash_test *m_checker);
 static inline poly ReduceTerm_test(poly multiplier, poly term4reduction,
-    poly syztermCheck, const ideal m_idTails_test,
+    poly syztermCheck, const ideal previous_module,
     const std::vector<bool> &m_lcm, const CReducersHash_test *m_div,
     const CReducersHash_test *m_checker);
@@ -68 +68 @@
 }
 
-static poly TraverseNF_test(const poly a, const ideal L,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
-    const CReducersHash_test *m_div, const CReducersHash_test *m_checker)
+static poly TraverseNF_test(const poly a, const ideal previous_module,
+    const std::vector<bool> &m_lcm, const CReducersHash_test *m_div,
+    const CReducersHash_test *m_checker)
 {
   const ring R = currRing;
   const int r = p_GetComp(a, R) - 1;
   poly aa = leadmonom_test(a, R);
-  poly t = TraverseTail_test(aa, r, m_idTails_test, m_lcm, m_div, m_checker);
+  poly t = TraverseTail_test(aa, r, previous_module, m_lcm, m_div, m_checker);
   t = p_Add_q(t,
-      ReduceTerm_test(aa, L->m[r], a, m_idTails_test, m_lcm, m_div, m_checker),
-      R);
+      ReduceTerm_test(aa, previous_module->m[r], a, previous_module, m_lcm,
+      m_div, m_checker), R);
   p_Delete(&aa, R);
   return t;
@@ -131 +131 @@
 
 static poly TraverseTail_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const ideal previous_module, const std::vector<bool> &m_lcm,
     const CReducersHash_test *m_div, const CReducersHash_test *m_checker)
 {
@@ -154 +154 @@
        return p;
      }
-     const poly p = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm,
+     const poly p = ComputeImage_test(multiplier, tail, previous_module, m_lcm,
          m_div, m_checker);
      itr = T.find(multiplier);
@@ -166 +166 @@
   }
 #endif   // CACHE
-  const poly p = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm,
+  const poly p = ComputeImage_test(multiplier, tail, previous_module, m_lcm,
       m_div, m_checker);
 #if CACHE
@@ -200 +200 @@
 
 static poly ComputeImage_test(poly multiplier, const int t,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const ideal previous_module, const std::vector<bool> &m_lcm,
     const CReducersHash_test *m_div, const CReducersHash_test *m_checker)
 {
-  const poly tail = m_idTails_test->m[t];
+  const poly tail = previous_module->m[t]->next;
   if(tail != NULL)
   {
@@ -219 +219 @@
     for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
     {
-      const poly rt = ReduceTerm_test(multiplier, p, NULL, m_idTails_test,
+      const poly rt = ReduceTerm_test(multiplier, p, NULL, previous_module,
           m_lcm, m_div, m_checker);
 #if BUCKETS == 0
@@ -375 +375 @@
 
 static inline poly ReduceTerm_test(poly multiplier, poly term4reduction,
-    poly syztermCheck, const ideal m_idTails_test,
+    poly syztermCheck, const ideal previous_module,
     const std::vector<bool> &m_lcm, const CReducersHash_test *m_div,
     const CReducersHash_test *m_checker)
@@ -393 +393 @@
   const int c = p_GetComp(s, r) - 1;
   const poly t
-      = TraverseTail_test(b, c, m_idTails_test, m_lcm, m_div, m_checker);
+      = TraverseTail_test(b, c, previous_module, m_lcm, m_div, m_checker);
   pDelete(&b);
   if( t != NULL )
@@ -612 +612 @@
 static void computeLiftings(const resolvente res, const int index)
 {
-    ideal m_idTails_test = idInit(IDELEMS(res[index-1]), res[index-1]->rank);
-    for (int i = IDELEMS(res[index-1])-1; i >= 0; i--) {
-        m_idTails_test->m[i] = pCopy(res[index-1]->m[i]->next);
-    }
     std::vector<bool> m_lcm = CLCM_test_redefine(res[index-1]);
     CReducersHash_test m_div;
@@ -632 +628 @@
         pDelete(&res[index]->m[j]->next);
         p->next = NULL;
-        res[index]->m[j]->next = TraverseNF_test(p, res[index-1],
-            m_idTails_test, m_lcm, &m_div, &m_checker);
+        res[index]->m[j]->next = TraverseNF_test(p, res[index-1], m_lcm,
+            &m_div, &m_checker);
     }
     deleteCRH(&m_checker);
     deleteCRH(&m_div);
     m_lcm.clear();
-    idDelete(&m_idTails_test);
     idDelete(&m_syzLeads_test);
 }