Changeset 02c60e in git

Timestamp:

Oct 5, 2017, 7:29:32 PM (7 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

88148a1de1b5b71e266c95fd5fa98d9bba5edd6f

Parents:

2b968fa27bc9c56858aeeaf4cca475d621c80fc3

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-10-05 19:29:32+02:00

git-committer:

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

Message:

chg: rename some functions and variables

File:

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

kernel/GBEngine/syz4.cc

@@ -76 +76 @@
 #define delete_lts_hash(C) C->clear()
 
-poly FindReducer(const poly multiplier, const poly t, const lts_hash *m_div)
-{
-    const ring r = currRing;
-    lts_hash::const_iterator m_itr = m_div->find(p_GetComp(t, currRing));
-    if (m_itr == m_div->end()) {
+poly find_reducer(const poly multiplier, const poly t,
+        const lts_hash *hash_previous_module)
+{
+    const ring r = currRing;
+    lts_hash::const_iterator m_itr = hash_previous_module->find(p_GetComp(t,
+                currRing));
+    if (m_itr == hash_previous_module->end()) {
         return NULL;
     }
     lts_vector::const_iterator m_current = (m_itr->second).begin();
-    lts_vector::const_iterator m_finish  = (m_itr->second).end();
+    lts_vector::const_iterator m_finish = (m_itr->second).end();
     const poly q = p_New(r);
     pNext(q) = NULL;
@@ -106 +108 @@
 }
 
-static poly TraverseTail_test(poly multiplier, const int tail,
+static poly traverse_tail(poly multiplier, const int tail,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *m_div);
-
-static inline poly ReduceTerm_test(poly multiplier, poly term4reduction,
+        const lts_hash *hash_previous_module);
+
+static inline poly reduce_term(poly multiplier, poly term4reduction,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *m_div)
-{
-    const ring r = currRing;
-    poly s = FindReducer(multiplier, term4reduction, m_div);
+        const lts_hash *hash_previous_module)
+{
+    const ring r = currRing;
+    poly s = find_reducer(multiplier, term4reduction, hash_previous_module);
     if( s == NULL )
     {
@@ -121 +123 @@
     }
     const int c = p_GetComp(s, r) - 1;
-    const poly t = TraverseTail_test(s, c, previous_module, variables, m_div);
+    const poly t = traverse_tail(s, c, previous_module, variables,
+            hash_previous_module);
     if( t != NULL )
         s = p_Add_q(s, t, r);
@@ -127 +130 @@
 }
 
-static poly ComputeImage_test(poly multiplier, const int t,
+static poly compute_image(poly multiplier, const int t,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *m_div)
+        const lts_hash *hash_previous_module)
 {
     const poly tail = previous_module->m[t]->next;
@@ -141 +144 @@
         for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
         {
-            const poly rt = ReduceTerm_test(multiplier, p, previous_module,
-                    variables, m_div);
+            const poly rt = reduce_term(multiplier, p, previous_module,
+                    variables, hash_previous_module);
             sBucket_Add_p(sum, rt, pLength(rt));
         }
@@ -187 +190 @@
 #endif   // CACHE
 
-static poly TraverseTail_test(poly multiplier, const int tail,
+static poly traverse_tail(poly multiplier, const int tail,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *m_div)
+        const lts_hash *hash_previous_module)
 {
     const ring& r = currRing;
@@ -212 +215 @@
             return p;
         }
-        const poly p = ComputeImage_test(multiplier, tail, previous_module,
-                variables, m_div);
+        const poly p = compute_image(multiplier, tail, previous_module,
+                variables, hash_previous_module);
         itr = T.find(multiplier);
         if( itr == T.end() )
@@ -224 +227 @@
     }
 #endif   // CACHE
-    const poly p = ComputeImage_test(multiplier, tail, previous_module,
-            variables, m_div);
+    const poly p = compute_image(multiplier, tail, previous_module, variables,
+            hash_previous_module);
 #if CACHE
     top_itr = m_cache_test.find(tail);
@@ -251 +254 @@
 
 static poly lift_ext_LT(const poly a, const ideal previous_module,
-        const std::vector<bool> &variables, const lts_hash *m_div)
+        const std::vector<bool> &variables,
+        const lts_hash *hash_previous_module)
 {
     const ring R = currRing;
-    poly t1 = ComputeImage_test(a, p_GetComp(a, R)-1,
-            previous_module, variables, m_div);
-    poly t2 = TraverseTail_test(a->next, p_GetComp(a->next, R)-1,
-            previous_module, variables, m_div);
+    poly t1 = compute_image(a, p_GetComp(a, R)-1, previous_module, variables,
+            hash_previous_module);
+    poly t2 = traverse_tail(a->next, p_GetComp(a->next, R)-1, previous_module,
+            variables, hash_previous_module);
     t1 = p_Add_q(t1, t2, R);
     return t1;