Changeset 55e6b0 in git

Timestamp:

Nov 30, 2014, 3:23:34 AM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

80478a3a86d08f6bb8b5675c8c993cd57e0b9c47

Parents:

0ab2c4c1fc27408db639cea5d0dd682f902463b4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-30 03:23:34+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-30 03:26:49+01:00

Message:

Improved Cache Keys - no need for numbers in some cases

Location:

Singular/dyn_modules/syzextra

Files:

• syzextra.cc (modified) (6 diffs)
• syzextra.h (modified) (1 diff)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -451 +451 @@
 
 
-static FORCE_INLINE poly myp_Head(const poly p, const ring r)
-{
- p_Test(p,r);
- const poly pp = p_Head(p, r);
- p_Test(pp,r);
- return pp;  
+static FORCE_INLINE poly myp_Head(const poly p, const bool bIgnoreCoeff, const ring r)
+{
+  assume( p != NULL ); 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;  
 }
    
@@ -1578 +1584 @@
 // };
 
-
    
-   bool my_p_LmCmp (poly a, poly b, const ring r) { return p_LmCmp(a, b, r) == -1; } // TODO: change to simple lex. memory compare!
+bool my_p_LmCmp (poly a, poly b, const ring r) { return p_LmCmp(a, b, r) == -1; } // TODO: change to simple lex. memory compare!
 
 // NOTE: need p_Copy?????? for image + multiplier!!???
@@ -1615 +1620 @@
        assume( p_LmEqual(itr->first, multiplier, r) );
 
-       if( itr->second == NULL )
+       if( itr->second == NULL ) // leadcoeff plays no role if value is NULL!
          return (NULL);
 
@@ -1684 +1689 @@
      p_Test(multiplier, r);
      
-     T.insert( TP2PCache::value_type(myp_Head(multiplier, r), p) ); //     T[ multiplier ] = p;
+     T.insert( TP2PCache::value_type(myp_Head(multiplier, (p==NULL), r), p) ); //     T[ multiplier ] = p;
 
      p_Test(multiplier, r);
@@ -1714 +1719 @@
   if( UNLIKELY( __PROT__ ) ) ++ m_stat[8]; // PrintS("S"); // store // %d", tail + 1);
   
-  T.insert( TP2PCache::value_type(p_Copy(multiplier, r), p) );
+  T.insert( TP2PCache::value_type(myp_Head(multiplier, (p==NULL), r), p) );
 
   m_cache.insert( TCache::value_type(tail, T) );
@@ -2041 +2046 @@
     m_sev( p_GetShortExpVector(_lt, R) ),  m_label( _label ),  m_lt( _lt )
 #ifndef SING_NDEBUG
-    , _R(R), m_lt_copy( myp_Head(_lt, R) )
+    , _R(R), m_lt_copy( myp_Head(_lt, true, R) ) // note that p_LmEqual only tests exponents!
 #endif  
 {

Singular/dyn_modules/syzextra/syzextra.h

@@ -37 +37 @@
 #endif
 
-// set to 1 if all leading coeffs are assumed to be all =1...
+// set to 1 if all leading coeffs are assumed to be all =1... 
+// note the use of simplify on input in SSinit!
 #ifndef NODIVISION
 # define NODIVISION 1