Changeset 1d79ec in git

Timestamp:

Nov 12, 2017, 11:46:21 AM (6 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

0dc033e870e300d7150670fda5b4719cf753b37e

Parents:

3d0ce76d08bab57556cda4600514c027f7ee3391

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-11-12 11:46:21+01:00

git-committer:

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

Message:

chg: replace lts_hash by lts_vector[]

File:

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

kernel/GBEngine/syz4.cc

@@ -60 +60 @@
 
 typedef std::vector<lt_struct> lts_vector;
-typedef std::map<long, lts_vector> lts_hash;
-
-static void initialize_lts_hash(lts_hash &C, const ideal L)
+
+static void initialize_hash(lts_vector *C, const ideal L)
 {
     const ring R = currRing;
@@ -74 +73 @@
 }
 
-#define delete_lts_hash(C) C->clear()
-
 static poly find_reducer(const poly multiplier, const poly t,
-        const lts_hash *hash_previous_module)
-{
-    const ring r = currRing;
-    lts_hash::const_iterator itr
-        = hash_previous_module->find(__p_GetComp(t, r));
-    if (unlikely(itr == hash_previous_module->end())) {
+        const lts_vector *hash_previous_module)
+{
+    const ring r = currRing;
+    const lts_vector v = hash_previous_module[__p_GetComp(t, r)];
+    lts_vector::const_iterator itr_curr = v.begin();
+    lts_vector::const_iterator itr_end = v.end();
+    if (unlikely(itr_curr == itr_end)) {
         return NULL;
     }
-    lts_vector::const_iterator itr_curr = (itr->second).begin();
-    lts_vector::const_iterator itr_end = (itr->second).end();
     const poly q = p_New(r);
     pNext(q) = NULL;
@@ -111 +107 @@
 static poly traverse_tail(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module);
+        const lts_vector *hash_previous_module);
 #else
 static poly compute_image(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module);
+        const lts_vector *hash_previous_module);
 #define traverse_tail compute_image
 #endif   // CACHE
@@ -121 +117 @@
 static poly reduce_term(const poly multiplier, const poly term,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module)
+        const lts_vector *hash_previous_module)
 {
     poly s = find_reducer(multiplier, term, hash_previous_module);
@@ -139 +135 @@
 static poly compute_image(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module)
+        const lts_vector *hash_previous_module)
 {
     const poly tail = previous_module->m[comp]->next;
@@ -219 +215 @@
 static poly traverse_tail(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module)
+        const lts_vector *hash_previous_module)
 {
     cache_term *T = &(Cache[comp]);
@@ -235 +231 @@
 static poly lift_ext_LT(const poly a, const ideal previous_module,
         const std::vector<bool> &variables,
-        const lts_hash *hash_previous_module)
+        const lts_vector *hash_previous_module)
 {
     const ring R = currRing;
@@ -462 +458 @@
     initialize_cache(res[index-1]->ncols);
 #endif   // CACHE
-    lts_hash *hash_previous_module = new lts_hash();
-    initialize_lts_hash(*hash_previous_module, res[index-1]);
+    lts_vector *hash_previous_module = new lts_vector[res[index-1]->rank+1];
+    initialize_hash(hash_previous_module, res[index-1]);
     for (int j = res[index]->ncols-1; j >= 0; j--) {
         res[index]->m[j]->next->next = lift_ext_LT(res[index]->m[j],
                 res[index-1], variables, hash_previous_module);
     }
-    delete_lts_hash(hash_previous_module);
-    delete(hash_previous_module);
+    delete[](hash_previous_module);
 #if CACHE
     delete_cache(res[index-1]->ncols);