Changeset 026171 in git for dyn_modules/syzextra/syzextra.cc

Timestamp:

Jul 30, 2012, 5:19:40 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

dd24e5dded66979eda13e955b93fc284cbb341e7

Parents:

c93fda01f3f4eb9609a2210ea9eec1816d8fb7f1

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-30 17:19:40+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:46+02:00

Message:

introduced a bitmask of `leading` variables

NOTE: this is the 2nd Schreyer's optimization idea

chg: further removal of unused variables

File:

• dyn_modules/syzextra/syzextra.cc (modified) (14 diffs)

dyn_modules/syzextra/syzextra.cc

@@ -366 +366 @@
 
 
-    // TODO/NOTE: input is supposed to be sorted wrt "C,ds"!??
-
-    // components should come in groups: count elements in each group
-    // && estimate the real size!!!
-
-
-    // use just a vector instead???
+  // TODO/NOTE: input is supposed to be sorted wrt "C,ds"!??
+  
+  // components should come in groups: count elements in each group
+  // && estimate the real size!!!
+
+
+  // use just a vector instead???
   ideal newid = idInit( (size * (size-1))/2, size); // maximal size: ideal case!
 
@@ -489 +489 @@
 }
 
+CLCM::CLCM(const SchreyerSyzygyComputation& data): std::vector<bool>(), m_data(data), m_compute(false)
+{
+  const ideal& L = data.m_idLeads;
+  const ring&  R = data.m_rBaseRing;
+  const SchreyerSyzygyComputationFlags& attributes = data.m_atttributes;
+
+//  const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
+//  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
+  const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
+  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+
+
+  assume( L != NULL );
+  assume( R != NULL );
+  assume( R == currRing );
+
+  if( __TAILREDSYZ__ && !__HYBRIDNF__ )
+  {
+    const int l = IDELEMS(L);
+
+    resize(l, false);
+
+    const unsigned int N = rVar(R);
+
+    for( int k = l - 1; k >= 0; k-- )
+    {
+      const poly a = L->m[k]; assume( a != NULL );
+
+      for (unsigned int j = N; j > 0; j--)
+        if ( !(*this)[j] )
+          (*this)[j] = (p_GetExp(a, j, R) > 0);
+    }
+
+    m_compute = true;    
+  }
+}
+
+
+bool CLCM::Check(const poly m) const
+{
+  assume( m != NULL );
+  if( m_compute && (m != NULL))
+  {  
+    const ring& R = m_data.m_rBaseRing;
+    const SchreyerSyzygyComputationFlags& attributes = m_data.m_atttributes;
+
+  //  const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
+  //  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
+    const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
+    const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+
+    assume( R != NULL );
+    assume( R == currRing ); 
+
+    assume( __TAILREDSYZ__ && !__HYBRIDNF__ );
+    
+    const unsigned int N = rVar(R);
+
+    for (unsigned int j = N; j > 0; j--)
+      if ( (*this)[j] )
+        if(p_GetExp(m, j, R) > 0)
+          return true;
+
+    return false;
+    
+  } else return true;
+}
+
 void SchreyerSyzygyComputation::ComputeSyzygy()
 {
@@ -507 +575 @@
   const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
-  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+//  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
 
   assume( R == currRing ); // For attributes :-/
@@ -524 +592 @@
     return;
 
-
-  ideal LS = NULL;
-
-  if( __TAILREDSYZ__ )
-    LS = LL;
 
   for( int k = size - 1; k >= 0; k-- )
@@ -593 +656 @@
 
   if( bComputeSecondTerms )
+  {
+    assume( __LEAD2SYZ__ );
 //    m_syzLeads = FROM_NAMESPACE(INTERNAL, _Compute2LeadingSyzygyTerms(m_idLeads, m_rBaseRing, m_atttributes));
     m_syzLeads = Compute2LeadingSyzygyTerms();
+  }
   else
+  {
+    assume( !__LEAD2SYZ__ );
+    
     m_syzLeads = Compute1LeadingSyzygyTerms();
+  }
 //    m_syzLeads = FROM_NAMESPACE(INTERNAL, _ComputeLeadingSyzygyTerms(m_idLeads, m_rBaseRing, m_atttributes));
   
@@ -603 +673 @@
   if (__TAILREDSYZ__)
     m_LS = m_syzLeads;
+
+  (void)( __LEAD2SYZ__ );
 }
 
@@ -732 +804 @@
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
-  const ideal& LS = m_LS;
+//  const ideal& LS = m_LS;
   const ring& r = m_rBaseRing;
-  const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
-
-  
+
+//   const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
 //   const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
 //   const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
@@ -798 +869 @@
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
-  const ideal& LS = m_LS;
+//  const ideal& LS = m_LS;
   const ring& r = m_rBaseRing;
   const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
@@ -814 +885 @@
 //   const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
 //   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
-//   const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+   const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
 
   assume( multiplier != NULL );
@@ -823 +894 @@
   poly s = NULL;
 
-  // iterate over the tail
-  for(poly p = tail; p != NULL; p = pNext(p))
-    s = p_Add_q(s, ReduceTerm(multiplier, p, NULL), r);  
+  if( (!__TAILREDSYZ__) || m_lcm.Check(multiplier) )
+    for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
+      s = p_Add_q(s, ReduceTerm(multiplier, p, NULL), r);  
 
   return s;
@@ -837 +908 @@
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
-  const ideal& LS = m_LS;
+//  const ideal& LS = m_LS;
   const ring& r = m_rBaseRing;
   const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
@@ -853 +924 @@
 //   const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
 //   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
-//   const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
 
   assume( multiplier != NULL );
@@ -867 +938 @@
   poly s = NULL;
 
-  if(1)
+  if( (!__TAILREDSYZ__) || m_lcm.Check(multiplier) )
   {
     // NOTE: only LT(term4reduction) should be used in the following:
@@ -897 +968 @@
 BEGIN_NAMESPACE_NONAME
    
-static inline int atGetInt(idhdl rootRingHdl, const char* attribute, int def)
+static inline int atGetInt(idhdl rootRingHdl, const char* attribute, long def)
 {
   return ((int)(long)(atGet(rootRingHdl, attribute, INT_CMD, (void*)def)));