Changeset efcad1 in git

Timestamp:

Oct 14, 2016, 4:20:21 PM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c86bbe3f55d8a362921878398a1579907ed5fff9

Parents:

74dc544f60e1fb4461ed4301bd9f05ac85132898

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-10-14 16:20:21+02:00

git-committer:

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

Message:

chg: simplify caching code

File:

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

kernel/GBEngine/syz4.cc

@@ -160 +160 @@
 
 #if CACHE
-bool my_p_LmCmp_test (poly a, poly b, const ring r)
-{
-  return p_LmCmp(a, b, r) == -1;
-}
-
 struct CCacheCompare_test
 {
-  const ring& m_ring_test;
-  CCacheCompare_test(): m_ring_test(currRing) {}
-  CCacheCompare_test(const ring& r): m_ring_test(r) {}
-  CCacheCompare_test(const CCacheCompare_test& lhs):
-    m_ring_test(lhs.m_ring_test) {}
-  CCacheCompare_test& operator=(const CCacheCompare_test& lhs)
-  {
-    return (const_cast<CCacheCompare_test&>(lhs));
-  }
   inline bool operator() (const poly& l, const poly& r)
     const
   {
-    return my_p_LmCmp_test(l, r, m_ring_test);
+    return (p_LmCmp(l, r, currRing) == -1);
   }
 };
@@ -189 +175 @@
 static TCache_test m_cache_test;
 
-static FORCE_INLINE poly myp_Head_test(const poly p, const bool bIgnoreCoeff,
-  const ring r)
-{
-  p_LmCheckPolyRing1(p, r);
-  poly np;
-  omTypeAllocBin(poly, np, r->PolyBin);
-  p_SetRingOfLm(np, r);
-  memcpy(np->exp, p->exp, r->ExpL_Size*sizeof(long));
-  pNext(np) = NULL;
-  pSetCoeff0(np, (bIgnoreCoeff)? NULL : n_Copy(pGetCoeff(p), r->cf));
-  p_LmCheckPolyRing1(np, r);
-  return np;
-}
+// note: we don't need to keep the coeffs of those terms which are lifted to 0
 
 static void delete_cache()
@@ -212 +186 @@
             p_Delete(const_cast<poly*>(&(vit->first)), currRing);
         }
-        T.erase(T.begin(), T.end());
-    }
-    m_cache_test.erase(m_cache_test.begin(), m_cache_test.end());
+        T.clear();
+    }
+    m_cache_test.clear();
 }
 #endif   // CACHE
@@ -247 +221 @@
      if( itr == T.end() )
      {
-       T.insert(TP2PCache_test::value_type(myp_Head_test(multiplier, (p==NULL),
+       T.insert(TP2PCache_test::value_type(p_Head(multiplier,
          r), p) );
        return p_Copy(p, r);
@@ -264 +238 @@
     if( itr == T.end() )
     {
-      T.insert(TP2PCache_test::value_type(myp_Head_test(multiplier, (p==NULL),
+      T.insert(TP2PCache_test::value_type(p_Head(multiplier,
           r), p));
       return p_Copy(p, r);
@@ -270 +244 @@
     return p;
   }
-  CCacheCompare_test o(r);
-  TP2PCache_test T(o);
-  T.insert(TP2PCache_test::value_type(myp_Head_test(multiplier, (p==NULL), r),
+  TP2PCache_test T;
+  T.insert(TP2PCache_test::value_type(p_Head(multiplier, r),
     p));
   m_cache_test.insert( TCache_test::value_type(tail, T) );