Changeset 9c48f08 in git

Timestamp:

Jul 27, 2016, 4:45:25 PM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

353e59740153da5f7c66ce40ec97f46571896b9a

Parents:

8c03353daff3c76202c4a0cc2cff34080bbd7981

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-07-27 16:45:25+02:00

git-committer:

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

Message:

chg: remove global variable m_div

File:

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

kernel/GBEngine/syz4.cc

@@ -15 +15 @@
 #include <map>
 
+typedef struct {
+    poly lt;
+    unsigned long sev;
+    unsigned int label;
+} CLeadingTerm_struct;
+
+typedef std::vector<const CLeadingTerm_struct*> TReducers_test;
+typedef std::map<long, TReducers_test> CReducersHash_test;
+
 static poly TraverseTail_test(poly multiplier, const int tail,
-   const ideal m_idTails_test, const std::vector<bool> &m_lcm);
+   const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+   const CReducersHash_test *m_div);
 static poly ComputeImage_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm);
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div);
 static poly TraverseTail_test(poly multiplier, poly tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm);
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div);
 static inline poly ReduceTerm_test(poly multiplier, poly term4reduction,
     poly syztermCheck, const ideal m_idTails_test,
-    const std::vector<bool> &m_lcm);
+    const std::vector<bool> &m_lcm, const CReducersHash_test *m_div);
 static poly leadmonom_test(const poly p, const ring r, const bool bSetZeroComp = true);
 
@@ -59 +71 @@
 
 static poly TraverseNF_test(const poly a, ideal m_idLeads_test,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm)
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div)
 {
   const ideal& L = m_idLeads_test;
@@ -65 +78 @@
   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);
-  t = p_Add_q(t, ReduceTerm_test(aa, L->m[r], a, m_idTails_test, m_lcm), R);
+  poly t = TraverseTail_test(aa, r, m_idTails_test, m_lcm, m_div);
+  t = p_Add_q(t,
+      ReduceTerm_test(aa, L->m[r], a, m_idTails_test, m_lcm, m_div), R);
   p_Delete(&aa, R);
   return t;
@@ -122 +136 @@
 
 static poly TraverseTail_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm)
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div)
 {
   const ring& r = currRing;
@@ -144 +159 @@
        return p;
      }
-     const poly p = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm);
+     const poly p
+         = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm, m_div);
      itr = T.find(multiplier);
      if( itr == T.end() )
@@ -155 +171 @@
   }
 #endif   // CACHE
-  const poly p = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm);
+  const poly p
+      = ComputeImage_test(multiplier, tail, m_idTails_test, m_lcm, m_div);
 #if CACHE
   top_itr = m_cache_test.find(tail);
@@ -182 +199 @@
 
 static poly ComputeImage_test(poly multiplier, const int tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm)
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div)
 {
   const poly t = m_idTails_test->m[tail];
   if(t != NULL)
   {
-    const poly p = TraverseTail_test(multiplier, t, m_idTails_test, m_lcm);
+    const poly p
+        = TraverseTail_test(multiplier, t, m_idTails_test, m_lcm, m_div);
     return p;
   }
@@ -200 +219 @@
 
 static poly TraverseTail_test(poly multiplier, poly tail,
-    const ideal m_idTails_test, const std::vector<bool> &m_lcm)
+    const ideal m_idTails_test, const std::vector<bool> &m_lcm,
+    const CReducersHash_test *m_div)
 {
   const ring r = currRing;
@@ -217 +237 @@
   {
     const poly rt
-        = ReduceTerm_test(multiplier, p, NULL, m_idTails_test, m_lcm);
+        = ReduceTerm_test(multiplier, p, NULL, m_idTails_test, m_lcm, m_div);
 #if BUCKETS == 0
     sum.Add(rt);
@@ -292 +312 @@
 }
 
-typedef struct {
-    poly lt;
-    unsigned long sev;
-    unsigned int label;
-} CLeadingTerm_struct;
-
-typedef std::vector<const CLeadingTerm_struct*> TReducers_test;
-typedef std::map<long, TReducers_test> CReducersHash_test;
-
 static void deleteCRH(CReducersHash_test *C)
 {
@@ -323 +334 @@
 
 static CReducersHash_test m_checker;
-static CReducersHash_test m_div;
 
 bool IsDivisible(const CReducersHash_test *C, const poly product);
 
 poly FindReducer(const poly multiplier, const poly t, const poly syzterm,
-    const CReducersHash_test &syz_checker)
+    const CReducersHash_test &syz_checker, const CReducersHash_test *m_div)
 {
   const ring r = currRing;
   CReducersHash_test::const_iterator m_itr
-      = m_div.find(p_GetComp(t, currRing));
-  if (m_itr == m_div.end()) {
+      = m_div->find(p_GetComp(t, currRing));
+  if (m_itr == m_div->end()) {
     return NULL;
   }
@@ -402 +412 @@
 static inline poly ReduceTerm_test(poly multiplier, poly term4reduction,
     poly syztermCheck, const ideal m_idTails_test,
-    const std::vector<bool> &m_lcm)
+    const std::vector<bool> &m_lcm, const CReducersHash_test *m_div)
 {
   const ring r = currRing;
@@ -408 +418 @@
   if( CLCM_test_Check(m_lcm, multiplier) )
   {
-    s = FindReducer(multiplier, term4reduction, syztermCheck, m_checker);
+    s = FindReducer(multiplier, term4reduction, syztermCheck, m_checker,
+        m_div);
   }
   if( s == NULL )
@@ -416 +427 @@
   poly b = leadmonom_test(s, r);
   const int c = p_GetComp(s, r) - 1;
-  const poly t = TraverseTail_test(b, c, m_idTails_test, m_lcm);
+  const poly t = TraverseTail_test(b, c, m_idTails_test, m_lcm, m_div);
   pDelete(&b);
   if( t != NULL )
@@ -620 +631 @@
     const ideal m_idLeads_test, const ideal m_syzLeads_test)
 {
-    redefine(&m_div, m_idLeads_test);
     redefine(&m_checker, m_syzLeads_test);
 #if CACHE
@@ -652 +662 @@
     }
     std::vector<bool> m_lcm = CLCM_test_redefine(m_idLeads_test);
+    CReducersHash_test m_div;
+    initialize(m_div, m_idLeads_test);
     ideal m_syzLeads_test = idCopy(res[index]);
     for (int i = IDELEMS(res[index])-1; i >= 0; i--) {
@@ -664 +676 @@
         p->next = NULL;
         res[index]->m[j]->next
-            = TraverseNF_test(p, m_idLeads_test, m_idTails_test, m_lcm);
-    }
+            = TraverseNF_test(p, m_idLeads_test, m_idTails_test, m_lcm, &m_div);
+    }
+    deleteCRH(&m_div);
     m_lcm.clear();
     idDelete(&m_idLeads_test);
@@ -733 +746 @@
 
     deleteCRH(&m_checker);
-    deleteCRH(&m_div);
 #if CACHE
     for (TCache_test::iterator it = m_cache_test.begin();