Changeset dd24e5 in git for dyn_modules/syzextra/syzextra.h

Timestamp:

Aug 1, 2012, 5:25:00 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')

Children:

495328d14a955b215ad10b598e995ab522243881

Parents:

026171e1f09fe373a5c6ea5ed0b8db1abeb952f3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-01 17:25:00+02:00

git-committer:

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

Message:

separated FindReducer into a separate class CReducerFinder (m_div)

TODO: deal with m_LS via another CReducerFinder?

NOTE: this change resulted in some speedups esp. for Hybrid approach (see schreyer.lib)

File:

• dyn_modules/syzextra/syzextra.h (modified) (9 diffs)

dyn_modules/syzextra/syzextra.h

@@ -18 +18 @@
 
 #include <vector>
+#include <map>
 
 // include basic definitions
@@ -96 +97 @@
 
 
+class CReducerFinder
+{
+  private:
+    class CLeadingTerm
+    {
+      public: 
+        CLeadingTerm(unsigned int id,  const poly p, const ring);
+
+      private:
+        CLeadingTerm();
+
+      public:
+
+        const unsigned long m_sev; ///< not short exp. vector
+        // NOTE/TODO: either of the following should be enough:
+        const unsigned int  m_label; ///< index in the main L[] + 1
+        const poly          m_lt; ///< the leading term itself L[label-1]
+    };
+
+    typedef long TComponentKey;
+    typedef std::vector<const CLeadingTerm*> TReducers;
+    typedef std::map< TComponentKey, TReducers> CReducersHash;
+    
+  public:
+
+    /// goes over all leading terms
+    CReducerFinder(const SchreyerSyzygyComputation& data);
+
+    ~CReducerFinder();
+
+    // TODO: save shortcut (syz: |-.->) LM(LM(m) * "t") -> syz?    
+    poly FindReducer(const poly product, const poly syzterm) const;
+
+  private:
+    const SchreyerSyzygyComputation& m_data;
+
+    CReducersHash m_hash; // can also be replaced with a vector indexed by components
+};
+
+
+
 /** @class SchreyerSyzygyComputation syzextra.h
  * 
@@ -109 +151 @@
 {
   friend class CLCM;
+  friend class CReducerFinder;
   
   public:
@@ -117 +160 @@
         m_idLeads(idLeads), m_idTails(idTails), 
         m_syzLeads(NULL), m_syzTails(NULL), m_LS(NULL), m_atttributes(attribues),
-        m_lcm(*this)
+        m_lcm(*this), m_div(*this)
     {
     }
@@ -127 +170 @@
         m_idLeads(idLeads), m_idTails(idTails), 
         m_syzLeads(NULL), m_syzTails(NULL), m_LS(syzLeads), m_atttributes(attribues),
-        m_lcm(*this)
+        m_lcm(*this), m_div(*this)
     {
     }
@@ -151 +194 @@
     void ComputeLeadingSyzygyTerms(bool bComputeSecondTerms = true);
 
-    // TODO: save shortcut (syz: |-.->) LM(LM(m) * "t") -> syz?
-    poly FindReducer(poly product, poly syzterm) const;
-    
     poly SchreyerSyzygyNF(poly syz_lead, poly syz_2) const;
 
@@ -162 +202 @@
     poly ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck) const;
 
+  public:
+    /// just for testing via the wrapper below
+    inline poly _FindReducer(const poly product, const poly syzterm) const
+        { return m_div.FindReducer(product, syzterm); }  
+    
   protected:
 
@@ -195 +240 @@
     /// Bitmask for variables occuring in leading terms
     const CLCM m_lcm;
+
+    /// Divisor finder
+    const CReducerFinder m_div;
 };
 
@@ -229 +277 @@
 {
   SchreyerSyzygyComputation syz(L, NULL, LS, R, A);
-  return syz.FindReducer(product, syzterm);
+  return syz._FindReducer(product, syzterm);
 }