Changeset 349ee0c in git for Singular/dyn_modules/syzextra/syzextra.h

Timestamp:

Feb 1, 2018, 3:15:38 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

68395808f4180002f73bcf7dd2f2447899b0d865

Parents:

6777f2415ca33645c59e3d8e9bd5210e5f2b3ff4

Message:

removed more debug stuff from syzextra

File:

• Singular/dyn_modules/syzextra/syzextra.h (modified) (11 diffs)

Singular/dyn_modules/syzextra/syzextra.h

@@ -71 +71 @@
   private:
     typedef std::stack <sBucket_pt> Base;
-//    typedef std::vector<Bucket> Memory;
-//    typedef std::deque <Bucket> Memory;
-//    typedef std::stack <Bucket, Memory > Base;
 
   public:
@@ -79 +76 @@
 
     SBucketFactory(const ring r)
-#ifndef SING_NDEBUG
-        : m_ring(r)
-#endif
     {
       push ( _CreateBucket(r) ); // start with at least one sBucket...?
@@ -98 +92 @@
     Bucket getBucket(const ring r, const bool remove = true)
     {
-      assume( r == m_ring );
-
       Bucket bt = NULL;
 
@@ -121 +113 @@
 
       assume( bt != NULL );
-      assume( _IsBucketEmpty(bt) );
-      assume( r == _GetBucketRing(bt) );
 
       return bt;
@@ -131 +121 @@
     {
       assume( bt != NULL );
-      assume( _IsBucketEmpty(bt) );
-      assume( m_ring == _GetBucketRing(bt) );
 
       if( empty() )
@@ -151 +139 @@
 
   private:
-
-#ifndef SING_NDEBUG
-    const ring m_ring; ///< For debugging: all buckets are over the same ring... right?!
-
-    /// get bucket ring
-    static ring _GetBucketRing(const Bucket& bt);
-
-    static bool  _IsBucketEmpty(const Bucket& bt);
-#endif
-
     /// inital allocation for new buckets
     static Bucket _CreateBucket(const ring r);
@@ -258 +236 @@
     CLeadingTerm(unsigned int label,  const poly lt, const ring);
 
-#ifndef SING_NDEBUG
-    ~CLeadingTerm();
-#endif
-
 #if NOPRODUCT
     bool DivisibilityCheck(const poly multiplier, const poly t, const unsigned long not_sev, const ring r) const;
@@ -269 +243 @@
     bool CheckLT( const ideal & L ) const;
 
-#ifndef SING_NDEBUG
-    poly lt() const;
-    unsigned long sev() const;
-    unsigned int label() const;
-#else
     inline poly lt() const { return m_lt; };
     inline unsigned long sev() const { return m_sev; };
     inline unsigned int label() const { return m_label; };
-#endif
-
   private:
     const unsigned long m_sev; ///< not short exp. vector
@@ -286 +253 @@
 
     const poly          m_lt; ///< the leading term itself L[label-1]
-
-#ifndef SING_NDEBUG
-    const ring _R;
-
-    const poly          m_lt_copy; ///< original copy of LEAD(lt) (only for debug!!!)
-#endif
 
     // disable the following:
@@ -340 +301 @@
     /// is the term to be "preprocessed" as lower order term or lead to only reducible syzygies...
     int PreProcessTerm(const poly t, CReducerFinder& syzChecker) const;
-
-#ifndef SING_NDEBUG
-    void DebugPrint() const;
-    void Verify() const;
-#endif
 
   private:
@@ -525 +481 @@
     CReducerFinder m_checker;
 
-    /*
-    // need more data here:
-    // (m_idLeads : m_tailterm) = (m, pos, compl), s.th: compl * m_tailterm divides m_idLeads[pos]
-    // but resulting sysygy compl * gen(pos) should not be in
-    // Idea: extend CReducerFinder??!!
-    struct CTailTerm
-    {
-      const poly m_tailterm;
-
-      const CReducerFinder m_reducers; // positions are labels (in m_idLeads)...
-      // compl - to be computed if needed?
-
-      CTailTerm(const poly tt, const CReducerFinder reds): m_tailterm(tt), m_reducers(reds) {}
-    };
-
-    typedef std::vector<const CTailTerm*> TTail;
-    typedef std::vector<TTail> TTailTerms;
-
-    TTailTerms m_idTailTerms;
-    */
-
     mutable TCache m_cache; // cacher comp + poly -> poly! // mutable???
-
-/// TODO: look into m_idTailTerms!!!!!!!!!!!!!!!!!!!!!!!! map? heaps???
-    // NOTE/TODO: the following globally shared buckets violate reentrance - they should rather belong to TLS!
 
     /// used for simple summing up