Changeset ac00e2f in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

0f74a1d360bc1f2c80ba740d66bcf0a755b6e43d

Parents:

8b5fff53b54b8c7889b6490e4871793cfd8e4efe

Message:

removed currQuotient

Files:

• Singular/dyn_modules/syzextra/mod_main.cc (modified) (75 diffs)
• Singular/dyn_modules/syzextra/myNF.cc (modified) (2 diffs)
• Singular/dyn_modules/syzextra/syzextra.cc (modified) (123 diffs)
• Singular/fglm.cc (modified) (7 diffs)
• Singular/iparith.cc (modified) (58 diffs)
• Singular/ipassign.cc (modified) (9 diffs)
• Singular/ipid.h (modified) (1 diff)
• Singular/ipshell.cc (modified) (4 diffs)
• Singular/subexpr.cc (modified) (2 diffs)
• kernel/GBEngine/f5gb.cc (modified) (6 diffs)
• kernel/GBEngine/kstd1.cc (modified) (3 diffs)
• kernel/GBEngine/nc.cc (modified) (8 diffs)
• kernel/GBEngine/sca.cc (modified) (3 diffs)
• kernel/GBEngine/syz.cc (modified) (11 diffs)
• kernel/GBEngine/syz0.cc (modified) (11 diffs)
• kernel/GBEngine/syz3.cc (modified) (1 diff)
• kernel/GBEngine/test.cc (modified) (1 diff)
• kernel/GBEngine/units.cc (modified) (2 diffs)
• kernel/fglm/fglmhom.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (24 diffs)
• kernel/ideals.h (modified) (1 diff)
• kernel/polys.cc (modified) (4 diffs)
• kernel/test.cc (modified) (1 diff)
• libpolys/polys/matpol.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Singular/dyn_modules/syzextra/mod_main.cc

@@ -30 +30 @@
 #include <Singular/attrib.h>
 
-#include <Singular/ipid.h> 
+#include <Singular/ipid.h>
 #include <Singular/ipshell.h> // For iiAddCproc
 
@@ -45 +45 @@
 
 
-#if GOOGLE_PROFILE_ENABLED 
+#if GOOGLE_PROFILE_ENABLED
 #include <google/profiler.h>
-#endif // #if GOOGLE_PROFILE_ENABLED 
+#endif // #if GOOGLE_PROFILE_ENABLED
 
 
@@ -84 +84 @@
 
   const char *usage = "'ClearContent' needs a (non-zero!) poly or vector argument...";
-  
+
   if( h == NULL )
   {
@@ -100 +100 @@
 
   assume (h->Next() == NULL);
-  
+
   poly ph = reinterpret_cast<poly>(h->Data());
-  
+
   if( ph == NULL )
   {
@@ -108 +108 @@
     return TRUE;
   }
-  
+
   const ring r =  currRing;
   assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
@@ -185 +185 @@
   }
 
-  return (_n);  
+  return (_n);
 }
 
@@ -201 +201 @@
   {
     const char* name = (char*)(h->Data());
-    assume( name != NULL );   
+    assume( name != NULL );
     ProfilerStart(name);
   } else
-    WerrorS("ProfilerStart requires a string [name] argument"); 
+    WerrorS("ProfilerStart requires a string [name] argument");
 #else
   WarnS("Sorry no google profiler support (GOOGLE_PROFILE_ENABLE!=1)...");
@@ -249 +249 @@
 }
 
-                   
+
 
 static BOOLEAN DetailedPrint(leftv __res, leftv h)
@@ -263 +263 @@
   if( h->Typ() == NUMBER_CMD)
   {
-    number n = (number)h->Data(); 
+    number n = (number)h->Data();
 
     const ring r = currRing;
@@ -278 +278 @@
     return FALSE;
   }
-  
+
   if( h->Typ() == RING_CMD)
   {
@@ -301 +301 @@
   if( h->Typ() == IDEAL_CMD || h->Typ() == MODUL_CMD)
   {
-    const ideal id = (const ideal)h->Data(); h = h->Next(); 
+    const ideal id = (const ideal)h->Data(); h = h->Next();
 
     dPrint(id, currRing, currRing, getOptionalInteger(h, 3));
-    
-    return FALSE;            
+
+    return FALSE;
   }
 
@@ -344 +344 @@
     if (r == NULL)
       Print("ring '%10s': NULL", "syRing");
-    else 
+    else
       if (r == currRing)
         Print("ring '%10s': currRing", "syRing");
@@ -356 +356 @@
 #endif
           // rChangeCurrRing(r);
-        }            
+        }
     PrintLn();
 
@@ -489 +489 @@
 
     h = h->Next(); assume (h == NULL);
-    
+
     return FALSE;
   }
@@ -495 +495 @@
   if( h->Typ() == IDEAL_CMD || h->Typ() == MODUL_CMD)
   {
-    res->data = id_Tail( (const ideal)h->Data(), r );      
+    res->data = id_Tail( (const ideal)h->Data(), r );
     res->rtyp = h->Typ();
-    
+
     h = h->Next(); assume (h == NULL);
-    
+
     return FALSE;
   }
@@ -512 +512 @@
 {
   const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-      
+
   const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
 //  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
@@ -528 +528 @@
   }
 
-  assume( h != NULL );  
+  assume( h != NULL );
 
   if( h->Typ() == IDEAL_CMD || h->Typ() == MODUL_CMD)
@@ -538 +538 @@
     if( __DEBUG__ )
     {
-      PrintS("ComputeLeadingSyzygyTerms::Input: \n");     
+      PrintS("ComputeLeadingSyzygyTerms::Input: \n");
       dPrint(id, r, r, 1);
     }
-    
+
     assume( !__LEAD2SYZ__ );
 
@@ -547 +547 @@
 
     const ideal newid = ComputeLeadingSyzygyTerms(id,  attributes);
-    
+
     res->data = newid; res->rtyp = MODUL_CMD;
     return FALSE;
@@ -580 +580 @@
   }
 
-  assume( h != NULL );  
+  assume( h != NULL );
 
   if(    (h->Typ() == IDEAL_CMD || h->Typ() == MODUL_CMD)
       && (h->rtyp  == IDHDL) // must be a variable!
       && (h->e == NULL) // not a list element
-      ) 
+      )
   {
     const ideal id = (const ideal)h->Data();
@@ -594 +594 @@
     {
       PrintS("Sort_c_ds::Input: \n");
-      dPrint(id, r, r, 1);      
+      dPrint(id, r, r, 1);
     }
 
@@ -605 +605 @@
 //    res->data = id;
 //    res->rtyp = h->Typ();
-    
+
     if( __DEBUG__ )
     {
@@ -617 +617 @@
 
   WarnS("ComputeLeadingSyzygyTerms needs a single ideal/module argument (must be a variable!)...");
-  return TRUE;  
+  return TRUE;
 }
 
@@ -640 +640 @@
   }
 
-  assume( h != NULL );  
+  assume( h != NULL );
 
   assume( __LEAD2SYZ__ ); // ???
-  
+
   if( h->Typ() == IDEAL_CMD || h->Typ() == MODUL_CMD)
   {
@@ -690 +690 @@
   {
     WerrorS(usage);
-    return TRUE;    
-  }
-    
+    return TRUE;
+  }
+
   const poly product = (poly) h->Data(); assume (product != NULL);
 
@@ -700 +700 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
   poly syzterm = NULL;
 
-  if(h->Typ()==VECTOR_CMD) 
+  if(h->Typ()==VECTOR_CMD)
     syzterm = (poly) h->Data();
 
@@ -714 +714 @@
   {
     WerrorS(usage);
-    return TRUE;    
-  }
-  
+    return TRUE;
+  }
+
   const ideal L = (ideal) h->Data(); h = h->Next();
 
@@ -758 +758 @@
     PrintS("FindReducer::Output: \n");
     dPrint((poly)res->data, r, r, 2);
-  }    
-  
-  return FALSE;   
-  
+  }
+
+  return FALSE;
+
 }
 
@@ -781 +781 @@
 
   assume( __HYBRIDNF__ ); // ???
-  
+
   if ((h==NULL) || (h->Typ() != VECTOR_CMD) || (h->Data() == NULL))
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -795 +795 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -804 +804 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -814 +814 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -851 +851 @@
       PrintS("LS: "); dPrint(LS, r, r, 0);
     }
-  }  
-  
+  }
+
   res->rtyp = VECTOR_CMD;
   res->data = SchreyerSyzygyNF(syz_lead,
@@ -889 +889 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
   const poly multiplier = (poly) h->Data(); assume (multiplier != NULL);
 
-  
+
   h = h->Next();
   if ((h==NULL) || (h->Typ()!=VECTOR_CMD && h->Typ() !=POLY_CMD) || (h->Data() == NULL))
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
   const poly term4reduction = (poly) h->Data(); assume( term4reduction != NULL );
 
-  
+
   poly syztermCheck = NULL;
-  
+
   h = h->Next();
   if ((h==NULL) || !((h->Typ()==VECTOR_CMD) || (h->Data() == NULL)) )
   {
     WerrorS(usage);
-    return TRUE;    
-  }
-
-  if(h->Typ()==VECTOR_CMD) 
+    return TRUE;
+  }
+
+  if(h->Typ()==VECTOR_CMD)
     syztermCheck = (poly) h->Data();
 
-  
+
   h = h->Next();
   if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
   const ideal L = (ideal) h->Data(); assume( IDELEMS(L) > 0 );
 
-  
+
   h = h->Next();
   if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -960 +960 @@
     PrintS("t: "); dPrint(term4reduction, r, r, 2);
     PrintS("syzterm: "); dPrint(syztermCheck, r, r, 2);
-    
+
     PrintS("L: "); dPrint(L, r, r, 0);
     PrintS("T: "); dPrint(T, r, r, 0);
@@ -977 +977 @@
     const int c = p_GetComp(syztermCheck, r) - 1;
     assume( c >= 0 && c < IDELEMS(L) );
-    
+
     const poly p = L->m[c];
-    assume( p != NULL ); assume( pNext(p) == NULL );    
+    assume( p != NULL ); assume( pNext(p) == NULL );
 
     assume( p_EqualPolys(term4reduction, p, r) ); // assume? TODO
@@ -989 +989 @@
     assume( p_EqualPolys(multiplier, m, r) ); // assume? TODO
 
-    p_Delete(&m, r);    
-    
+    p_Delete(&m, r);
+
 // NOTE:   leadmonomial(syzterm) == m &&  L[leadcomp(syzterm)] == t
   }
@@ -1004 +1004 @@
     dPrint((poly)res->data, r, r, 2);
   }
-  
-  
+
+
   return FALSE;
 }
@@ -1031 +1031 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1040 +1040 @@
   {
     WerrorS(usage);
-    return TRUE;    
-  }
-
-  const poly tail = (poly) h->Data(); 
+    return TRUE;
+  }
+
+  const poly tail = (poly) h->Data();
 
   h = h->Next();
@@ -1050 +1050 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1061 +1061 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1069 +1069 @@
 
   h = h->Next();
-  
+
   ideal LS = NULL;
 
@@ -1118 +1118 @@
 {
   const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-   
+
   const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
-   
+
   const char* usage = "`ComputeResolution(<ideal/module>[,int])` expected";
   const ring r = attributes.m_rBaseRing;
@@ -1130 +1130 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1144 +1144 @@
   {
     WerrorS(usage);
-    return TRUE;    
-  }
-  
+    return TRUE;
+  }
+
   ideal L = (ideal)(h->CopyD()); // no copy!
   assume( IDELEMS(L) == size );
-  
+
   h = h->Next();
   if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
   ideal T = (ideal)(h->CopyD()); // no copy!
   assume( IDELEMS(T) == size );
-  
+
   h = h->Next();
 
   // length..?
   long length = 0;
-  
+
   if ((h!=NULL) && (h->Typ()==INT_CMD))
   {
@@ -1170 +1170 @@
     h = h->Next();
   }
-  
+
   assume( h == NULL );
 
   if( length <= 0 )
-    length = 1 + rVar(r);  
+    length = 1 + rVar(r);
 
   if( __DEBUG__ )
@@ -1187 +1187 @@
 
   syStrategy _res=(syStrategy)omAlloc0(sizeof(ssyStrategy));
-  
+
 //  class ssyStrategy; typedef ssyStrategy * syStrategy;
 //  typedef ideal *            resolvente;
@@ -1198 +1198 @@
 //  if (attributes.__TREEOUTPUT__)
 //    Print("{ \"RESOLUTION: HYBRIDNF:%d, TAILREDSYZ: %d, LEAD2SYZ: %d, IGNORETAILS: %d\": [\n", attributes.__HYBRIDNF__, attributes.__TAILREDSYZ__, attributes.__LEAD2SYZ__, attributes.__IGNORETAILS__);
-   
+
   while( (!idIs0(L)) && (index < length))
   {
     attributes.nextSyzygyLayer();
-    ideal LL, TT;  
-     
+    ideal LL, TT;
+
     ComputeSyzygy(L, T, LL, TT, attributes);
 
@@ -1215 +1215 @@
 
     assume( size == IDELEMS(TT) );
-    
+
     id_Delete(&L, r); id_Delete(&T, r);
 
     L = LL; T = TT;
-    
+
     // id_Add(T, L, r);
     M = idInit(size, 0);
@@ -1227 +1227 @@
     }
     M->rank = id_RankFreeModule(M, r);
-    
+
     if( __DEBUG__ )
     {
@@ -1233 +1233 @@
       PrintS("M = LL + TT: \n"); dPrint(M, r, r, 0);
     }
-  
+
     _res->fullres[index++] = M; // ???
   }
@@ -1240 +1240 @@
 
   id_Delete(&L, r); id_Delete(&T, r);
-  
+
   res->data = _res;
   res->rtyp = RESOLUTION_CMD;
@@ -1253 +1253 @@
 
 //  omFreeSize(_res, sizeof(ssyStrategy));
-  
+
   return FALSE;
 
@@ -1280 +1280 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1291 +1291 @@
   {
     WerrorS(usage);
-    return TRUE;    
+    return TRUE;
   }
 
@@ -1298 +1298 @@
 
 
-  h = h->Next(); assume( h == NULL );  
+  h = h->Next(); assume( h == NULL );
 
   if( __DEBUG__ )
@@ -1317 +1317 @@
 
   l->m[1].rtyp = MODUL_CMD; l->m[1].data = reinterpret_cast<void *>(TT);
-  
+
   res->data = l; res->rtyp = LIST_CMD;
-  
+
   if( __DEBUG__ )
   {
@@ -1374 +1374 @@
     } else
       res->data = reinterpret_cast<void *>(jjLONG2N(0));
-      
+
 
     res->rtyp = BIGINT_CMD;
@@ -1432 +1432 @@
   res->data = reinterpret_cast<void *>(rAssure_SyzComp(currRing, TRUE));
   res->rtyp = RING_CMD; // return new ring!
-  // QRING_CMD? 
+  // QRING_CMD?
 
   return FALSE;
@@ -1455 +1455 @@
     }
 
-    sign = s;            
+    sign = s;
   }
 
@@ -1461 +1461 @@
   res->data = reinterpret_cast<void *>(rAssure_InducedSchreyerOrdering(currRing, TRUE, sign));
   res->rtyp = RING_CMD; // return new ring!
-  // QRING_CMD? 
+  // QRING_CMD?
   return FALSE;
 }
@@ -1521 +1521 @@
 
 
-  
+
   lists l=(lists)omAllocBin(slists_bin);
   l->Init(2);
@@ -1552 +1552 @@
 
 
-/* // the following turned out to be unnecessary...   
+/* // the following turned out to be unnecessary...
 /// Finds p^th AM ordering, and returns its position in r->typ[] AND
 /// corresponding &r->wvhdl[]
@@ -1605 +1605 @@
 // {
 //   NoReturn(res);
-// 
+//
 //   const ring r = currRing;
-// 
+//
 //   int p = 0; // which IS-block? p^th!
-// 
+//
 //   if ((h!=NULL) && (h->Typ()==INT_CMD))
 //     p = (int)((long)(h->Data())); h=h->next;
-// 
+//
 //   assume(p >= 0);
-// 
+//
 //   int d, w;
-//   
+//
 //   if( !rGetAMPos(r, p, d, w, TRUE) )
 //   {
@@ -1622 +1622 @@
 //     return TRUE;
 //   }
-// 
+//
 //   assume( r->typ[d].ord_typ == ro_am );
 //   assume( r->order[w] == ringorder_am );
-// 
-// 
+//
+//
 //   const short start = r->typ[d].data.am.start;  // bounds of ordering (in E)
 //   const short end = r->typ[d].data.am.end;
@@ -1632 +1632 @@
 //   const int *weights = r->typ[d].data.am.weights; // pointers into wvhdl field of length (end-start+1) + len_gen
 //   // contents w_1,... w_n, len, mod_w_1, .. mod_w_len, 0
-// 
+//
 //   assume( weights == r->wvhdl[w] );
-// 
-//   
+//
+//
 //   lists l=(lists)omAllocBin(slists_bin);
 //   l->Init(2);
-// 
+//
 //   const short V = end-start+1;
 //   intvec* ww_vars = new intvec(V);
 //   intvec* ww_gens = new intvec(len_gen);
-// 
+//
 //   for (int i = 0; i < V; i++ )
 //     (*ww_vars)[i] = weights[i];
-// 
+//
 //   assume( weights[V] == len_gen );
-// 
+//
 //   for (int i = 0; i < len_gen; i++ )
 //     (*ww_gens)[i] = weights[i - V - 1];
-//   
-// 
+//
+//
 //   l->m[0].rtyp = INTVEC_CMD;
 //   l->m[0].data = reinterpret_cast<void *>(ww_vars);
-// 
+//
 //   l->m[1].rtyp = INTVEC_CMD;
 //   l->m[1].data = reinterpret_cast<void *>(ww_gens);
-// 
-// 
+//
+//
 //   return FALSE;
-// 
+//
 // }
 */
@@ -1782 +1782 @@
 
   if ( ( (h!=NULL) && (h->Typ()== INT_CMD)  ) )
-    iLazyReduce = (int)((long)(h->Data())); 
-
-  res->data = (void *)kNFLength(M, currQuotient, v, iSyzComp, iLazyReduce); // NOTE: currRing :(
+    iLazyReduce = (int)((long)(h->Data()));
+
+  res->data = (void *)kNFLength(M, currRing->qideal, v, iSyzComp, iLazyReduce); // NOTE: currRing :(
   return FALSE;
 }
@@ -1830 +1830 @@
       iComp = id_RankFreeModule(r->typ[posIS].data.is.F, r); // ;
   }
-  
+
   assume(iComp >= 0);
 
@@ -1838 +1838 @@
 
   //           int add_row_shift = 0;
-  // 
+  //
   if (w!=NULL)
   {
     w = ivCopy(w);
   //             add_row_shift = ww->min_in();
-  // 
+  //
   //             (*ww) -= add_row_shift;
-  //             
-  //             if (idTestHomModule(I, currQuotient, ww))
+  //
+  //             if (idTestHomModule(I, currRing->qideal, ww))
   //             {
     hom = isHomog;
@@ -1867 +1867 @@
 
   ideal J = // idPrepare( I, hom, iComp, &w);
-           kStd(I, currQuotient, hom, &w, NULL, iComp);
+           kStd(I, currRing->qideal, hom, &w, NULL, iComp);
 
   idTest(J);
@@ -1892 +1892 @@
   const poly p = reinterpret_cast<poly>(h->Data());
 
-  
+
   pTest(p);  pWrite(p); PrintLn();
 
-  
-  p_Content( p, currRing);      
+
+  p_Content( p, currRing);
 
   pTest(p);
   pWrite(p); PrintLn();
-  
+
   NoReturn(res);
   return FALSE;
@@ -1908 +1908 @@
 {
   int ret = 0;
-  
+
   if ( (h!=NULL) && (h->Typ()!=INT_CMD) )
   {
@@ -1922 +1922 @@
 }
 
-   
+
 
 END_NAMESPACE
 
 
-int SI_MOD_INIT(syzextra)(SModulFunctions* psModulFunctions) 
+int SI_MOD_INIT(syzextra)(SModulFunctions* psModulFunctions)
 {
 
@@ -1985 +1985 @@
   //  ADD("", FALSE, );
 
-#undef ADD  
+#undef ADD
   return 0;
 }
 
 #ifndef EMBED_PYTHON
-extern "C" { 
+extern "C" {
 int mod_init(SModulFunctions* psModulFunctions)
-{ 
-  return SI_MOD_INIT(syzextra)(psModulFunctions); 
+{
+  return SI_MOD_INIT(syzextra)(psModulFunctions);
 }
 }

Singular/dyn_modules/syzextra/myNF.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 DebugPrint.cc
- * 
+ *
  * Here we implement dPrint-s.
  *
@@ -303 +303 @@
     pp = p_KillSquares(pp, m_iFirstAltVar, m_iLastAltVar, currRing);
 
-    if(Q == currQuotient)
+    if(Q == currRing->qideal)
       Q = SCAQuotient(currRing);
   }

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) {}
 
 

Singular/fglm.cc

@@ -53 +53 @@
 };
 
-// Has to be called, if currQuotient != NULL. ( i.e. qring-case )
+// Has to be called, if currRing->qideal != NULL. ( i.e. qring-case )
 // Then a new ideal is build, consisting of the generators of sourceIdeal
-// and the generators of currQuotient, which are completely reduced by
+// and the generators of currRing->qideal, which are completely reduced by
 // the sourceIdeal. This means: If sourceIdeal is reduced, then the new
 // ideal will be reduced as well.
@@ -63 +63 @@
     int k, l, offset;
     BOOLEAN found;
-    ideal newSource= idInit( IDELEMS( sourceIdeal ) + IDELEMS( currQuotient ), 1 );
+    ideal newSource= idInit( IDELEMS( sourceIdeal ) + IDELEMS( currRing->qideal ), 1 );
     for ( k= IDELEMS( sourceIdeal )-1; k >=0; k-- )
         (newSource->m)[k]= pCopy( (sourceIdeal->m)[k] );
     offset= IDELEMS( sourceIdeal );
-    for ( l= IDELEMS( currQuotient )-1; l >= 0; l-- )
-    {
-        if ( (currQuotient->m)[l] != NULL )
+    for ( l= IDELEMS( currRing->qideal )-1; l >= 0; l-- )
+    {
+        if ( (currRing->qideal->m)[l] != NULL )
         {
             found= FALSE;
             for ( k= IDELEMS( sourceIdeal )-1; (k >= 0) && (found == FALSE); k-- )
-                if ( pDivisibleBy( (sourceIdeal->m)[k], (currQuotient->m)[l] ) )
+                if ( pDivisibleBy( (sourceIdeal->m)[k], (currRing->qideal->m)[l] ) )
                     found= TRUE;
             if ( ! found )
             {
-                (newSource->m)[offset]= pCopy( (currQuotient->m)[l] );
+                (newSource->m)[offset]= pCopy( (currRing->qideal->m)[l] );
                 offset++;
             }
@@ -86 +86 @@
 }
 
-// Has to be called, if currQuotient != NULL, i.e. in qring-case.
+// Has to be called, if currRing->qideal != NULL, i.e. in qring-case.
 // Gets rid of the elements of result which are contained in
-// currQuotient and skips Zeroes.
+// currRing->qideal and skips Zeroes.
 // Assumes that currRing == destRing
 void
@@ -100 +100 @@
         {
             found= FALSE;
-            for ( l= IDELEMS( currQuotient )-1; (l >= 0) && ( found == FALSE ); l-- )
-                if ( pDivisibleBy( (currQuotient->m)[l], (result->m)[k] ) )
+            for ( l= IDELEMS( currRing->qideal )-1; (l >= 0) && ( found == FALSE ); l-- )
+                if ( pDivisibleBy( (currRing->qideal->m)[l], (result->m)[k] ) )
                     found= TRUE;
             if ( found ) pDelete( & ((result->m)[k]) );
@@ -302 +302 @@
         {
             ideal sourceIdeal;
-            if ( currQuotient != NULL )
+            if ( currRing->qideal != NULL )
                 sourceIdeal= fglmUpdatesource( IDIDEAL( ih ) );
             else
@@ -311 +311 @@
                 // Now the settings are compatible with FGLM
                 assumeStdFlag( (leftv)ih );
-                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, IDRING(destRingHdl), destIdeal, FALSE, (currQuotient != NULL) ) == FALSE )
+                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, IDRING(destRingHdl), destIdeal, FALSE, (currRing->qideal != NULL) ) == FALSE )
                     state= FglmNotReduced;
             }
@@ -321 +321 @@
     {
         case FglmOk:
-            if ( currQuotient != NULL ) fglmUpdateresult( destIdeal );
+            if ( currRing->qideal != NULL ) fglmUpdateresult( destIdeal );
             break;
         case FglmHasOne:

Singular/iparith.cc

@@ -1981 +1981 @@
   }
 #endif
-  if(currQuotient==NULL)
+  if(currRing->qideal==NULL)
     res->data = (char *)((long)scDimInt((ideal)(v->Data()),(ideal)w->Data()));
   else
   {
-    ideal q=idSimpleAdd(currQuotient,(ideal)w->Data());
+    ideal q=idSimpleAdd(currRing->qideal,(ideal)w->Data());
     res->data = (char *)((long)scDimInt((ideal)(v->Data()),q));
     idDelete(&q);
@@ -2408 +2408 @@
     Print("//       performed for generic fibre, that is, over Q\n");
     intvec *module_w=(intvec*)atGet(&uuAsLeftv,"isHomog",INTVEC_CMD);
-    intvec *iv=hFirstSeries(uu,module_w,currQuotient);
+    intvec *iv=hFirstSeries(uu,module_w,currRing->qideal);
     int returnWithTrue = 1;
     switch((int)(long)v->Data())
@@ -2433 +2433 @@
   assumeStdFlag(u);
   intvec *module_w=(intvec*)atGet(u,"isHomog",INTVEC_CMD);
-  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currQuotient);
+  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currRing->qideal);
   switch((int)(long)v->Data())
   {
@@ -2499 +2499 @@
   kModW=w;
   pSetDegProcs(currRing,kHomModDeg);
-  res->data=(void *)(long)idHomModule(v_id,currQuotient,&w);
+  res->data=(void *)(long)idHomModule(v_id,currRing->qideal,&w);
   currRing->pLexOrder=save_pLexOrder;
   kHomW=NULL;
@@ -2511 +2511 @@
   assumeStdFlag(u);
   res->data=(void *)scIndIndset((ideal)(u->Data()),(int)(long)(v->Data()),
-                    currQuotient);
+                    currRing->qideal);
   return FALSE;
 }
@@ -2558 +2558 @@
   intvec *w_u=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   res->data = (char *)scKBase((int)(long)v->Data(),
-                              (ideal)(u->Data()),currQuotient, w_u);
+                              (ideal)(u->Data()),currRing->qideal, w_u);
   if (w_u!=NULL)
   {
@@ -2646 +2646 @@
      else
      {
-       if ((!idTestHomModule(u_id,currQuotient,w_v))
-       || (!idTestHomModule(v_id,currQuotient,w_v)))
+       if ((!idTestHomModule(u_id,currRing->qideal,w_v))
+       || (!idTestHomModule(v_id,currRing->qideal,w_v)))
        {
          WarnS("wrong weights");
@@ -3000 +3000 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(poly)u->Data());
+  res->data = (char *)kNF((ideal)v->Data(),currRing->qideal,(poly)u->Data());
   return FALSE;
 }
@@ -3008 +3008 @@
   ideal ui=(ideal)u->Data();
   ideal vi=(ideal)v->Data();
-  res->data = (char *)kNF(vi,currQuotient,ui);
+  res->data = (char *)kNF(vi,currRing->qideal,ui);
   return FALSE;
 }
@@ -3031 +3031 @@
   {
     maxl = currRing->N-1+2*(iiOp==MRES_CMD);
-    if (currQuotient!=NULL)
+    if (currRing->qideal!=NULL)
     {
       Warn(
@@ -3041 +3041 @@
   if (weights!=NULL)
   {
-    if (!idTestHomModule(u_id,currQuotient,weights))
+    if (!idTestHomModule(u_id,currRing->qideal,weights))
     {
       WarnS("wrong weights given:");weights->show();PrintLn();
@@ -3056 +3056 @@
   }
   else
-    idHomModule(u_id,currQuotient,&ww);
+    idHomModule(u_id,currRing->qideal,&ww);
   weights=ww;
 
@@ -3069 +3069 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3081 +3081 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3093 +3093 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3146 +3146 @@
   {
     maxl = currRing->N-1+2*(iiOp==MRES_CMD);
-    if (currQuotient!=NULL)
+    if (currRing->qideal!=NULL)
     {
       Warn(
@@ -3156 +3156 @@
   if (weights!=NULL)
   {
-    if (!idTestHomModule(u_id,currQuotient,weights))
+    if (!idTestHomModule(u_id,currRing->qideal,weights))
     {
       WarnS("wrong weights given:");weights->show();PrintLn();
@@ -3180 +3180 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3194 +3194 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3206 +3206 @@
   {
     int dummy;
-    if((currQuotient!=NULL)||
+    if((currRing->qideal!=NULL)||
     (!idHomIdeal (u_id,NULL)))
     {
@@ -3399 +3399 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(u_id,currQuotient,w))
+    if (!idTestHomModule(u_id,currRing->qideal,w))
     {
       WarnS("wrong weights:");w->show();PrintLn();
@@ -3410 +3410 @@
     }
   }
-  result=kStd(u_id,currQuotient,hom,&w,(intvec *)v->Data());
+  result=kStd(u_id,currRing->qideal,hom,&w,(intvec *)v->Data());
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -3479 +3479 @@
     if (w!=NULL)
     {
-      if (!idTestHomModule(i1,currQuotient,w))
+      if (!idTestHomModule(i1,currRing->qideal,w))
       {
         // no warnung: this is legal, if i in std(i,p)
@@ -3496 +3496 @@
     /* ii0 appears to be the position of the first element of il that
        does not belong to the old SB ideal */
-    result=kStd(i1,currQuotient,hom,&w,NULL,0,ii0);
+    result=kStd(i1,currRing->qideal,hom,&w,NULL,0,ii0);
     SI_RESTORE_OPT1(save1);
     idDelete(&i1);
@@ -3860 +3860 @@
     Print("//       generic fibre, that is, over Q\n");
     intvec *module_w=(intvec*)atGet(&vvAsLeftv,"isHomog",INTVEC_CMD);
-    scDegree(vv,module_w,currQuotient);
+    scDegree(vv,module_w,currRing->qideal);
     idDelete(&vv);
     rChangeCurrRing(origR);
@@ -3868 +3868 @@
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
-  scDegree((ideal)v->Data(),module_w,currQuotient);
+  scDegree((ideal)v->Data(),module_w,currRing->qideal);
   char *s=SPrintEnd();
   int l=strlen(s)-1;
@@ -3987 +3987 @@
     /* drop degree zero generator from vv (if any) */
     if (i != -1) pDelete(&vv->m[i]);
-    long d = (long)scDimInt(vv, currQuotient);
+    long d = (long)scDimInt(vv, currRing->qideal);
     if (rField_is_Ring_Z(currRing) && (i == -1)) d++;
     res->data = (char *)d;
@@ -3996 +3996 @@
   }
 #endif
-  res->data = (char *)(long)scDimInt((ideal)(v->Data()),currQuotient);
+  res->data = (char *)(long)scDimInt((ideal)(v->Data()),currRing->qideal);
   return FALSE;
 }
@@ -4180 +4180 @@
     Print("//       performed for generic fibre, that is, over Q\n");
     intvec *module_w=(intvec*)atGet(&vvAsLeftv,"isHomog",INTVEC_CMD);
-    //scHilbertPoly(vv,currQuotient);
-    hLookSeries(vv,module_w,currQuotient);
+    //scHilbertPoly(vv,currRing->qideal);
+    hLookSeries(vv,module_w,currRing->qideal);
     idDelete(&vv);
     rChangeCurrRing(origR);
@@ -4190 +4190 @@
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
-  //scHilbertPoly((ideal)v->Data(),currQuotient);
-  hLookSeries((ideal)v->Data(),module_w,currQuotient);
+  //scHilbertPoly((ideal)v->Data(),currRing->qideal);
+  hLookSeries((ideal)v->Data(),module_w,currRing->qideal);
   return FALSE;
 }
@@ -4212 +4212 @@
   if (w==NULL)
   {
-    res->data=(void *)(long)idHomModule(v_id,currQuotient,&w);
+    res->data=(void *)(long)idHomModule(v_id,currRing->qideal,&w);
     if (res->data!=NULL)
     {
@@ -4228 +4228 @@
   else
   {
-    res->data=(void *)(long)idTestHomModule(v_id,currQuotient,w);
+    res->data=(void *)(long)idTestHomModule(v_id,currRing->qideal,w);
     if((res->data==NULL) && (v->rtyp==IDHDL))
     {
@@ -4305 +4305 @@
 {
   assumeStdFlag(v);
-  res->data=(void *)scIndIntvec((ideal)(v->Data()),currQuotient);
+  res->data=(void *)scIndIntvec((ideal)(v->Data()),currRing->qideal);
   return FALSE;
 }
 static BOOLEAN jjINTERRED(leftv res, leftv v)
 {
-  ideal result=kInterRed((ideal)(v->Data()), currQuotient);
+  ideal result=kInterRed((ideal)(v->Data()), currRing->qideal);
   #ifdef HAVE_RINGS
   if(rField_is_Ring(currRing))
@@ -4391 +4391 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)scKBase(-1,(ideal)(v->Data()),currQuotient);
+  res->data = (char *)scKBase(-1,(ideal)(v->Data()),currRing->qideal);
   return FALSE;
 }
@@ -4572 +4572 @@
   int t=v->Typ();
   ideal r,m;
-  r=kMin_std((ideal)v->Data(),currQuotient,testHomog,NULL,m);
+  r=kMin_std((ideal)v->Data(),currRing->qideal,testHomog,NULL,m);
   lists l=(lists)omAllocBin(slists_bin);
   l->Init(2);
@@ -4586 +4586 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)(long)scMultInt((ideal)(v->Data()),currQuotient);
+  res->data = (char *)(long)scMultInt((ideal)(v->Data()),currRing->qideal);
   return FALSE;
 }
@@ -4744 +4744 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(v_id,currQuotient,w))
+    if (!idTestHomModule(v_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4851 +4851 @@
 #endif
 
-  if ((currQuotient!=NULL) && !bIsSCA)
+  if ((currRing->qideal!=NULL) && !bIsSCA)
   {
     WerrorS("qring not supported by slimgb at the moment");
@@ -4866 +4866 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(u_id,currQuotient,w))
+    if (!idTestHomModule(u_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4895 +4895 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(v_id,currQuotient,w))
+    if (!idTestHomModule(v_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4906 +4906 @@
     }
   }
-  result=kSba(v_id,currQuotient,hom,&w,1,0);
+  result=kSba(v_id,currRing->qideal,hom,&w,1,0);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -4921 +4921 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(v_id,currQuotient,w))
+    if (!idTestHomModule(v_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4932 +4932 @@
     }
   }
-  result=kSba(v_id,currQuotient,hom,&w,(int)(long)u->Data(),0);
+  result=kSba(v_id,currRing->qideal,hom,&w,(int)(long)u->Data(),0);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -4947 +4947 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(v_id,currQuotient,w))
+    if (!idTestHomModule(v_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4958 +4958 @@
     }
   }
-  result=kSba(v_id,currQuotient,hom,&w,(int)(long)u->Data(),(int)(long)t->Data());
+  result=kSba(v_id,currRing->qideal,hom,&w,(int)(long)u->Data(),(int)(long)t->Data());
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -4973 +4973 @@
   if (w!=NULL)
   {
-    if (!idTestHomModule(v_id,currQuotient,w))
+    if (!idTestHomModule(v_id,currRing->qideal,w))
     {
       WarnS("wrong weights");
@@ -4984 +4984 @@
     }
   }
-  result=kStd(v_id,currQuotient,hom,&w);
+  result=kStd(v_id,currRing->qideal,hom,&w);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -5034 +5034 @@
     add_row_shift=w->min_in();
     (*w)-=add_row_shift;
-    if (idTestHomModule(v_id,currQuotient,w))
+    if (idTestHomModule(v_id,currRing->qideal,w))
       hom=isHomog;
     else
@@ -5196 +5196 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)(long)scMult0Int((ideal)v->Data(),currQuotient);
+  res->data = (char *)(long)scMult0Int((ideal)v->Data(),currRing->qideal);
   return FALSE;
 }
@@ -5908 +5908 @@
     Print("//       performed for generic fibre, that is, over Q\n");
     intvec *module_w=(intvec*)atGet(&uuAsLeftv,"isHomog",INTVEC_CMD);
-    intvec *iv=hFirstSeries(uu,module_w,currQuotient,wdegree);
+    intvec *iv=hFirstSeries(uu,module_w,currRing->qideal,wdegree);
     int returnWithTrue = 1;
     switch((int)(long)v->Data())
@@ -5933 +5933 @@
   assumeStdFlag(u);
   intvec *module_w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
-  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currQuotient,wdegree);
+  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currRing->qideal,wdegree);
   switch((int)(long)v->Data())
   {
@@ -6553 +6553 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(poly)u->Data(),
+  res->data = (char *)kNF((ideal)v->Data(),currRing->qideal,(poly)u->Data(),
     0,(int)(long)w->Data());
   return FALSE;
@@ -6560 +6560 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(ideal)u->Data(),
+  res->data = (char *)kNF((ideal)v->Data(),currRing->qideal,(ideal)u->Data(),
     0,(int)(long)w->Data());
   return FALSE;
@@ -6582 +6582 @@
     {
       l=1;
-      if (!idTestHomModule(u_id,currQuotient,iv))
+      if (!idTestHomModule(u_id,currRing->qideal,iv))
       {
         WarnS("wrong weights");
@@ -6631 +6631 @@
   if (ww!=NULL)
   {
-    if (!idTestHomModule(u_id,currQuotient,ww))
+    if (!idTestHomModule(u_id,currRing->qideal,ww))
     {
       WarnS("wrong weights");
@@ -6643 +6643 @@
   }
   result=kStd(u_id,
-              currQuotient,
+              currRing->qideal,
               hom,
               &ww,                  // module weights
@@ -7759 +7759 @@
   if (ww!=NULL)
   {
-    if (!idTestHomModule(i1,currQuotient,ww))
+    if (!idTestHomModule(i1,currRing->qideal,ww))
     {
       WarnS("wrong weights");
@@ -7774 +7774 @@
   si_opt_1|=Sy_bit(OPT_SB_1);
   result=kStd(i1,
-              currQuotient,
+              currRing->qideal,
               hom,
               &ww,                  // module weights

Singular/ipassign.cc

@@ -471 +471 @@
     res->data=(void*)p;
     jiAssignAttr(res,a);
-    if (TEST_V_QRING && (currQuotient!=NULL) && (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingP(res);
+    if (TEST_V_QRING && (currRing->qideal!=NULL) && (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingP(res);
   }
   else
@@ -643 +643 @@
     setFlag(res,FLAG_STD);
   }
-  if (TEST_V_QRING && (currQuotient!=NULL)&& (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingId(res);
+  if (TEST_V_QRING && (currRing->qideal!=NULL)&& (!hasFlag(res,FLAG_QRING))) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -661 +661 @@
   pNormalize(I->m[0]);
   res->data=(void *)I;
-  if (TEST_V_QRING && (currQuotient!=NULL))
+  if (TEST_V_QRING && (currRing->qideal!=NULL))
   {
     if (hasFlag(a,FLAG_QRING)) setFlag(res,FLAG_QRING);
@@ -677 +677 @@
   id_Normalize((ideal)m, currRing);
   res->data=(void *)m;
-  if (TEST_V_QRING && (currQuotient!=NULL)) jjNormalizeQRingId(res);
+  if (TEST_V_QRING && (currRing->qideal!=NULL)) jjNormalizeQRingId(res);
   return FALSE;
 }
@@ -1172 +1172 @@
   l1->CleanUp();
   r->CleanUp();
-  //if (TEST_V_QRING && (currQuotient!=NULL)) jjNormalizeQRingP(l);
+  //if (TEST_V_QRING && (currRing->qideal!=NULL)) jjNormalizeQRingP(l);
   return FALSE;
 }
@@ -1909 +1909 @@
 void jjNormalizeQRingId(leftv I)
 {
-  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
+  if ((currRing->qideal!=NULL) && (!hasFlag(I,FLAG_QRING)))
   {
     if (I->e==NULL)
@@ -1920 +1920 @@
         {
           ideal F=idInit(1,1);
-          ideal II=kNF(F,currQuotient,I0);
+          ideal II=kNF(F,currRing->qideal,I0);
           idDelete(&F);
           if (I->rtyp!=IDHDL)
@@ -1944 +1944 @@
 void jjNormalizeQRingP(leftv I)
 {
-  if ((currQuotient!=NULL) && (!hasFlag(I,FLAG_QRING)))
+  if ((currRing->qideal!=NULL) && (!hasFlag(I,FLAG_QRING)))
   {
     poly p=(poly)I->Data();
@@ -1950 +1950 @@
     {
       ideal F=idInit(1,1);
-      poly II=kNF(F,currQuotient,p);
+      poly II=kNF(F,currRing->qideal,p);
       idDelete(&F);
       if ((I->rtyp==POLY_CMD)

Singular/ipid.h

@@ -90 +90 @@
 
 /*extern ring     currRing;  in ring.h */
-/*extern ideal      currQuotient; in structs.h */
 
 idhdl enterid(const char * a, int lev, int t, idhdl* root, BOOLEAN init=TRUE, BOOLEAN serach=TRUE);

Singular/ipshell.cc

@@ -1463 +1463 @@
   if (rHasLocalOrMixedOrdering_currRing())
   {
-    scComputeHC(I,currQuotient,ak,po);
+    scComputeHC(I,currRing->qideal,ak,po);
     if (po!=NULL)
     {
@@ -3444 +3444 @@
   #endif
 
-  ideal stdJ = kStd(J,currQuotient,isNotHomog,NULL);
+  ideal stdJ = kStd(J,currRing->qideal,isNotHomog,NULL);
   idSkipZeroes( stdJ );
 
@@ -3511 +3511 @@
   poly hc = (poly)NULL;
 
-  scComputeHC( stdJ,currQuotient, 0,hc );
+  scComputeHC( stdJ,currRing->qideal, 0,hc );
 
   if( hc!=(poly)NULL )
@@ -5555 +5555 @@
     {
       // all dependend stuff is done, clean global vars:
-      if (r->qideal!=NULL)
-      {
-        currQuotient=NULL;
-      }
       if ((currRing->ppNoether)!=NULL) pDelete(&(currRing->ppNoether));
       if (sLastPrinted.RingDependend())

Singular/subexpr.cc

@@ -139 +139 @@
         case MODUL_CMD:
         case IDEAL_CMD:
-          if ((TEST_V_QRING)  &&(currQuotient!=NULL)
+          if ((TEST_V_QRING)  &&(currRing->qideal!=NULL)
           &&(!hasFlag(this,FLAG_QRING)))
           {
@@ -151 +151 @@
         case POLY_CMD:
         case VECTOR_CMD:
-          if ((TEST_V_QRING)  &&(currQuotient!=NULL)
+          if ((TEST_V_QRING)  &&(currRing->qideal!=NULL)
           &&(!hasFlag(this,FLAG_QRING)))
           {

kernel/GBEngine/f5gb.cc

@@ -128 +128 @@
     //Print("%p\n",gPrev->getFirst());
     //pWrite(gPrev->getFirst()->getPoly());
-    poly tempNF =   kNF(gbPrev,currQuotient,f_i);
+    poly tempNF =   kNF(gbPrev,currRing->qideal,f_i);
     f_i         =   tempNF;
     //gPrev->insert(ONE,i,f_i);
@@ -642 +642 @@
             testNode        =   testNode->getNext();
         }
-        poly temp   =   kNF(testId,currQuotient,u1);
+        poly temp   =   kNF(testId,currRing->qideal,u1);
         //pWrite(temp);
         for(i=0;i<IDELEMS(testId);i++) {
@@ -1096 +1096 @@
         //sPolyList->print();
         sPolyList->setFirst(temp->getNext());
-        poly tempNF = kNF(gbPrev,currQuotient,temp->getPoly());
+        poly tempNF = kNF(gbPrev,currRing->qideal,temp->getPoly());
         if(NULL != tempNF) {
             pNorm(tempNF);
@@ -1149 +1149 @@
         //}
         //pWrite(temp->getPoly());
-        //poly tempNF = kNF(gbPrev,currQuotient,temp->getPoly());
+        //poly tempNF = kNF(gbPrev,currRing->qideal,temp->getPoly());
         //Print("!!!\n");
         //if(NULL != tempNF) {
@@ -1758 +1758 @@
                     pNorm(temp);
                     //pWrite(temp);
-                    poly tempNF =   kNF(gbPrev,currQuotient,temp);
+                    poly tempNF =   kNF(gbPrev,currRing->qideal,temp);
                     pNorm(tempNF);
                     if(NULL == tempNF) {
@@ -1962 +1962 @@
     gbPrev->m[0]    =   gPrev->getFirst()->getPoly();
     //idShow(gbPrev);
-    //idShow(currQuotient);
+    //idShow(currRing->qideal);
     for(i=2; i<=IDELEMS(id); i++) {
         LNode* gPrevTag =   gPrev->getLast();

kernel/GBEngine/kstd1.cc

@@ -2654 +2654 @@
     pp = p_KillSquares(pp, m_iFirstAltVar, m_iLastAltVar, currRing);
 
-    if(Q == currQuotient)
+    if(Q == currRing->qideal)
       Q = SCAQuotient(currRing);
   }
@@ -2704 +2704 @@
     pp = id_KillSquares(pp, m_iFirstAltVar, m_iLastAltVar, currRing, false);
 
-    if(Q == currQuotient)
+    if(Q == currRing->qideal)
       Q = SCAQuotient(currRing);
   }
@@ -2770 +2770 @@
     //    tempQ = SCAQuotient(currRing);
 
-    if(Q == currQuotient)
+    if(Q == currRing->qideal)
       tempQ = SCAQuotient(currRing);
   }

kernel/GBEngine/nc.cc

@@ -22 +22 @@
 ideal twostd(ideal I) // works in currRing only!
 {
-  ideal J = kStd(I, currQuotient, testHomog, NULL, NULL, 0, 0, NULL); // in currRing!!!
+  ideal J = kStd(I, currRing->qideal, testHomog, NULL, NULL, 0, 0, NULL); // in currRing!!!
   idSkipZeroes(J); // ring independent!
 
@@ -95 +95 @@
 
 //          if( q != NULL)
-          q = kNF(J, currQuotient, q, 0, KSTD_NF_NONORM); // in currRing!!!
+          q = kNF(J, currRing->qideal, q, 0, KSTD_NF_NONORM); // in currRing!!!
 
 #ifdef PDEBUG
           p_Test(q, currRing);
 #if 0
-          Print("NF(J/currQuotient)=> q: "); // !
+          Print("NF(J/currRing->qideal)=> q: "); // !
           p_Write(q, currRing);
 #endif
@@ -179 +179 @@
     SI_SAVE_OPT1(save1);
     si_opt_1|=Sy_bit(OPT_SB_1); // ring independent
-    J = kStd(id_tmp, currQuotient, testHomog, NULL, NULL, 0, iSize); // J = J + K, J - std // in currRing!
+    J = kStd(id_tmp, currRing->qideal, testHomog, NULL, NULL, 0, iSize); // J = J + K, J - std // in currRing!
     SI_RESTORE_OPT1(save1);
 #else
-    J=kStd(id_tmp, currQuotient,testHomog,NULL,NULL,0,0,NULL);
+    J=kStd(id_tmp, currRing->qideal,testHomog,NULL,NULL,0,0,NULL);
 #endif
 
@@ -258 +258 @@
   int flag, flagcnt=0, syzcnt=0;
   int syzcomp = 0;
-  ideal I = kStd(L, currQuotient,testHomog,NULL,NULL,0,0,NULL);
+  ideal I = kStd(L, currRing->qideal,testHomog,NULL,NULL,0,0,NULL);
   idSkipZeroes(I);
   ideal s_I;
   int idI = idElem(I);
   ideal trickyQuotient;
-  if (currQuotient !=NULL)
-  {
-    trickyQuotient = idSimpleAdd(currQuotient,I);
+  if (currRing->qideal !=NULL)
+  {
+    trickyQuotient = idSimpleAdd(currRing->qideal,I);
   }
   else
@@ -295 +295 @@
     {
       q = pp_Mult_mm(I->m[j],var[i],currRing);
-      q = kNF(I,currQuotient,q,0,0);
+      q = kNF(I,currRing->qideal,q,0,0);
       if (q!=0)
       {
@@ -345 +345 @@
       idDelete(&s_h3);
       Print("...computing Syz");
-      s_h3 = kStd(s_h2, currQuotient,(tHomog)FALSE,NULL,NULL,syzcomp,idI);
+      s_h3 = kStd(s_h2, currRing->qideal,(tHomog)FALSE,NULL,NULL,syzcomp,idI);
       SI_RESTORE_OPT1(save1);
       //idShow(s_h3);
@@ -369 +369 @@
       }
       idTest(s_h3);
-      S[syzcnt]=kStd(s_h3,currQuotient,(tHomog)FALSE,NULL,NULL);
+      S[syzcnt]=kStd(s_h3,currRing->qideal,(tHomog)FALSE,NULL,NULL);
       syzcnt++;
       idDelete(&s_h3);
@@ -408 +408 @@
     }
     Print("final std");
-    res = kStd(res, currQuotient,testHomog,NULL,NULL,0,0,NULL);
+    res = kStd(res, currRing->qideal,testHomog,NULL,NULL,0,0,NULL);
     idSkipZeroes(res);
     return(res);

kernel/GBEngine/sca.cc

@@ -139 +139 @@
   ideal tempQ = Q;
 
-  if(Q == currQuotient)
+  if(Q == currRing->qideal)
     tempQ = SCAQuotient(currRing);
 
@@ -413 +413 @@
   ideal tempQ = Q;
 
-  if(Q == currQuotient)
+  if(Q == currRing->qideal)
     tempQ = SCAQuotient(currRing);
 
@@ -912 +912 @@
   ideal tempQ = Q;
 
-  if(Q == currQuotient)
+  if(Q == currRing->qideal)
     tempQ = SCAQuotient(currRing);
 

kernel/GBEngine/syz.cc

@@ -364 +364 @@
 
   if (syzIndex<1) syzIndex=1;
-  if ((syzIndex==1) && (idHomModule(res[0],currQuotient,&dummy)) && (!rIsPluralRing(currRing)))
+  if ((syzIndex==1) && (idHomModule(res[0],currRing->qideal,&dummy)) && (!rIsPluralRing(currRing)))
   {
     syMinStep1(res,length);
@@ -438 +438 @@
   if ((weights!=NULL) && (*weights!=NULL)&& ((*weights)[0]!=NULL))
   {
-    if (!idTestHomModule(res[0],currQuotient,(*weights)[0]))
+    if (!idTestHomModule(res[0],currRing->qideal,(*weights)[0]))
     {
       WarnS("wrong weights given(1):"); (*weights)[0]->show();PrintLn();
-      idHomModule(res[0],currQuotient,&w);
+      idHomModule(res[0],currRing->qideal,&w);
       w->show();PrintLn();
       *weights=NULL;
@@ -449 +449 @@
   if ((weights==NULL) || (*weights==NULL) || ((*weights)[0]==NULL))
   {
-    hom=(tHomog)idHomModule(res[0],currQuotient,&w);
+    hom=(tHomog)idHomModule(res[0],currRing->qideal,&w);
     if (hom==isHomog)
     {
@@ -523 +523 @@
     if (minim || (syzIndex!=0))
     {
-      temp = kInterRedOld(res[syzIndex],currQuotient);
+      temp = kInterRedOld(res[syzIndex],currRing->qideal);
       idDelete(&res[syzIndex]);
       idSkipZeroes(temp);
@@ -530 +530 @@
     temp = NULL;
 /*--- computing the syzygy modules --------------------------------*/
-    if ((currQuotient==NULL)&&(syzIndex==0)&& (!TEST_OPT_DEGBOUND))
+    if ((currRing->qideal==NULL)&&(syzIndex==0)&& (!TEST_OPT_DEGBOUND))
     {
       res[/*syzIndex+*/1] = idSyzygies(res[0/*syzIndex*/],hom,&w,FALSE,setRegularity,&Kstd1_deg);
@@ -629 +629 @@
 #ifdef HAVE_PLURAL
 
-  const ideal idSaveCurrQuotient = currQuotient;
   const ideal idSaveCurrRingQuotient = currRing->qideal;
 
@@ -642 +641 @@
     if( ncExtensions(TESTSYZSCAMASK) )
     {
-      currQuotient = SCAQuotient(currRing);
-      currRing->qideal = currQuotient;
+      currRing->qideal = SCAQuotient(currRing);
     }
 
@@ -655 +653 @@
   syStrategy result=(syStrategy)omAlloc0(sizeof(ssyStrategy));
 
-  if ((w!=NULL) && (!idTestHomModule(arg,currQuotient,w))) // is this right in SCA case???
+  if ((w!=NULL) && (!idTestHomModule(arg,currRing->qideal,w))) // is this right in SCA case???
   {
     WarnS("wrong weights given(2):");w->show();PrintLn();
-    idHomModule(arg,currQuotient,&w);
+    idHomModule(arg,currRing->qideal,&w);
     w->show();PrintLn();
     w=NULL;
@@ -694 +692 @@
     if( ncExtensions(TESTSYZSCAMASK) )
     {
-      currQuotient     = idSaveCurrQuotient;
       currRing->qideal = idSaveCurrRingQuotient;
     }
@@ -828 +825 @@
   if (weights!=NULL)
   {
-    if (!idTestHomModule(res[0],currQuotient,weights))
+    if (!idTestHomModule(res[0],currRing->qideal,weights))
     {
       WarnS("wrong weights given(3):");weights->show();PrintLn();
-      idHomModule(res[0],currQuotient,&w);
+      idHomModule(res[0],currRing->qideal,&w);
       if (w!=NULL) { w->show();PrintLn();}
       weights=NULL;
@@ -837 +834 @@
   }
 #if 0
-  if (idHomModule(res[0],currQuotient,&w)!=isHomog)
+  if (idHomModule(res[0],currRing->qideal,&w)!=isHomog)
   {
     Warn("betti-command: Input is not homogeneous!");

kernel/GBEngine/syz0.cc

@@ -79 +79 @@
 
   while (((k<wend) && (pGetComp(F[k]) == i)) ||
-         ((currQuotient!=NULL) && (k<regularPairs+IDELEMS(currQuotient))))
+         ((currRing->qideal!=NULL) && (k<regularPairs+IDELEMS(currRing->qideal))))
   {
     p = pOne();
     if ((k<wend) && (pGetComp(F[k]) == i) && (k!=j))
       pLcm(F[j],F[k],p);
-    else if (ii<IDELEMS(currQuotient))
+    else if (ii<IDELEMS(currRing->qideal))
     {
       q = pHead(F[j]);
@@ -93 +93 @@
         pSetm(q);
       }
-      pLcm(q,currQuotient->m[ii],p);
+      pLcm(q,currRing->qideal->m[ii],p);
       if (mW!=NULL)
       {
@@ -472 +472 @@
       pSetExp(p,j,pGetExp(p,j) -pGetExp(mW->m[pGetComp(p)-1],j));
   }
-  while ((p!=NULL) && (i<IDELEMS(currQuotient)))
-  {
-    if (pDivisibleBy(currQuotient->m[i],p))
+  while ((p!=NULL) && (i<IDELEMS(currRing->qideal)))
+  {
+    if (pDivisibleBy(currRing->qideal->m[i],p))
     {
       //pNorm(toNorm);
-      toNorm = ksOldSpolyRed(currQuotient->m[i],toNorm);
+      toNorm = ksOldSpolyRed(currRing->qideal->m[i],toNorm);
       pDelete(&p);
       if (toNorm==NULL) return NULL;
@@ -530 +530 @@
   //for (j=0;j<Fl;j++) pWrite(F[j]);
   //PrintLn();
-  if (currQuotient==NULL)
+  if (currRing->qideal==NULL)
     pairs=(polyset)omAlloc0(Fl*sizeof(poly));
   else
   {
-    gencQ = IDELEMS(currQuotient);
+    gencQ = IDELEMS(currRing->qideal);
     pairs=(polyset)omAlloc0((Fl+gencQ)*sizeof(poly));
   }
@@ -564 +564 @@
     }
     syCreatePairs(F,lini,wend,k,j,i,pairs,Fl,mW);
-    if (currQuotient!=NULL) wend = Fl+gencQ;
+    if (currRing->qideal!=NULL) wend = Fl+gencQ;
     for (k=lini;k<wend;k++)
     {
@@ -593 +593 @@
         {
           syz = pairs[k];
-          syz->coef = nCopy(currQuotient->m[k-Fl]->coef);
+          syz->coef = nCopy(currRing->qideal->m[k-Fl]->coef);
           syz->coef = nNeg(syz->coef);
           lastmonom = syz;
           multWith = pDivide(syz,F[j]);
-          multWith->coef = nCopy(currQuotient->m[k-Fl]->coef);
+          multWith->coef = nCopy(currRing->qideal->m[k-Fl]->coef);
         }
         pSetComp(syz,j+1);
@@ -611 +611 @@
           else
           {
-            PrintS("pair: ");pWrite0(F[j]);PrintS("  ");pWrite(currQuotient->m[k-Fl]);
+            PrintS("pair: ");pWrite0(F[j]);PrintS("  ");pWrite(currRing->qideal->m[k-Fl]);
           }
         }
@@ -646 +646 @@
           if (l<kkk)
           {
-            if ((currQuotient!=NULL) && (isNotReduced))
+            if ((currRing->qideal!=NULL) && (isNotReduced))
             {
               kBucketClear(sy0buck,&toRed,&ltR);
@@ -727 +727 @@
   }
   (*newmodcomp)[Fl+1] = Sl;
-  if (currQuotient==NULL)
+  if (currRing->qideal==NULL)
     omFreeSize((ADDRESS)pairs,Fl*sizeof(poly));
   else
-    omFreeSize((ADDRESS)pairs,(Fl+IDELEMS(currQuotient))*sizeof(poly));
+    omFreeSize((ADDRESS)pairs,(Fl+IDELEMS(currRing->qideal))*sizeof(poly));
   omFreeSize((ADDRESS)Flength,Fl*sizeof(int));
   delete *modcomp;
@@ -1030 +1030 @@
       fr[i] = NULL;
   }
-  if (currQuotient!=NULL)
+  if (currRing->qideal!=NULL)
   {
     for (int i=0; i<rl; i++)
@@ -1036 +1036 @@
       if (result->fullres[i]!=NULL)
       {
-        ideal t=kNF(currQuotient,NULL,result->fullres[i]);
+        ideal t=kNF(currRing->qideal,NULL,result->fullres[i]);
         idDelete(&result->fullres[i]);
         result->fullres[i]=t;

kernel/GBEngine/syz3.cc

@@ -1852 +1852 @@
     if (temp->m[i]!=NULL)
     {
-      new_generators->m[0] = kNF(syzstr->res[0],currQuotient,temp->m[i]);
+      new_generators->m[0] = kNF(syzstr->res[0],currRing->qideal,temp->m[i]);
       if (!nIsOne(pGetCoeff(new_generators->m[0])))
         pNorm(new_generators->m[0]);

kernel/GBEngine/test.cc

@@ -267 +267 @@
 
   {
-    ideal G = kStd(I, currQuotient, testHomog, NULL);
+    ideal G = kStd(I, currRing->qideal, testHomog, NULL);
 
 #ifdef PDEBUG

kernel/GBEngine/units.cc

@@ -34 +34 @@
   }
   ideal M0=idInit(IDELEMS(M),M->rank);
-  ideal M1=kNF(N,currQuotient,M,0,KSTD_NF_ECART);
+  ideal M1=kNF(N,currRing->qideal,M,0,KSTD_NF_ECART);
   while(idElem(M1)>0&&(d==-1||id_MinDegW(M1,w,currRing)<=d))
   {
@@ -47 +47 @@
     }
     idDelete(&M1);
-    M1=kNF(N,currQuotient,M,0,KSTD_NF_ECART);
+    M1=kNF(N,currRing->qideal,M,0,KSTD_NF_ECART);
   }
   idDelete(&M1);

kernel/fglm/fglmhom.cc

@@ -109 +109 @@
 {
     int numelems;
-    intvec * newhilb = hHstdSeries( current, NULL, currQuotient );
+    intvec * newhilb = hHstdSeries( current, NULL, currRing->qideal );
 
     loop
@@ -351 +351 @@
     rChangeCurrRing( sourceRing );
 
-    intvec * hilb = hHstdSeries( sourceIdeal, NULL, currQuotient );
+    intvec * hilb = hHstdSeries( sourceIdeal, NULL, currRing->qideal );
     int s;
     dat.sourceIdeal= sourceIdeal;

kernel/ideals.cc

@@ -68 +68 @@
   }
   #endif
-  homog = idHomModule(h1,currQuotient,&wth);
+  homog = idHomModule(h1,currRing->qideal,&wth);
   if (rHasGlobalOrdering(currRing))
   {
@@ -79 +79 @@
     else
     {
-      ideal re=kMin_std(h1,currQuotient,(tHomog)homog,&wth,h2,NULL,0,3);
+      ideal re=kMin_std(h1,currRing->qideal,(tHomog)homog,&wth,h2,NULL,0,3);
       idDelete(&re);
       return h2;
@@ -91 +91 @@
   pEnlargeSet(&(e->m),IDELEMS(e),15);
   IDELEMS(e) = 16;
-  h2 = kStd(h1,currQuotient,isNotHomog,NULL);
+  h2 = kStd(h1,currRing->qideal,isNotHomog,NULL);
   h3 = idMaxIdeal(1);
   h4=idMult(h2,h3);
   idDelete(&h3);
-  h3=kStd(h4,currQuotient,isNotHomog,NULL);
+  h3=kStd(h4,currRing->qideal,isNotHomog,NULL);
   k = IDELEMS(h3);
   while ((k > 0) && (h3->m[k-1] == NULL)) k--;
@@ -124 +124 @@
   idDelete(&h3);
   idDelete(&h4);
-  if (currQuotient!=NULL)
+  if (currRing->qideal!=NULL)
   {
     h3=idInit(1,e->rank);
-    h2=kNF(h3,currQuotient,e);
+    h2=kNF(h3,currRing->qideal,e);
     idDelete(&h3);
     idDelete(&e);
@@ -236 +236 @@
   if (length==0)
   {
-    if ((currQuotient==NULL)
+    if ((currRing->qideal==NULL)
     && (currRing->OrdSgn==1)
     && (!rIsPluralRing(currRing))
@@ -284 +284 @@
   }
   intvec *w=NULL;
-  temp1 = kStd(temp,currQuotient,testHomog,&w,NULL,length);
+  temp1 = kStd(temp,currRing->qideal,testHomog,&w,NULL,length);
   if (w!=NULL) delete w;
   idDelete(&temp);
@@ -336 +336 @@
   {
      w=NULL;
-     temp1=kStd(result,currQuotient,testHomog,&w);
+     temp1=kStd(result,currRing->qideal,testHomog,&w);
      if (w!=NULL) delete w;
      idDelete(&result);
@@ -342 +342 @@
      return temp1;
   }
-  else //temp1=kInterRed(result,currQuotient);
+  else //temp1=kInterRed(result,currRing->qideal);
     return result;
 }
@@ -424 +424 @@
   }
   /* std computation --------------------------------------------*/
-  tempstd = kStd(bigmat,currQuotient,testHomog,&w,NULL,syzComp);
+  tempstd = kStd(bigmat,currRing->qideal,testHomog,&w,NULL,syzComp);
   if (w!=NULL) delete w;
   idDelete(&bigmat);
@@ -491 +491 @@
   //if (hom==testHomog)
   //{
-  //  if(idHomIdeal(h1,currQuotient))
+  //  if(idHomIdeal(h1,currRing->qideal))
   //  {
   //    hom=TRUE;
@@ -531 +531 @@
 
   Print("Prepare::currQuotient: ");
-  idPrint(currQuotient);
+  idPrint(currRing->qideal);
 #endif
 #endif
@@ -539 +539 @@
   idTest(h2);
 
-  h3 = kStd(h2,currQuotient,hom,w,NULL,syzcomp);
+  h3 = kStd(h2,currRing->qideal,hom,w,NULL,syzcomp);
 
 #if MYTEST
@@ -700 +700 @@
   }
   idTest(s_h3);
-  if (currQuotient != NULL)
-  {
-    ideal ts_h3=kStd(s_h3,currQuotient,h,w);
+  if (currRing->qideal != NULL)
+  {
+    ideal ts_h3=kStd(s_h3,currRing->qideal,h,w);
     idDelete(&s_h3);
     s_h3 = ts_h3;
@@ -1041 +1041 @@
     }
   }
-  ideal s_result = kNF(s_h3,currQuotient,s_temp,k);
+  ideal s_result = kNF(s_h3,currRing->qideal,s_temp,k);
   s_result->rank = s_h3->rank;
   ideal s_rest = idInit(IDELEMS(s_result),k);
@@ -1225 +1225 @@
   if ((k2==0) && (k>1)) *addOnlyOne = FALSE;
   intvec * weights;
-  hom = (tHomog)idHomModule(h1,currQuotient,&weights);
+  hom = (tHomog)idHomModule(h1,currRing->qideal,&weights);
   if /**addOnlyOne &&*/ (/*(*/ !h1IsStb /*)*/)
-    temph1 = kStd(h1,currQuotient,hom,&weights,NULL);
+    temph1 = kStd(h1,currRing->qideal,hom,&weights,NULL);
   else
     temph1 = idCopy(h1);
@@ -1343 +1343 @@
   ideal s_h4 = idInitializeQuot (h1,h2,h1IsStb,&addOnlyOne,&kmax);
 
-  hom = (tHomog)idHomModule(s_h4,currQuotient,&weights1);
+  hom = (tHomog)idHomModule(s_h4,currRing->qideal,&weights1);
 
   ring orig_ring=currRing;
@@ -1363 +1363 @@
   if (addOnlyOne)
   {
-    s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,0/*kmax-1*/,IDELEMS(s_h4)-1);
+    s_h3 = kStd(s_h4,currRing->qideal,hom,&weights1,NULL,0/*kmax-1*/,IDELEMS(s_h4)-1);
   }
   else
   {
-    s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,kmax-1);
+    s_h3 = kStd(s_h4,currRing->qideal,hom,&weights1,NULL,kmax-1);
   }
   SI_RESTORE_OPT1(old_test1);
@@ -1428 +1428 @@
     return idCopy(h1);
   }
-  if ((currQuotient!=NULL) && rIsPluralRing(origR))
+  if ((currRing->qideal!=NULL) && rIsPluralRing(origR))
   {
     WerrorS("cannot eliminate in a qring");
@@ -1698 +1698 @@
           {
             q = p;
-            p = kNF(R,currQuotient,q);
+            p = kNF(R,currRing->qideal,q);
             p_Delete(&q,currRing);
           }
@@ -1762 +1762 @@
         {
           q = p;
-          p = kNF(R,currQuotient,q);
+          p = kNF(R,currRing->qideal,q);
           p_Delete(&q,currRing);
         }
@@ -1834 +1834 @@
     //if (ar>1) // otherwise done in mpMinorToResult
     //{
-    //  matrix bb=(matrix)kNF(R,currQuotient,(ideal)b);
+    //  matrix bb=(matrix)kNF(R,currRing->qideal,(ideal)b);
     //  bb->rank=b->rank; bb->nrows=b->nrows; bb->ncols=b->ncols;
     //  idDelete((ideal*)&b); b=bb;
@@ -1866 +1866 @@
     if (id1->m[i] != NULL)
     {
-      p = kNF(id2,currQuotient,id1->m[i]);
+      p = kNF(id2,currRing->qideal,id1->m[i]);
       if (p != NULL)
       {
@@ -1989 +1989 @@
     s_temp=arg;
 
-  ideal s_temp1 = kStd(s_temp,currQuotient,testHomog,&w,NULL,length);
+  ideal s_temp1 = kStd(s_temp,currRing->qideal,testHomog,&w,NULL,length);
   if (w!=NULL) delete w;
 
@@ -2121 +2121 @@
 
   idTest(s_temp);
-  ideal s_temp1 = kStd(s_temp,currQuotient,hom,&wtmp,NULL,length);
+  ideal s_temp1 = kStd(s_temp,currRing->qideal,hom,&wtmp,NULL,length);
 
   //if (wtmp!=NULL)  Print("output weights:");wtmp->show(1);PrintLn();

kernel/ideals.h

@@ -16 +16 @@
 typedef ideal *            resolvente;
 
-extern ideal currQuotient;
-
-
 inline ideal idCopyFirstK (const ideal ide, const int k, ring R = currRing)
 {

kernel/polys.cc

@@ -11 +11 @@
 
 ring  currRing = NULL;
-ideal currQuotient = NULL;
 
 void rChangeCurrRing(ring r)
@@ -27 +26 @@
     //------------ set global ring vars --------------------------------
     currRing = r;
-    currQuotient = r->qideal;
+    currRing->qideal = r->qideal;
     //------------ global variables related to coefficients ------------
     assume( r->cf!= NULL );
@@ -38 +37 @@
   {
     currRing = NULL;
-    currQuotient = NULL;
+    currRing->qideal = NULL;
   }
 }
@@ -53 +52 @@
   //------------ set global ring vars --------------------------------
   //currRing = r;
-  //currQuotient=NULL;
   if (r != NULL)
   {
     rTest(r);
     //------------ set global ring vars --------------------------------
-    //currQuotient=r->qideal;
 
     //------------ global variables related to coefficients ------------

kernel/test.cc

@@ -378 +378 @@
 
   {
-    ideal G = kStd(I, currQuotient, testHomog, NULL);
+    ideal G = kStd(I, currRing->qideal, testHomog, NULL);
 
 #ifdef PDEBUG

libpolys/polys/matpol.cc

@@ -1423 +1423 @@
       //for (j=c-1;j>=0;j--)
       //{
-      //  if (q1[j]!=NULL) q1[j] = kNF(R,currQuotient,q1[j]);
+      //  if (q1[j]!=NULL) q1[j] = kNF(R,currRing->qideal,q1[j]);
       //}
     }
@@ -1463 +1463 @@
       for (j=c-1;j>=0;j--)
       {
-        if (q1[j]!=NULL) q1[j] = kNF(R,currQuotient,q1[j]);
+        if (q1[j]!=NULL) q1[j] = kNF(R,currRing->qideal,q1[j]);
       }
     }

libpolys/polys/monomials/ring.cc

@@ -4649 +4649 @@
    {
       new_r->qideal = idrCopyR(old_r->qideal, old_r, new_r);
-      //currQuotient = new_r->qideal;
    }