Changeset 4eba3ad in git for dyn_modules/syzextra/syzextra.h

Timestamp:

Apr 28, 2014, 8:49:00 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

c7d29b194535c9015230fc587b2ae178c075ef3e

Parents:

92992c08c2f387188f53d5f874a342fb60dccc06

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-04-28 20:49:00+02:00

git-committer:

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

Message:

introduced SchreyerSyzygyComputationFlags for storing and passing ring attributes within SchreyerSyzygyComputatio

chg: renamed internal functions to avoid name conflicts
chg: better namespace handling

File:

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

dyn_modules/syzextra/syzextra.h

@@ -30 +30 @@
 typedef struct sip_sideal *       ideal;
 
+class idrec;
+typedef idrec *   idhdl;
 
 BEGIN_NAMESPACE_SINGULARXX    BEGIN_NAMESPACE(SYZEXTRA)
@@ -51 +53 @@
 
 
+
+
+
+/// Computation attribute storage
+struct SchreyerSyzygyComputationFlags
+{
+  SchreyerSyzygyComputationFlags(idhdl rootRingHdl);
+  
+  /// output all the intermediate states
+  const bool __DEBUG__; // DebugOutput;
+
+  /// ?
+  const bool __SYZCHECK__; // CheckSyzygyProperty;
+
+  /// ?
+  const bool __LEAD2SYZ__; // TwoLeadingSyzygyTerms;
+
+  /// Reduce syzygy tails wrt the leading syzygy terms
+  const bool __TAILREDSYZ__; // TailReducedSyzygies;
+
+  /// Use the usual NF's S-poly reduction while dropping lower order terms
+  const bool __HYBRIDNF__; // UseHybridNF
+
+};
+
+
+
 /** @class SchreyerSyzygyComputation syzextra.h
  * 
@@ -65 +94 @@
   public:
     /// Construct a global object for given input data (separated into leads & tails)
-    SchreyerSyzygyComputation(const ideal idLeads, const ideal idTails, const ring rBaseRing):
-        m_idLeads(idLeads), m_idTails(idTails), m_rBaseRing(rBaseRing),
-        m_syzLeads(NULL), m_syzTails(NULL), m_LS(NULL) {}
+    SchreyerSyzygyComputation(const ideal idLeads, const ideal idTails, const ring rBaseRing, const SchreyerSyzygyComputationFlags attribues):
+        m_rBaseRing(rBaseRing),
+        m_idLeads(idLeads), m_idTails(idTails), 
+        m_syzLeads(NULL), m_syzTails(NULL), m_LS(NULL), m_atttributes(attribues) {}
 
 
     /// Construct a global object for given input data (separated into leads & tails)
-    SchreyerSyzygyComputation(const ideal idLeads, const ideal idTails, const ideal syzLeads, const ring rBaseRing):
-        m_idLeads(idLeads), m_idTails(idTails), m_rBaseRing(rBaseRing),
-        m_syzLeads(NULL), m_syzTails(NULL), m_LS(syzLeads) {}
+    SchreyerSyzygyComputation(const ideal idLeads, const ideal idTails, const ideal syzLeads, const ring rBaseRing, const SchreyerSyzygyComputationFlags attribues):
+        m_rBaseRing(rBaseRing),
+        m_idLeads(idLeads), m_idTails(idTails), 
+        m_syzLeads(NULL), m_syzTails(NULL), m_LS(syzLeads), m_atttributes(attribues) {}
 
     
@@ -96 +127 @@
 
     // TODO: save shortcut (syz: |-.->) LM(LM(m) * "t") -> syz?
-    poly FindReducer(poly product, poly syzterm);
-    
-    poly SchreyerSyzygyNF(poly syz_lead, poly syz_2);
+    poly FindReducer(poly product, poly syzterm) const;
+    
+    poly SchreyerSyzygyNF(poly syz_lead, poly syz_2) const;
 
     // TODO: store m * @tail -.-^-.-^-.--> ?
-    poly TraverseTail(poly multiplier, poly tail);
+    poly TraverseTail(poly multiplier, poly tail) const;
 
     // TODO: save shortcut (syz: |-.->) LM(m) * "t" -> ?
-    poly ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck);
-
-    
+    poly ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck) const;
+
   protected:
     
@@ -129 +159 @@
 
     /*mutable?*/ ideal m_LS; ///< leading syzygy terms used for reducing syzygy tails
+
+    const SchreyerSyzygyComputationFlags m_atttributes;
 };
 
@@ -134 +166 @@
 // The following wrappers are just for testing separate functions on highest level (within schreyer.lib)
 
-static inline void ComputeSyzygy(const ideal L, const ideal T, ideal& LL, ideal& TT, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, T, R);
+static inline void ComputeSyzygy(const ideal L, const ideal T, ideal& LL, ideal& TT, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, T, R, A);
   syz.ComputeSyzygy();
   syz.ReadOffResult(LL, TT);
 }
 
-static inline ideal ComputeLeadingSyzygyTerms(const ideal& L, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, NULL, R);
+static inline ideal ComputeLeadingSyzygyTerms(const ideal& L, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, NULL, R, A);
   syz.ComputeLeadingSyzygyTerms(false);
   ideal LL, TT;
@@ -150 +182 @@
 }
 
-static inline ideal Compute2LeadingSyzygyTerms(const ideal& L, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, NULL, R);
+static inline ideal Compute2LeadingSyzygyTerms(const ideal& L, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, NULL, R, A);
   syz.ComputeLeadingSyzygyTerms(true);
   ideal LL, TT;
@@ -160 +192 @@
 
 static inline poly FindReducer(poly product, poly syzterm,
-                               ideal L, ideal LS, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, NULL, LS, R);
+                               ideal L, ideal LS, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, NULL, LS, R, A);
   return syz.FindReducer(product, syzterm);
 }
 
 static inline poly TraverseTail(poly multiplier, poly tail, 
-                                ideal L, ideal T, ideal LS, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, T, LS, R);
+                                ideal L, ideal T, ideal LS, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, T, LS, R, A);
   return syz.TraverseTail(multiplier, tail);
 }
 
 static inline poly ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck,
-                              ideal L, ideal T, ideal LS, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, T, LS, R);
+                              ideal L, ideal T, ideal LS, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, T, LS, R, A);
   return syz.ReduceTerm(multiplier, term4reduction, syztermCheck);
 }
@@ -182 +214 @@
 
 static inline poly SchreyerSyzygyNF(poly syz_lead, poly syz_2,
-                                    ideal L, ideal T, ideal LS, const ring R)
-{
-  SchreyerSyzygyComputation syz(L, T, LS, R);
+                                    ideal L, ideal T, ideal LS, const ring R, const SchreyerSyzygyComputationFlags A)
+{
+  SchreyerSyzygyComputation syz(L, T, LS, R, A);
   return syz.SchreyerSyzygyNF(syz_lead, syz_2);
 }
-
-
 
 END_NAMESPACE