Changeset 57619d3 in git

Timestamp:

Sep 29, 2016, 10:47:10 AM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1370537d70de0c592ab2af885f12372ef48e4704

Parents:

3865177709f92bbb886a5bf1e8bfa2eebbacf683

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-09-29 10:47:10+02:00

git-committer:

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

Message:

chg: make elements of lts_vector non-pointers

File:

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

kernel/GBEngine/syz4.cc

@@ -21 +21 @@
 } lt_struct;
 
-typedef std::vector<const lt_struct*> lts_vector;
+typedef std::vector<lt_struct> lts_vector;
 typedef std::map<long, lts_vector> lts_hash;
 
@@ -34 +34 @@
       if( a != NULL )
       {
-        lt_struct *CLT = (lt_struct*)omalloc(sizeof(lt_struct));
-        CLT->lt = a;
-        CLT->sev = p_GetShortExpVector(a, R);
-        CLT->comp = k;
-        C[p_GetComp(a, R)].push_back( CLT );
+        C[p_GetComp(a, R)].push_back({a, p_GetShortExpVector(a, R),
+            (unsigned int)k});
       }
     }
@@ -48 +45 @@
     for (lts_hash::iterator it = C->begin(); it != C->end(); it++) {
         lts_vector& v = it->second;
-        for (lts_vector::const_iterator vit = v.begin(); vit != v.end();
-                vit++) {
-            omfree(const_cast<lt_struct*>(*vit));
-        }
         v.erase(v.begin(), v.end());
     }
@@ -67 +60 @@
     const unsigned long m_not_sev = ~p_GetShortExpVector(product, currRing);
     for ( ; m_current != m_finish; ++m_current) {
-        if (p_LmShortDivisibleByNoComp((*m_current)->lt, (*m_current)->sev,
+        if (p_LmShortDivisibleByNoComp(m_current->lt, m_current->sev,
             product, m_not_sev, currRing)) {
             return true;
@@ -355 +348 @@
   const unsigned long m_not_sev = ~p_GetShortExpVector(multiplier, t, r);
   for( ; m_current != m_finish; ++m_current) {
-    if ( ((*m_current)->sev & m_not_sev)
-        || !(_p_LmDivisibleByNoComp((*m_current)->lt, multiplier, t, r))) {
+    if ( (m_current->sev & m_not_sev)
+        || !(_p_LmDivisibleByNoComp(m_current->lt, multiplier, t, r))) {
       continue;
     }
-    const poly p = (*m_current)->lt;
-    const int k  = (*m_current)->comp;
+    const poly p = m_current->lt;
+    const int k  = m_current->comp;
     p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t
     p_ExpVectorDiff(q, q, p, r); // (LM(product) / LM(L[k]))