Changeset 4ca3e3 in git

Timestamp:

Nov 22, 2012, 10:23:41 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0838d710f21ee145215f88504c839b88bfd566bd

Parents:

7eaf722febee351de63ee153106d9bb44f37c045

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-22 22:23:41+01:00

git-committer:

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

Message:

Compiler warnings elimination + cosmetics

Location:

dyn_modules/syzextra

Files:

• syzextra.cc (modified) (14 diffs)
• syzextra.h (modified) (5 diffs)

dyn_modules/syzextra/syzextra.cc

@@ -254 +254 @@
   assume( t != NULL );
 
-  if( __DEBUG__ && __TAILREDSYZ__ )
+  if( __DEBUG__ & __TAILREDSYZ__ )
     assume( !IsDivisible(t) ); // each input term should NOT be in <L>
 
@@ -295 +295 @@
         {       
 #ifndef NDEBUG
-          if( __DEBUG__ || 0)
+          if( __DEBUG__ | 0)
           {         
             PrintS("CReducerFinder::PreProcessTerm, 't' is NOT co-prime with the following leading term: \n");
@@ -349 +349 @@
 
 #ifndef NDEBUG
-  if( __DEBUG__ || 0)
+  if( __DEBUG__ | 0)
   {
     PrintS("SchreyerSyzygyComputation::SetUpTailTerms(): Tails: \n");
@@ -387 +387 @@
 
 #ifndef NDEBUG
-  if( TEST_OPT_PROT || 1)
+  if( TEST_OPT_PROT | 1)
     Print("      **!!**      SchreyerSyzygyComputation::SetUpTailTerms()::PreProcessing(): X: {c: %lu, C: %lu, P: %lu} + %lu\n", pp[1], pp[2], pp[3], pp[0]);
 #endif
    
 #ifndef NDEBUG
-  if( __DEBUG__ || 0)
+  if( __DEBUG__ | 0)
   {
     PrintS("SchreyerSyzygyComputation::SetUpTailTerms(): Preprocessed Tails: \n");
@@ -748 +748 @@
   {   
 #ifndef NDEBUG
-    if( TEST_OPT_PROT || 1)
+    if( TEST_OPT_PROT | 1)
     {
       t = getTimer(); r = getRTimer();
@@ -756 +756 @@
     ComputeLeadingSyzygyTerms( __LEAD2SYZ__ && !__IGNORETAILS__ ); // 2 terms OR 1 term!
 #ifndef NDEBUG
-    if( TEST_OPT_PROT || 1)
+    if( TEST_OPT_PROT | 1)
     {
       t = getTimer() - t; r = getRTimer() - r;
@@ -782 +782 @@
     {
 #ifndef NDEBUG
-      if( TEST_OPT_PROT || 1 )
+      if( TEST_OPT_PROT | 1 )
       {
         t = getTimer(); r = getRTimer();
@@ -791 +791 @@
       SetUpTailTerms();
 #ifndef NDEBUG
-      if( TEST_OPT_PROT || 1)
+      if( TEST_OPT_PROT | 1)
       {
         t = getTimer() - t; r = getRTimer() - r;
@@ -801 +801 @@
 
 #ifndef NDEBUG
-  if( TEST_OPT_PROT || 1)
+  if( TEST_OPT_PROT | 1)
   {
     t = getTimer(); r = getRTimer();
@@ -839 +839 @@
 
 #ifndef NDEBUG
-  if( TEST_OPT_PROT || 1)
+  if( TEST_OPT_PROT | 1)
   {
     t = getTimer() - t; r = getRTimer() - r;
@@ -1284 +1284 @@
     const poly m_product;
     const unsigned long m_not_sev;
-    const unsigned long m_comp;
+    const long m_comp;
 
     CReducerFinder::CReducersHash::const_iterator m_itr;
@@ -1425 +1425 @@
   for( CReducersHash::const_iterator it = m_hash.begin(); it != m_hash.end(); it++)
   {
-    Print("Hash Key: %d, Values: \n", it->first);
+    Print("Hash Key: %ld, Values: \n", it->first);
     const TReducers& reducers = it->second;
 
@@ -1442 +1442 @@
       assume( p_sev == p_GetShortExpVector(p, r) );
 
-      Print("L[%d]: ", k); dPrint(p, r, r, 0); Print("SEV: %dl\n", p_sev);
+      Print("L[%d]: ", k); dPrint(p, r, r, 0); Print("SEV: %ld\n", p_sev);
     }
   }
@@ -1455 +1455 @@
     const poly m_multiplier, m_term;
     const unsigned long m_not_sev;
-    const unsigned long m_comp;
+    const long m_comp;
 
     CReducerFinder::CReducersHash::const_iterator m_itr;

dyn_modules/syzextra/syzextra.h

@@ -23 +23 @@
 #include "singularxx_defs.h"
 
-struct  spolyrec;
-typedef struct spolyrec    polyrec;
-typedef polyrec *          poly;
-
-struct ip_sring;
-typedef struct ip_sring *         ring;
-
-struct sip_sideal;
-typedef struct sip_sideal *       ideal;
-
-class idrec;
-typedef idrec *   idhdl;
+struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
+struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
+
+struct sip_sideal; typedef struct sip_sideal *       ideal;
+class idrec; typedef idrec *   idhdl;
+
+class sBucket; typedef sBucket* sBucket_pt;
+class kBucket; typedef kBucket* kBucket_pt;
+
 
 BEGIN_NAMESPACE_SINGULARXX    BEGIN_NAMESPACE(SYZEXTRA)
@@ -206 +203 @@
         SchreyerSyzygyComputationFlags(setting),
         m_idLeads(idLeads), m_idTails(id_Copy(idTails, setting.m_rBaseRing)), 
-        m_syzLeads(NULL), m_syzTails(NULL), m_LS(NULL),
-        m_lcm(m_idLeads, setting), m_div(m_idLeads, setting), m_checker(NULL, setting)
+        m_syzLeads(NULL), m_syzTails(NULL),
+        m_LS(NULL), m_lcm(m_idLeads, setting), 
+        m_div(m_idLeads, setting), m_checker(NULL, setting),
+        m_sum_bucket(NULL), m_spoly_bucket(NULL)
     {
     }
@@ -215 +214 @@
         SchreyerSyzygyComputationFlags(setting),
         m_idLeads(idLeads), m_idTails(id_Copy(idTails, setting.m_rBaseRing)), 
-        m_syzLeads(syzLeads), m_syzTails(NULL), m_LS(syzLeads), 
-        m_lcm(m_idLeads, setting), m_div(m_idLeads, setting), m_checker(NULL, setting)
+        m_syzLeads(syzLeads), m_syzTails(NULL),
+        m_LS(syzLeads), m_lcm(m_idLeads, setting), 
+        m_div(m_idLeads, setting), m_checker(NULL, setting),
+        m_sum_bucket(NULL), m_spoly_bucket(NULL)
     {
       if( __TAILREDSYZ__ && !__IGNORETAILS__)
@@ -291 +292 @@
     /// output (syzygy) tails
     ideal m_syzTails;
+    
+    /*mutable?*/ ideal m_LS; ///< leading syzygy terms used for reducing syzygy tails
+
 
     /// Bitmask for variables occuring in leading terms
@@ -300 +304 @@
     /// for checking tail-terms and makeing them irreducible (wrt m_LS!)
     CReducerFinder m_checker;
-
-    /*mutable?*/ ideal m_LS; ///< leading syzygy terms used for reducing syzygy tails
 
     /*