Changeset ac00e2f in git for Singular/dyn_modules/syzextra/syzextra.cc

Timestamp:

May 14, 2014, 4:02:50 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

0f74a1d360bc1f2c80ba740d66bcf0a755b6e43d

Parents:

8b5fff53b54b8c7889b6490e4871793cfd8e4efe

Message:

removed currQuotient

File:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (123 diffs)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -1 +1 @@
 // -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 /*****************************************************************************\
- * Computer Algebra System SINGULAR    
+ * Computer Algebra System SINGULAR
 \*****************************************************************************/
 /** @file syzextra.cc
- * 
+ *
  * Here we implement the Computation of Syzygies
  *
@@ -50 +50 @@
 #include <Singular/attrib.h>
 
-#include <Singular/ipid.h> 
+#include <Singular/ipid.h>
 #include <Singular/ipshell.h> // For iiAddCproc
 
@@ -73 +73 @@
 static int cmp_c_ds(const void *p1, const void *p2)
 {
-  void *R = currRing; 
+  void *R = currRing;
 #endif
 
@@ -151 +151 @@
   }
 
-  return 0;  
-}
-
-   
+  return 0;
+}
+
+
 static int cmp_poly(const poly &a, const poly &b)
 {
@@ -171 +171 @@
   assume( p_GetComp(a, r) == 0 );
   assume( p_GetComp(b, r) == 0 );
-   
+
 #ifndef NDEBUG
   const int __DEBUG__ = 0;
@@ -198 +198 @@
   }
 
-  return 0;  
-}
-   
+  return 0;
+}
+
 END_NAMESPACE
 /* namespace SORT_c_ds */
@@ -213 +213 @@
     return;
   }
-   
+
   assume( r != NULL );
   const coeffs C = r->cf; assume(C != NULL);
@@ -221 +221 @@
 
   do {
-  assume( p != NULL );    
-        
+  assume( p != NULL );
+
   // write coef...
   number& n = p_GetCoeff(p, r);
 
   n_Normalize(n, C);
-     
+
   BOOLEAN writeMult = FALSE; ///< needs * before pp or module generator
 
   BOOLEAN writeOne = FALSE; ///< need to write something after '-'!
-     
+
   if( n_IsZero(n, C) )
   {
@@ -237 +237 @@
 //    return; // yes?
   }
-  
+
   if (n_IsMOne(n, C))
-  {     
+  {
     PrintS(" - "); writeOne = TRUE; writePlus = FALSE;
-  }     
+  }
   else if (!n_IsOne(n, C))
   {
     if( writePlus && n_GreaterZero(n, C) )
       PrintS(" + ");
-    
-    StringSetS(""); n_WriteLong(n, C); 
-    if (true) 
+
+    StringSetS(""); n_WriteLong(n, C);
+    if (true)
     {
       char *s = StringEndS(); PrintS(s); omFree(s);
     }
-     
-     
+
+
     writeMult = TRUE;
     writePlus = TRUE;
   } else
      writeOne = TRUE;
-   
+
   // missing '1' if no PP and gen...!?
   // write monom...
@@ -268 +268 @@
   {
     const long ee = p_GetExp(p, i+1, r);
-    
+
     if (ee!=0L)
     {
@@ -285 +285 @@
       else
         Print(" %s ", rRingVar(i, r));
-       
+
       writeOne = FALSE;
       wrotePP = TRUE;
@@ -292 +292 @@
 
   writePlus = writePlus || wrotePP;
-  writeMult = writeMult || wrotePP; 
+  writeMult = writeMult || wrotePP;
 
   // write module gen...
   const long comp = p_GetComp(p, r);
-  
+
   if (comp > 0 )
   {
     if (writeMult)
       PrintS(" \\\\cdot ");
-     else 
+     else
       if( writePlus )
         PrintS(" + ");
@@ -309 +309 @@
     else
       Print(" \\\\GENP{%ld} ", comp);
-     
-      writeOne = FALSE;  
-  }
-     
+
+      writeOne = FALSE;
+  }
+
   if ( writeOne )
     PrintS( writePlus? " + 1 " : " 1 " );
-       
+
 
   pIter(p);
-     
+
   writePlus = TRUE;
   } while( (!bLTonly) && (p != NULL) );
-   
-}
-
-
-
-
-   
+
+}
+
+
+
+
+
 /// return a new term: leading coeff * leading monomial of p
 /// with 0 leading component!
@@ -346 +346 @@
     p_Setm(m, r);
 
-   
+
     assume( m != NULL );
     assume( pNext(m) == NULL );
     assume( p_LmTest(m, r) );
-   
+
     if( bSetZeroComp )
       assume( p_GetComp(m, r) == 0 );
@@ -359 +359 @@
 
 
-   
+
 poly p_Tail(const poly p, const ring r)
 {
@@ -375 +375 @@
 
   const ideal newid = idInit(IDELEMS(id),id->rank);
-  
+
   for (int i=IDELEMS(id) - 1; i >= 0; i--)
     newid->m[i] = p_Tail( id->m[i], r );
@@ -381 +381 @@
   newid->rank = id_RankFreeModule(newid, currRing);
 
-  return newid;  
+  return newid;
 }
 
@@ -395 +395 @@
 #define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp)
 #endif
-  
+
   if( sizeNew >= 2 )
     qsort_my(id->m, sizeNew, sizeof(poly), r, FROM_NAMESPACE(SORT_c_ds, cmp_c_ds));
@@ -408 +408 @@
 {
   extern void id_Delete (ideal*, const ring);
-   
+
   id_Delete(const_cast<ideal*>(&m_idTails), m_rBaseRing); // TODO!!!
 
@@ -422 +422 @@
     m_spoly_bucket = NULL;
   }
-   
+
   for( TCache::iterator it = m_cache.begin(); it != m_cache.end(); it++ )
   {
     TP2PCache& T = it->second;
-     
+
     for(TP2PCache::iterator vit = T.begin(); vit != T.end(); vit++ )
-    {   
+    {
       p_Delete( (&(vit->second)), m_rBaseRing);
       p_Delete( const_cast<poly*>(&(vit->first)), m_rBaseRing);
@@ -465 +465 @@
   CReducersHash::const_iterator itr = m_hash.find(comp);
 
-  if ( itr == m_hash.end() ) 
+  if ( itr == m_hash.end() )
     return 2; // no such leading component!!!
-   
+
   assume( itr->first == comp );
-   
-  const bool bIdealCase = (comp == 0);    
+
+  const bool bIdealCase = (comp == 0);
   const bool bSyzCheck = syzChecker.IsNonempty(); // need to check even in ideal case????? proof?  "&& !bIdealCase"
 
@@ -485 +485 @@
       const poly p = (*vit)->m_lt;
 
-      assume( p_GetComp(p, r) == comp ); 
+      assume( p_GetComp(p, r) == comp );
 
       // TODO: check if coprime with Leads... if __TAILREDSYZ__ !
       for( int var = N; var > 0; --var )
         if( (p_GetExp(p, var, r) != 0) && (p_GetExp(t, var, r) != 0) )
-        {       
+        {
 #ifndef NDEBUG
           if( __DEBUG__ | 0)
-          {         
+          {
             PrintS("CReducerFinder::PreProcessTerm, 't' is NOT co-prime with the following leading term: \n");
             dPrint(p, r, r, 1);
           }
-#endif     
+#endif
           coprime = false; // t not coprime with p!
           break;
@@ -513 +513 @@
 #ifndef NDEBUG
         if( __DEBUG__ && !coprime)
-        {         
+        {
           PrintS("CReducerFinder::PreProcessTerm, 't' is co-prime with p but may lead to NOT divisible syz.term: \n");
           dPrint(ss, r, r, 1);
         }
 #endif
-         
+
         p_LmDelete(&ss, r); // deletes coeff as well???
       }
@@ -528 +528 @@
       PrintS("CReducerFinder::PreProcessTerm, the following 't' is 'co-prime' with all of leading terms! \n");
 #endif
-     
-    return coprime? 3: 0; // t was coprime with all of leading terms!!! 
+
+    return coprime? 3: 0; // t was coprime with all of leading terms!!!
 
   }
@@ -536 +536 @@
   return 0;
 }
-  
-   
+
+
 void SchreyerSyzygyComputation::SetUpTailTerms()
 {
-  const ideal idTails = m_idTails; 
+  const ideal idTails = m_idTails;
   assume( idTails != NULL );
   assume( idTails->m != NULL );
@@ -557 +557 @@
   for( int p = IDELEMS(idTails) - 1; p >= 0; --p )
     for( poly* tt = &(idTails->m[p]); (*tt) != NULL;  )
-    {   
+    {
       const poly t = *tt;
       const int k = m_div.PreProcessTerm(t, m_checker); // 0..3
@@ -565 +565 @@
       pp[k]++;
 #endif
-       
+
       if( k )
       {
 #ifndef NDEBUG
         if( __DEBUG__)
-        {         
+        {
           Print("SchreyerSyzygyComputation::SetUpTailTerms(): PP (%d) the following TT: \n", k);
           dPrint(t, r, r, 1);
@@ -577 +577 @@
 
         (*tt) = p_LmDeleteAndNext(t, r); // delete the lead and next...
-      }   
-      else 
+      }
+      else
         tt = &pNext(t); // go next?
 
@@ -588 +588 @@
     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( !__TREEOUTPUT__ )
@@ -597 +597 @@
   }
 #endif
-   
-}
-/*  
+
+}
+/*
   m_idTailTerms.resize( IDELEMS(idTails) );
-  
+
   for( unsigned int p = IDELEMS(idTails) - 1; p >= 0; p -- )
   {
@@ -609 +609 @@
 
     unsigned int pp = 0;
-    
+
     while( t != NULL )
     {
       assume( t != NULL );
       // TODO: compute L:t!
-//      ideal reducers;      
+//      ideal reducers;
 //      CReducerFinder m_reducers
-      
+
       CTailTerm* d = v[pp] = new CTailTerm();
-      
+
       ++pp; pIter(t);
     }
@@ -649 +649 @@
   if( size < 2 )
   {
-    const ideal newid = idInit(1, 0); newid->m[0] = NULL; // zero ideal...        
+    const ideal newid = idInit(1, 0); newid->m[0] = NULL; // zero ideal...
     return newid;
   }
@@ -745 +745 @@
   const ring& r = m_rBaseRing;
 //  const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
-  
+
 //   const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
 //   const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
@@ -751 +751 @@
 //   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
 //  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
-  
+
 
   // 1. set of components S?
@@ -762 +762 @@
   if( size < 2 )
   {
-    const ideal newid = idInit(1, 1); newid->m[0] = NULL; // zero module...   
+    const ideal newid = idInit(1, 1); newid->m[0] = NULL; // zero module...
     return newid;
   }
@@ -768 +768 @@
 
   // 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!!!
@@ -863 +863 @@
       //      TEST_OPT_REDTAIL
     assume( r == currRing );
-  
+
     BITSET _save_test; SI_SAVE_OPT1(_save_test);
     SI_RESTORE_OPT1(Sy_bit(OPT_REDTAIL) | Sy_bit(OPT_REDSB) | _save_test);
 
     intvec* w=new intvec(IDELEMS(newid));
-    ideal tmp = kStd(newid, currQuotient, isHomog, &w);
+    ideal tmp = kStd(newid, currRing->qideal, isHomog, &w);
     delete w;
 
@@ -887 +887 @@
 
   Sort_c_ds(newid, r);
-  
+
   return newid;
 }
@@ -898 +898 @@
   const ring& R = m_rBaseRing;
 
-  const int r = p_GetComp(a, R) - 1; 
+  const int r = p_GetComp(a, R) - 1;
 
   assume( r >= 0 && r < IDELEMS(T) );
   assume( r >= 0 && r < IDELEMS(L) );
-   
-  assume( a != NULL );   
+
+  assume( a != NULL );
 
   if( __TREEOUTPUT__ )
@@ -909 +909 @@
      PrintS("{ \"nodelabel\": \""); writeLatexTerm(a, R); PrintS("\", \"children\": [");
   }
-   
+
 
   poly aa = leadmonom(a, R); assume( aa != NULL); // :(
 
-  poly t = TraverseTail(aa, r); 
-   
+  poly t = TraverseTail(aa, r);
+
   if( a2 != NULL )
   {
@@ -929 +929 @@
     assume( r2 >= 0 && r2 < IDELEMS(T) );
 
-    t = p_Add_q(a2, p_Add_q(t, TraverseTail(aa2, r2), R), R); 
+    t = p_Add_q(a2, p_Add_q(t, TraverseTail(aa2, r2), R), R);
 
     p_Delete(&aa2, R);
-     
+
     if( __TREEOUTPUT__ )
        PrintS("]},");
@@ -946 +946 @@
   {
      PrintS("], \"noderesult\": \""); writeLatexTerm(t, R, true, false); PrintS("\" },");
-  }   
+  }
   return t;
 }
@@ -971 +971 @@
   assume( IDELEMS(L) == IDELEMS(T) );
 #ifndef NDEBUG
-  int t, r; 
+  int t, r;
 #endif
 
   if( __TREEOUTPUT__ )
   {
-    Print("\n{ \"syzygylayer\": \"%d\", \"hybridnf\": \"%d\", \"diagrams\": \n[", __SYZNUMBER__, __HYBRIDNF__ ); 
-  }  
-   
+    Print("\n{ \"syzygylayer\": \"%d\", \"hybridnf\": \"%d\", \"diagrams\": \n[", __SYZNUMBER__, __HYBRIDNF__ );
+  }
+
   if( m_syzLeads == NULL )
-  {   
+  {
 #ifndef NDEBUG
     if( !__TREEOUTPUT__ )
@@ -988 +988 @@
       Print("%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::ComputeLeadingSyzygyTerms: t: %d, r: %d\n", r, t, r);
     }
-#endif     
+#endif
     ComputeLeadingSyzygyTerms( __LEAD2SYZ__ && !__IGNORETAILS__ ); // 2 terms OR 1 term!
 #ifndef NDEBUG
@@ -998 +998 @@
     }
 #endif
-     
+
   }
 
@@ -1010 +1010 @@
   {
      if( __TREEOUTPUT__ )
-       PrintS("]},"); 
+       PrintS("]},");
      return;
   }
-   
+
 
   // use hybrid method?
@@ -1030 +1030 @@
       }
 #endif
-       
+
       SetUpTailTerms();
 #ifndef NDEBUG
@@ -1040 +1040 @@
       }
 #endif
-    }     
+    }
   }
 
@@ -1051 +1051 @@
   }
 #endif
-   
+
   for( int k = size - 1; k >= 0; k-- )
   {
     const poly a = LL->m[k]; assume( a != NULL );
 
-    poly a2 = pNext(a);    
+    poly a2 = pNext(a);
 
     // Splitting 2-terms Leading syzygy module
     if( a2 != NULL )
       pNext(a) = NULL;
-     
+
     if( __IGNORETAILS__ )
     {
@@ -1089 +1089 @@
     Print("%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::SyzygyLift: dt: %d, dr: %d\n", getRTimer(), t, r);
   }
-#endif   
+#endif
 
   TT->rank = id_RankFreeModule(TT, R);
-   
+
   if( __TREEOUTPUT__ )
     PrintS("\n]},");
@@ -1115 +1115 @@
   {
     assume( !__LEAD2SYZ__ );
-    
+
     m_syzLeads = Compute1LeadingSyzygyTerms();
   }
 //    m_syzLeads = FROM_NAMESPACE(INTERNAL, _ComputeLeadingSyzygyTerms(m_idLeads, m_rBaseRing, m_atttributes));
-  
+
   // NOTE: set m_LS if tails are to be reduced!
   assume( m_syzLeads!= NULL );
@@ -1127 +1127 @@
     m_LS = m_syzLeads;
     m_checker.Initialize(m_syzLeads);
-#ifndef NDEBUG    
+#ifndef NDEBUG
     if( __DEBUG__ )
     {
@@ -1146 +1146 @@
 poly SchreyerSyzygyComputation::SchreyerSyzygyNF(const poly syz_lead, poly syz_2) const
 {
-  
+
   assume( !__IGNORETAILS__ );
 
@@ -1160 +1160 @@
     PrintS("{   \"nodelabel\": \""); writeLatexTerm(syz_lead, r); PrintS("\", \"children\": [");
   }
-   
+
   if( syz_2 == NULL )
   {
-    const int rr = p_GetComp(syz_lead, r) - 1; 
+    const int rr = p_GetComp(syz_lead, r) - 1;
 
     assume( rr >= 0 && rr < IDELEMS(T) );
@@ -1175 +1175 @@
       PrintS("{ \"nodelabel\": \""); writeLatexTerm(syz_2, r); PrintS("\" },");
     }
-#else    
+#else
     poly aa = leadmonom(syz_lead, r); assume( aa != NULL); // :(
     aa = p_Mult_mm(aa, L->m[rr], r);
@@ -1183 +1183 @@
       PrintS("{ \"nodelabel\": \""); writeLatexTerm(syz_2, r); PrintS("\", \"edgelable\": \""); writeLatexTerm(aa, r, false); PrintS("\" },");
     }
-     
+
     syz_2 = m_div.FindReducer(aa, syz_lead, m_checker);
 
     p_Delete(&aa, r);
 #endif
-    
-  }
-   
-  assume( syz_2 != NULL ); // by construction of S-Polynomial    
+
+  }
+
+  assume( syz_2 != NULL ); // by construction of S-Polynomial
 
   assume( L != NULL );
@@ -1213 +1213 @@
 
 //  kBucketInit(bucket, NULL, 0); // not needed!?
-      
-  poly p = leadmonom(syz_lead, r); // :(  
-//  poly spoly = pp_Mult_qq(p, T->m[c], r);  
-  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // TODO: store pLength(T->m[c]) separately!? 
+
+  poly p = leadmonom(syz_lead, r); // :(
+//  poly spoly = pp_Mult_qq(p, T->m[c], r);
+  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // TODO: store pLength(T->m[c]) separately!?
   p_Delete(&p, r);
-  
-  kbTest(bucket);  
+
+  kbTest(bucket);
 
   c = p_GetComp(syz_2, r) - 1;
@@ -1232 +1232 @@
   // TODO: use bucket!?
 //  const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(spoly) < MIN_LENGTH_BUCKET);
-//  CPolynomialSummator tail(r, bUsePolynomial);                       
-  sBucket_Add_p(tail, syz_2, 1); // tail.AddAndDelete(syz_2, 1);  
- 
+//  CPolynomialSummator tail(r, bUsePolynomial);
+  sBucket_Add_p(tail, syz_2, 1); // tail.AddAndDelete(syz_2, 1);
+
   kbTest(bucket);
   for( poly spoly = kBucketExtractLm(bucket); spoly != NULL; p_LmDelete(&spoly, r), spoly = kBucketExtractLm(bucket))
-  {    
+  {
     kbTest(bucket);
-    poly t = m_div.FindReducer(spoly, NULL, m_checker);    
+    poly t = m_div.FindReducer(spoly, NULL, m_checker);
 
     if( t != NULL )
@@ -1247 +1247 @@
 
       assume( c >= 0 && c < IDELEMS(T) );
-       
+
       if( __TREEOUTPUT__ )
       {
@@ -1270 +1270 @@
   sBucketClearAdd(tail, &result, &len); // TODO: use Merge with sBucket???
   assume( pLength(result) == len );
-     
+
   if( __TREEOUTPUT__ )
-  {   
+  {
     PrintS("]},");
   }
-   
+
 
   return result;
 }
 
-// namespace     {   
+// namespace     {
 
 // };
@@ -1291 +1291 @@
 {
   const ring& r = m_rBaseRing;
-   
+
   assume(m_idTails !=  NULL && m_idTails->m != NULL);
   assume( tail >= 0 && tail < IDELEMS(m_idTails) );
-   
+
 /*  return ComputeImage(multiplier, tail); */
-  
+
   // TODO: store (multiplier, tail) -.-^-.-^-.--> !
   TCache::iterator top_itr = m_cache.find(tail);
-   
+
   if ( top_itr != m_cache.end() )
   {
@@ -1305 +1305 @@
 
      TP2PCache& T = top_itr->second;
-     
+
      TP2PCache::iterator itr = T.find(multiplier);
-     
+
      if( itr != T.end() ) // Yey - Reuse!!!
      {
        assume( p_LmEqual(itr->first, multiplier, r) );
-        
+
        if( itr->second == NULL )
-         return (NULL);
-        
+         return (NULL);
+
        poly p = p_Copy(itr->second, r); // no copy???
-        
+
        if( __TREEOUTPUT__ )
        {
-//         PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); 
+//         PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false);
 //         Print(" \\\\cdot \\\\GEN{%d}\", \"children\": [ ", tail + 1);
-          Print("{ \"lookedupnode\": \"1\", \"nodelabel\": \"");
-          writeLatexTerm(p, r, true, false);
+          Print("{ \"lookedupnode\": \"1\", \"nodelabel\": \"");
+          writeLatexTerm(p, r, true, false);
        }
-        
+
        if( !n_Equal( pGetCoeff(multiplier), pGetCoeff(itr->first), r) ) // normalize coeffs!?
        {
-         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r); 
-         p = p_Mult_nn(p, n, r); 
+         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r);
+         p = p_Mult_nn(p, n, r);
          n_Delete(&n, r);
-          
+
          if( __TREEOUTPUT__ )
            Print("\", \"RESCALEDRESULT\": \"1\" },");
@@ -1338 +1338 @@
            Print("\", \"RESCALEDRESULT\": \"0\" },");
        }
-        
+
        return p;
      }
@@ -1345 +1345 @@
      {
 //        PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); Print(" \\\\cdot \\\\GEN{%d}\", \"children\": [", tail + 1);
-     }     
-     
+     }
+
      const poly p = ComputeImage(multiplier, tail);
      T.insert( TP2PCache::value_type(p_Copy(multiplier, r), p) ); //     T[ multiplier ] = p;
@@ -1352 +1352 @@
 //     if( p == NULL )
 //        return (NULL);
-     
+
      if( __TREEOUTPUT__ )
      {
-//      PrintS("], \"storedResult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
+//        PrintS("], \"storedResult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
      }
-     
+
      return p_Copy(p, r);
   }
-   
+
   CCacheCompare o(r); TP2PCache T(o);
 
@@ -1367 +1367 @@
 //     PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); Print(" \\\\cdot \\\\GEN{%d}\", \"children\": [", tail + 1);
   }
-   
-   
+
+
   const poly p = ComputeImage(multiplier, tail);
 
   T.insert( TP2PCache::value_type(p_Copy(multiplier, r), p) );
-   
+
   m_cache.insert( TCache::value_type(tail, T) );
 
 //  if( p == NULL )
 //    return (NULL);
-   
+
   if( __TREEOUTPUT__ )
   {
 //     PrintS("], \"storedResult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
   }
-   
+
   return p_Copy(p, r);
 }
@@ -1396 +1396 @@
 }
 
-   
+
 poly SchreyerSyzygyComputation::TraverseTail(poly multiplier, poly tail) const
 {
@@ -1419 +1419 @@
     sBucket_pt& sum   = m_sum_bucket; assume( sum != NULL );
     poly s; int len;
-    
+
 //    CPolynomialSummator sum(r, bUsePolynomial);
 //    poly s = NULL;
@@ -1431 +1431 @@
       // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      
+
       const int lp = pLength(rt);
       if( rt != NULL && lp != 0 )
-        sBucket_Add_p(sum, rt, lp); 
+        sBucket_Add_p(sum, rt, lp);
     }
 
@@ -1474 +1474 @@
     if( s == NULL ) // No Reducer?
      return s;
-     
+
     if( __TREEOUTPUT__ )
     {
-      PrintS("{ \"nodelabel\": \""); writeLatexTerm(s, r); 
-    }
-    
-#else    
+      PrintS("{ \"nodelabel\": \""); writeLatexTerm(s, r);
+    }
+
+#else
     // NOTE: only LT(term4reduction) should be used in the following:
     poly product = pp_Mult_mm(multiplier, term4reduction, r);
@@ -1487 +1487 @@
     if( s == NULL ) // No Reducer?
      return s;
-     
+
     if( __TREEOUTPUT__ )
     {
-      PrintS("{ \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelable\": \""); writeLatexTerm(product, r, false); 
-    }
-     
+      PrintS("{ \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelable\": \""); writeLatexTerm(product, r, false);
+    }
+
     p_Delete(&product, r);
 #endif
@@ -1499 +1499 @@
   if( s == NULL ) // No Reducer?
     return s;
-   
+
 
   poly b = leadmonom(s, r);
@@ -1506 +1506 @@
   assume( c >= 0 && c < IDELEMS(T) );
 
-   
+
   if( __TREEOUTPUT__ )
      PrintS("\", \"children\": [");
-   
+
   const poly t = TraverseTail(b, c); // T->m[c];
 
   if( t != NULL )
-    s = p_Add_q(s, t, r); 
+    s = p_Add_q(s, t, r);
 
   if( __TREEOUTPUT__ )
   {
-        
+
     PrintS("], \"noderesult\": \"");
-    writeLatexTerm(s, r, true, false); 
+    writeLatexTerm(s, r, true, false);
     PrintS("\" },");
   }
-   
+
   return s;
 }
@@ -1531 +1531 @@
 
 BEGIN_NAMESPACE_NONAME
-   
+
 static inline int atGetInt(idhdl rootRingHdl, const char* attribute, long def)
 {
@@ -1537 +1537 @@
 }
 
-END_NAMESPACE   
-
-     
+END_NAMESPACE
+
+
 SchreyerSyzygyComputationFlags::SchreyerSyzygyComputationFlags(idhdl rootRingHdl):
 #ifndef NDEBUG
@@ -1547 +1547 @@
 #endif
 //    __SYZCHECK__( (BOOLEAN)atGetInt(rootRingHdl, "SYZCHECK", __DEBUG__) ),
-    __LEAD2SYZ__( atGetInt(rootRingHdl, "LEAD2SYZ", 1) ), 
-    __TAILREDSYZ__( atGetInt(rootRingHdl, "TAILREDSYZ", 1) ), 
+    __LEAD2SYZ__( atGetInt(rootRingHdl, "LEAD2SYZ", 1) ),
+    __TAILREDSYZ__( atGetInt(rootRingHdl, "TAILREDSYZ", 1) ),
     __HYBRIDNF__( atGetInt(rootRingHdl, "HYBRIDNF", 2) ),
     __IGNORETAILS__( atGetInt(rootRingHdl, "IGNORETAILS", 0) ),
@@ -1554 +1554 @@
     __TREEOUTPUT__( atGetInt(rootRingHdl, "TREEOUTPUT", 0) ),
     m_rBaseRing( rootRingHdl->data.uring )
-{    
+{
 #ifndef NDEBUG
   if( __DEBUG__ )
@@ -1568 +1568 @@
   }
 #endif
-   
+
   // TODO: just current setting!
   assume( rootRingHdl == currRingHdl );
@@ -1576 +1576 @@
 }
 
-   
+
 
 CLeadingTerm::CLeadingTerm(unsigned int _label,  const poly _lt, const ring R):
@@ -1601 +1601 @@
 
   assume( m_L == L );
-  
+
   if( L != NULL )
   {
     const ring& R = m_rBaseRing;
     assume( R != NULL );
-    
+
     for( int k = IDELEMS(L) - 1; k >= 0; k-- )
     {
@@ -1685 +1685 @@
   const unsigned long p_sev = m_sev;
 
-  assume( p_sev == p_GetShortExpVector(p, r) );     
+  assume( p_sev == p_GetShortExpVector(p, r) );
 
   return p_LmShortDivisibleByNoComp(p, p_sev, product, not_sev, r);
@@ -1704 +1704 @@
 
   const unsigned long p_sev = m_sev;
-  assume( p_sev == p_GetShortExpVector(p, r) );     
+  assume( p_sev == p_GetShortExpVector(p, r) );
 
   if (p_sev & not_sev)
@@ -1720 +1720 @@
 class CDivisorEnumerator: public SchreyerSyzygyComputationFlags
 {
-  private: 
+  private:
     const CReducerFinder& m_reds;
     const poly m_product;
@@ -1742 +1742 @@
     {
       assume( m_comp >= 0 );
-      assume( m_reds.m_L != NULL );  
+      assume( m_reds.m_L != NULL );
     }
 
@@ -1748 +1748 @@
     {
       m_active = false;
-      
+
       m_itr = m_reds.m_hash.find(m_comp);
 
@@ -1763 +1763 @@
 
 //      m_active = true;
-      return true;      
+      return true;
     }
 
@@ -1773 +1773 @@
       return *(*m_current);
     }
- 
+
     inline bool MoveNext()
     {
@@ -1782 +1782 @@
       else
         m_active = true; // for Current()
-      
+
       // looking for the next good entry
       for( ; m_current != m_finish; ++m_current )
@@ -1804 +1804 @@
       // the end... :(
       assume( m_current == m_finish );
-      
+
       m_active = false;
       return false;
@@ -1819 +1819 @@
 
   return itr.MoveNext();
-  
-/*  
+
+/*
   const ring& r = m_rBaseRing;
-  
+
   const long comp = p_GetComp(product, r);
   const unsigned long not_sev = ~p_GetShortExpVector(product, r);
@@ -1830 +1830 @@
   CReducersHash::const_iterator it = m_hash.find(comp); // same module component
 
-  assume( m_L != NULL );  
+  assume( m_L != NULL );
 
   if( it == m_hash.end() )
     return false;
   // assume comp!
- 
+
   const TReducers& reducers = it->second;
 
@@ -1855 +1855 @@
 
   return false;
-*/  
+*/
 }
 
@@ -1892 +1892 @@
 class CDivisorEnumerator2: public SchreyerSyzygyComputationFlags
 {
-  private: 
+  private:
     const CReducerFinder& m_reds;
     const poly m_multiplier, m_term;
@@ -1914 +1914 @@
     {
       assume( m_comp >= 0 );
-      assume( m_reds.m_L != NULL );  
-      assume( m_multiplier != NULL ); 
+      assume( m_reds.m_L != NULL );
+      assume( m_multiplier != NULL );
       assume( m_term != NULL );
 //      assume( p_GetComp(m_multiplier, m_rBaseRing) == 0 );
@@ -1923 +1923 @@
     {
       m_active = false;
-      
-      m_itr = m_reds.m_hash.find(m_comp); 
+
+      m_itr = m_reds.m_hash.find(m_comp);
 
       if( m_itr == m_reds.m_hash.end() )
@@ -1937 +1937 @@
         return false;
 
-      return true;      
+      return true;
     }
 
@@ -1947 +1947 @@
       return *(*m_current);
     }
- 
+
     inline bool MoveNext()
     {
@@ -1954 +1954 @@
       if( m_active )
         ++m_current;
-      else 
+      else
         m_active = true;
-   
-      
+
+
       // looking for the next good entry
       for( ; m_current != m_finish; ++m_current )
@@ -1974 +1974 @@
 //          m_active = true;
           return true;
-          
+
         }
       }
@@ -1980 +1980 @@
       // the end... :(
       assume( m_current == m_finish );
-      
+
       m_active = false;
       return false;
     }
 };
-   
+
 poly CReducerFinder::FindReducer(const poly multiplier, const poly t,
                                  const poly syzterm,
@@ -2018 +2018 @@
 
     poly pr = p_Mult_q( leadmonom(multiplier, r, false), leadmonom(t, r, false), r);
-    
+
     assume( p_EqualPolys(lm, pr, r) );
 
@@ -2024 +2024 @@
     //  def @@product = leadmonomial(syzterm) * L[@@r];
 
-    p_Delete(&lm, r);    
-    p_Delete(&pr, r);    
-  }
-   
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ && 
+    p_Delete(&lm, r);
+    p_Delete(&pr, r);
+  }
+
+  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ &&
 
   const poly q = p_New(r); pNext(q) = NULL;
@@ -2039 +2039 @@
     const poly p = itr.Current().m_lt;
     const int k  = itr.Current().m_label;
-     
+
     p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t // TODO: do it once?
     p_ExpVectorDiff(q, q, p, r); // (LM(product) / LM(L[k]))
-    
+
     p_SetComp(q, k + 1, r);
     p_Setm(q, r);
@@ -2055 +2055 @@
           Print("_FindReducer::Test SYZTERM: q == syzterm !:((, syzterm is: ");
           dPrint(syzterm, r, r, 1);
-        }    
+        }
 #endif
         continue;
       }
 
-    // while the complement (the fraction) is not reducible by leading syzygies 
-    if( to_check && syz_checker.IsDivisible(q) ) 
+    // while the complement (the fraction) is not reducible by leading syzygies
+    if( to_check && syz_checker.IsDivisible(q) )
     {
 #ifndef NDEBUG
@@ -2075 +2075 @@
     p_SetCoeff0(q, n_Neg( n_Div(n, p_GetCoeff(p, r), r), r), r);
     n_Delete(&n, r);
-    
+
     return q;
   }
-   
+
 /*
   const long comp = p_GetComp(t, r); assume( comp >= 0 );
@@ -2086 +2086 @@
 //   {
 //     const poly p = L->m[k];
-// 
+//
 //     if ( p_GetComp(p, r) != comp )
 //       continue;
-// 
+//
 //     const unsigned long p_sev = p_GetShortExpVector(p, r); // to be stored in m_hash!!!
 
@@ -2099 +2099 @@
 
   // assume comp!
- 
+
   assume( m_L != NULL );
 
@@ -2113 +2113 @@
 
 //    const unsigned long p_sev = (*vit)->m_sev;
-//    assume( p_sev == p_GetShortExpVector(p, r) );     
+//    assume( p_sev == p_GetShortExpVector(p, r) );
 
 //    if( !p_LmShortDivisibleByNoComp(p, p_sev, product, not_sev, r) )
-//      continue;     
+//      continue;
 
     if( !(*vit)->DivisibilityCheck(multiplier, t, not_sev, r) )
       continue;
-    
-    
+
+
 //    if (p_sev & not_sev) continue;
-//    if( !_p_LmDivisibleByNoComp(p, multiplier, t, r) ) continue;     
-
-
-    p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t        
+//    if( !_p_LmDivisibleByNoComp(p, multiplier, t, r) ) continue;
+
+
+    p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t
     p_ExpVectorDiff(q, q, p, r); // (LM(product) / LM(L[k]))
-    
+
     p_SetComp(q, k + 1, r);
     p_Setm(q, r);
@@ -2140 +2140 @@
           Print("_FindReducer::Test SYZTERM: q == syzterm !:((, syzterm is: ");
           dPrint(syzterm, r, r, 1);
-        }    
+        }
 
         continue;
       }
 
-    // while the complement (the fraction) is not reducible by leading syzygies 
-    if( to_check && syz_checker.IsDivisible(q) ) 
+    // while the complement (the fraction) is not reducible by leading syzygies
+    if( to_check && syz_checker.IsDivisible(q) )
     {
       if( __DEBUG__ )
@@ -2159 +2159 @@
     p_SetCoeff0(q, n_Neg( n_Div(n, p_GetCoeff(p, r), r), r), r);
     n_Delete(&n, r);
-    
+
     return q;
   }
-*/ 
+*/
 
   p_LmFree(q, r);
 
   return NULL;
-  
+
 }
 
@@ -2203 +2203 @@
     //  def @@product = leadmonomial(syzterm) * L[@@r];
 
-    p_Delete(&lm, r);    
-  }
-
-
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ && 
+    p_Delete(&lm, r);
+  }
+
+
+  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ &&
 
   const poly q = p_New(r); pNext(q) = NULL;
@@ -2218 +2218 @@
     const poly p = itr.Current().m_lt;
     const int k  = itr.Current().m_label;
-     
+
     p_ExpVectorDiff(q, product, p, r); // (LM(product) / LM(L[k]))
     p_SetComp(q, k + 1, r);
@@ -2232 +2232 @@
           Print("_FindReducer::Test SYZTERM: q == syzterm !:((, syzterm is: ");
           dPrint(syzterm, r, r, 1);
-        }    
+        }
 #endif
         continue;
       }
 
-    // while the complement (the fraction) is not reducible by leading syzygies 
-    if( to_check && syz_checker.IsDivisible(q) ) 
+    // while the complement (the fraction) is not reducible by leading syzygies
+    if( to_check && syz_checker.IsDivisible(q) )
     {
 #ifndef NDEBUG
@@ -2250 +2250 @@
 
     p_SetCoeff0(q, n_Neg( n_Div( p_GetCoeff(product, r), p_GetCoeff(p, r), r), r), r);
-   
+
     return q;
   }
-   
-   
-   
-/*   
+
+
+
+/*
   const long comp = p_GetComp(product, r);
   const unsigned long not_sev = ~p_GetShortExpVector(product, r);
@@ -2265 +2265 @@
 //   {
 //     const poly p = L->m[k];
-// 
+//
 //     if ( p_GetComp(p, r) != comp )
 //       continue;
-// 
+//
 //     const unsigned long p_sev = p_GetShortExpVector(p, r); // to be stored in m_hash!!!
-  
+
    // looking for an appropriate diviser p = L[k]...
   CReducersHash::const_iterator it = m_hash.find(comp); // same module component
@@ -2281 +2281 @@
   const TReducers& reducers = it->second;
 
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ && 
+  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ &&
 
   const poly q = p_New(r); pNext(q) = NULL;
@@ -2287 +2287 @@
   if( __DEBUG__ )
     p_SetCoeff0(q, 0, r); // for printing q
-  
+
   for(TReducers::const_iterator vit = reducers.begin(); vit != reducers.end(); vit++ )
   {
@@ -2300 +2300 @@
     const unsigned long p_sev = (*vit)->m_sev;
 
-    assume( p_sev == p_GetShortExpVector(p, r) );     
+    assume( p_sev == p_GetShortExpVector(p, r) );
 
     if( !p_LmShortDivisibleByNoComp(p, p_sev, product, not_sev, r) )
-      continue;     
+      continue;
 
 //     // ... which divides the product, looking for the _1st_ appropriate one!
@@ -2321 +2321 @@
           Print("_FindReducer::Test SYZTERM: q == syzterm !:((, syzterm is: ");
           dPrint(syzterm, r, r, 1);
-        }    
+        }
 
         continue;
       }
 
-    // while the complement (the fraction) is not reducible by leading syzygies 
-    if( to_check && syz_checker.IsDivisible(q) ) 
+    // while the complement (the fraction) is not reducible by leading syzygies
+    if( to_check && syz_checker.IsDivisible(q) )
     {
       if( __DEBUG__ )
@@ -2333 +2333 @@
         PrintS("_FindReducer::Test LS: q is divisible by LS[?] !:((: ");
       }
-      
+
       continue;
     }
@@ -2376 +2376 @@
     }
 
-    m_compute = true;    
+    m_compute = true;
   }
 }
@@ -2385 +2385 @@
   assume( m != NULL );
   if( m_compute && (m != NULL))
-  {  
+  {
     const ring& R = m_rBaseRing;
 
@@ -2400 +2400 @@
 }
 
-CCacheCompare::CCacheCompare(): m_ring(currRing) {} 
+CCacheCompare::CCacheCompare(): m_ring(currRing) {}