Changeset b1a5c1 in git

Timestamp:

Jun 20, 2008, 6:54:45 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

f1b9c57f647835474f1c1a7163a27646f2de70b7

Parents:

8049adb6c137bedd3c5725cd5d503326db71e40c

Message:

*hannes: some fixes for mres (sheafcoh_s.tst)


git-svn-id: file:///usr/local/Singular/svn/trunk@10772 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• gring.cc (modified) (48 diffs)
• sca.cc (modified) (33 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.55 2008-06-10 14:35:40 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.56 2008-06-20 16:54:45 Singular Exp $
  *******************************************************************/
 
@@ -29 +29 @@
 #include "prCopy.h"
 #include "p_Mult_q.h"
-
 #include "pInline1.h"
-   
+
 #include "gring.h"
 #include "sca.h"
-
 
 #define MYTEST 0
@@ -106 +104 @@
 {
   poly m = // p_ISet(1, r);
-          p_Init(r); 
+          p_Init(r);
 
   const int pVariables = r->N;
 
-  for (int i = pVariables; i; i--)
+  for (int i = pVariables; i!=0; i--)
   {
     const int lExpA = p_GetExp (a, i, r);
@@ -126 +124 @@
 #endif
 
-  n_New(&(p_GetCoeff(m, r)), r);  
+  n_New(&(p_GetCoeff(m, r)), r);
 
   return(m);
@@ -142 +140 @@
 
   const poly m = p_Lcm(a, b, si_max(lCompP1, lCompP2), r);
-  
+
 #ifdef PDEBUG
 //  p_Test(m,r);
@@ -315 +313 @@
         expOut=expP;
 #ifdef PDEBUG
-    if (side)
+        if (side)
         {
-      Print("gnc_p_Mult_mm: Multiplication in the left module from the right");
-    }
+          Print("gnc_p_Mult_mm: Multiplication in the left module from the right");
+        }
 #endif
       }
@@ -325 +323 @@
         /* REPORT_ERROR */
 #ifdef PDEBUG
-    const char* s;
-    if (side==1) s="gnc_p_Mult_mm";
-    else s="gnc_mm_Mult_p";
-    Print("%s: exponent mismatch %d and %d\n",s,expP,expM);
+        const char* s;
+        if (side==1) s="gnc_p_Mult_mm";
+        else s="gnc_mm_Mult_p";
+        Print("%s: exponent mismatch %d and %d\n",s,expP,expM);
 #endif
         expOut=0;
@@ -479 +477 @@
               nPower(cff,cpower,&tmp_num);
               cff = nMult(totcff,tmp_num);
-          nDelete(&totcff);
+              nDelete(&totcff);
               nDelete(&tmp_num);
               totcff = n_Copy(cff,r);
@@ -1231 +1229 @@
   assume(p_LmDivisibleBy(p1, p2, r));
 
+#ifdef PDEBUG
   if (p_GetComp(p1,r)!=p_GetComp(p2,r)
   && (p_GetComp(p1,r)!=0)
   && (p_GetComp(p2,r)!=0))
   {
-#ifdef PDEBUG
-    Print("nc_ReduceSpolyOld: different components");
-#endif
+    dReportError("nc_ReduceSpolyOld: different components");
     return(NULL);
   }
+#endif
   poly m = pOne();
   p_ExpVectorDiff(m,p2,p1,r);
@@ -1348 +1346 @@
 poly gnc_CreateSpolyOld(poly p1, poly p2/*,poly spNoether*/, const ring r)
 {
+#ifdef PDEBUG
   if ((p_GetComp(p1,r)!=p_GetComp(p2,r))
   && (p_GetComp(p1,r)!=0)
   && (p_GetComp(p2,r)!=0))
   {
-#ifdef PDEBUG
-    Print("gnc_CreateSpolyOld : different components!");
-#endif
+    dReportError("gnc_CreateSpolyOld : different components!");
     return(NULL);
   }
+#endif
   if ((ncRingType(r)==nc_lie) && pHasNotCF(p1,p2)) /* prod crit */
   {
@@ -1442 +1440 @@
 #endif
 #endif
-  
+
   const long lCompP1 = p_GetComp(p1,r);
   const long lCompP2 = p_GetComp(p2,r);
@@ -1460 +1458 @@
   }
 #endif
-  
-  
+
+
 //   if ((r->GetNC()->type==nc_lie) && pHasNotCF(p1,p2)) /* prod crit */
 //   {
@@ -1503 +1501 @@
 #endif
 
-  
+
 //  assume(p_GetComp(m2,r) == 0);
 
 #ifdef PDEBUG
-#if 0  
+#if 0
   if(  (p_GetComp(m2,r) != 0) || (p_GetComp(m1,r) != 0) )
   {
     WarnS("gnc_CreateSpolyNew: wrong monomials!");
-    
-    
+
+
 #ifdef RDEBUG
     PrintS("m1 = "); p_Write(m1, r);
     pDebugPrintR(m1, r);
-    
+
     PrintS("m2 = "); p_Write(m2, r);
     pDebugPrintR(m2, r);
@@ -1529 +1527 @@
     pDebugPrintR(pL, r);
 #endif
-    
-  }
-  
-#endif
-#endif
-  
+
+  }
+
+#endif
+#endif
+
   p_Delete(&pL,r);
 
@@ -1550 +1548 @@
 #endif
 #endif
-  
+
   if(M1 == NULL || M2 == NULL)
   {
@@ -1603 +1601 @@
 
 
-  
+
 #ifdef PDEBUG
   p_Test(M2,r);
@@ -1643 +1641 @@
 //  p_Test(tmp,r);
 //#endif
-  
+
   M1 = nc_mm_Mult_pp(m1, pNext(p1), r);                      // M1 = m1 * tail(p1), delete tmp // ???
 
@@ -1654 +1652 @@
 
 #endif
-  
+
   M2=p_Add_q(M2,M1,r);                           // M2 = spoly(lt(p1), lt(p2)) + m1 * tail(p1), delete M1
 #ifdef PDEBUG
@@ -1673 +1671 @@
 
   M1 = nc_mm_Mult_pp(m2, pNext(p2), r);                      // M1 = m2 * tail(p2), detele tmp
-  
+
 #ifdef PDEBUG
   p_Test(M1,r);
@@ -1691 +1689 @@
   Print("M2: "); pWrite(M2);
 #endif
-  
+
 #endif
                                                  // delete M1
@@ -1773 +1771 @@
     return(NULL);
   }
-  
+
   poly m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);
 
@@ -1782 +1780 @@
 //  p_Test(m,r);
 #endif
-  
+
   return(m);
 }
@@ -1842 +1840 @@
 
   assume( pLmB != NULL );
-  
+
 #ifdef PDEBUG
   pTest(pLmB);
@@ -2100 +2098 @@
   /* returns [p,q], destroys p */
 {
-  
+
   if (!rIsPluralRing(currRing)) return(NULL);
   if (pComparePolys(p,q)) return(NULL);
@@ -2276 +2274 @@
       {
         poly varj = p_ISet(1, currRing);
-        p_SetExp(varj, j, 1, currRing); 
+        p_SetExp(varj, j, 1, currRing);
         p_Setm(varj, currRing);
 
@@ -2297 +2295 @@
         if (q != NULL)
         {
-#ifdef PDEBUG          
+#ifdef PDEBUG
 #if 0
           Print("Reducing q[j = %d]: ", j); // !
@@ -2322 +2320 @@
 #endif
 #endif
-          
+
 //          if( q != NULL)
           q = kNF(J, currQuotient, q, 0, KSTD_NF_NONORM); // in currRing!!!
@@ -2372 +2370 @@
 
     }
-    
+
     if (K == NULL) // nothing new: i.e. all elements are two-sided
       return(J);
@@ -2400 +2398 @@
     int iSize = idElem(J); // ring independent
 
-    // J += K:    
+    // J += K:
     ideal id_tmp = idSimpleAdd(J,K); // in currRing
     id_Delete(&K, currRing); id_Delete(&J, currRing);
@@ -2494 +2492 @@
 }
 
-void ncKill(ring r) 
+void ncKill(ring r)
 // kills the nc extension of ring r
 {
@@ -2554 +2552 @@
 }
 
-// inline 
+// inline
 void nc_rCopy0(ring res, const ring r)
 {
@@ -2562 +2560 @@
   res->GetNC() = r->GetNC();
   res->GetNC()->ref++;
-  nc_p_ProcsSet(res, res->p_Procs);  
+  nc_p_ProcsSet(res, res->p_Procs);
 }
 
@@ -2720 +2718 @@
                       matrix CCC, matrix DDD,
                       poly CCN, poly DDN,
-                      ring r, 
+                      ring r,
                       bool bSetupQuotient, bool bCopyInput, bool bBeQuiet,
                       ring curr)
@@ -2740 +2738 @@
            ( (CCN == NULL) )
           );
-    
+
     assume(
            ( (DDD != NULL) && (MATCOLS(DDD) == 1) && (MATROWS(DDD) == 1) && (MATELEM(DDD,1,1) == NULL) ) ||
            ( (DDN == NULL) )
           );
-           
-
-  }
-
-  
+
+
+  }
+
+
   // there must be:
   assume( (CCC != NULL) != (CCN != NULL) ); // exactly one data about coeffs (C).
   assume( !((DDD != NULL) && (DDN != NULL)) ); // at most one data about tails (D).
-  
+
   ring save = currRing;
 
@@ -2762 +2760 @@
   if( CCC != NULL )
   {
-    PrintS("nc_CallPlural(), Input data, CCC: \n");    
+    PrintS("nc_CallPlural(), Input data, CCC: \n");
     iiWriteMatrix(CCC, "C", 2, 4);
   }
   if( DDD != NULL )
   {
-    PrintS("nc_CallPlural(), Input data, DDD: \n");  
+    PrintS("nc_CallPlural(), Input data, DDD: \n");
     iiWriteMatrix(DDD, "D", 2, 4);
   }
 #endif
 
-  
+
 #ifndef NDEBUG
   idTest((ideal)CCC);
@@ -2782 +2780 @@
   if( (!bBeQuiet) && (r->GetNC() != NULL) )
     WarnS("going to redefine the algebra structure");
-  
+
   if( currRing != r )
     rChangeCurrRing(r);
@@ -2807 +2805 @@
 
   nc_type nctype = nc_undef;
-  
+
   //////////////////////////////////////////////////////////////////
   // check the correctness of arguments, without any real chagnes!!!
 
-  
+
 
   // check C
@@ -2949 +2947 @@
   {
     bool b = true; // DD == null ?
-    
+
     for(int i = 1; (i < r->N) && b; i++)
     for(int j = i+1; (j <= r->N) && b; j++)
@@ -2965 +2963 @@
         nctype = nc_skew;
     }
-    
+
     if( bCopyInput )
     {
@@ -2978 +2976 @@
   assume( C != NULL );
   assume( D != NULL );
-  
+
 #if OUTPUT
   PrintS("nc_CallPlural(), Computed data, C: \n");
@@ -2991 +2989 @@
 
 
-  
+
   // check the ordering condition for D (both matrix and poly cases):
   if ( gnc_CheckOrdCondition(D, r) )
@@ -3122 +3120 @@
   if(bSetupQuotient) // Test me!!!
   {
-    nc_SetupQuotient(r); 
+    nc_SetupQuotient(r);
   }
 
@@ -3161 +3159 @@
   // A bit cleaned up and somewhat rewritten functions...
   rGR->GetNC()->p_Procs.SPoly       = gnc_CreateSpolyNew;
-  rGR->GetNC()->p_Procs.ReduceSPoly = gnc_ReduceSpolyNew; 
+  rGR->GetNC()->p_Procs.ReduceSPoly = gnc_ReduceSpolyNew;
 
   rGR->GetNC()->p_Procs.BucketPolyRed  = gnc_kBucketPolyRedNew;
@@ -3381 +3379 @@
       if (orig_ring != syz_ring)
       {
-    s_h2=idrCopyR_NoSort(h2,orig_ring);
-    //  s_trickyQuotient=idrCopyR_NoSort(trickyQuotient,orig_ring);
-    //  rDebugPrint(syz_ring);
-    s_I=idrCopyR_NoSort(I,orig_ring);
+        s_h2=idrCopyR_NoSort(h2,orig_ring);
+        //  s_trickyQuotient=idrCopyR_NoSort(trickyQuotient,orig_ring);
+        //  rDebugPrint(syz_ring);
+        s_I=idrCopyR_NoSort(I,orig_ring);
       }
       else
       {
-    s_h2 = h2;
-    s_I  = I;
-    //  s_trickyQuotient=trickyQuotient;
+        s_h2 = h2;
+        s_I  = I;
+        //  s_trickyQuotient=trickyQuotient;
       }
       idTest(s_h2);
@@ -3408 +3406 @@
       if (orig_ring != syz_ring)
       {
-    idDelete(&s_h2);
-    for (j=0; j<IDELEMS(s_h3); j++)
-    {
-      if (s_h3->m[j] != NULL)
-      {
-        if (p_MinComp(s_h3->m[j],syz_ring) > syzcomp) /* i.e. it is a syzygy */
-          pShift(&s_h3->m[j], -syzcomp);
-        else
-          pDelete(&s_h3->m[j]);
-      }
-    }
-    idSkipZeroes(s_h3);
-    s_h3->rank -= syzcomp;
-    rChangeCurrRing(orig_ring);
-    //  s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
-    s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
-    rKill(syz_ring);
+        idDelete(&s_h2);
+        for (j=0; j<IDELEMS(s_h3); j++)
+        {
+          if (s_h3->m[j] != NULL)
+          {
+            if (p_MinComp(s_h3->m[j],syz_ring) > syzcomp) /* i.e. it is a syzygy */
+              pShift(&s_h3->m[j], -syzcomp);
+            else
+              pDelete(&s_h3->m[j]);
+          }
+        }
+        idSkipZeroes(s_h3);
+        s_h3->rank -= syzcomp;
+        rChangeCurrRing(orig_ring);
+        //  s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
+        s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
+        rKill(syz_ring);
       }
       idTest(s_h3);
@@ -3456 +3454 @@
       for (j=0; j< idElem(I); j++)
       {
-    q = pCopy(MATELEM(MI,j+1,i));
-    if (q!=NULL)
-    {
-      q = pMult(q,pCopy(I->m[j]));
-      p = pAdd(p,q);
-    }
+        q = pCopy(MATELEM(MI,j+1,i));
+        if (q!=NULL)
+        {
+          q = pMult(q,pCopy(I->m[j]));
+          p = pAdd(p,q);
+        }
       }
       res->m[i-1]=p;
@@ -3492 +3490 @@
   if (nc_CallPlural(C, D, NULL, NULL, r)) // TODO: what about quotient ideal?
     WarnS("Error initializing multiplication!"); // No reaction!???
-  
+
   return r;
 }
@@ -3617 +3615 @@
 {
   // currently only super-commutative extension deals with factors.
-  if( bUseExtensions ) 
+  if( bUseExtensions )
     return sca_SetupQuotient(rGR, rG);
-  
-  return false;    
+
+  return false;
 }
 

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.18 2008-06-20 12:28:17 Singular Exp $
+ *  Version: $Id: sca.cc,v 1.19 2008-06-20 16:54:45 Singular Exp $
  *******************************************************************/
 
@@ -388 +388 @@
       if(iComponentMonomM==0 )
       {
-        WarnS("sca_p_Mult_mm: Multiplication in the left module from the right");
+        dReportError("sca_p_Mult_mm: Multiplication in the left module from the right");
       }
 #endif
@@ -470 +470 @@
       if(iComponentMonomM==0 )
       {
-        WarnS("sca_pp_Mult_mm: Multiplication in the left module from the right");
+        dReportError("sca_pp_Mult_mm: Multiplication in the left module from the right");
       }
 #endif
@@ -580 +580 @@
       if(iComponent==0 )
       {
-        WarnS("sca_mm_Mult_pp: Multiplication in the left module from the right!");
+        dReportError("sca_mm_Mult_pp: Multiplication in the left module from the right!");
 //        PrintS("mm = "); p_Write(pMonom, rRing);
 //        PrintS("pp = "); p_Write(pPoly, rRing);
-//        assume(iComponent!=0);        
+//        assume(iComponent!=0);
       }
 #endif
@@ -644 +644 @@
     if( iComponentMonomM!=0 )
     {
-      if( iComponent!=0 ) 
+      if( iComponent!=0 )
       {
         // REPORT_ERROR
@@ -656 +656 @@
       if(iComponent==0)
       {
-        WarnS("sca_mm_Mult_p: Multiplication in the left module from the right!");
+        dReportError("sca_mm_Mult_p: Multiplication in the left module from the right!");
 //        PrintS("mm = "); p_Write(pMonom, rRing);
 //        PrintS("p = "); p_Write(pPoly, rRing);
-//        assume(iComponent!=0);        
+//        assume(iComponent!=0);
       }
 #endif
@@ -725 +725 @@
   {
 #ifdef PDEBUG
-    Print("sca_SPoly: different non-zero components!\n");
+    dReportError("sca_SPoly: different non-zero components!\n");
 #endif
     return(NULL);
@@ -815 +815 @@
   {
 #ifdef PDEBUG
-    Print("sca_ReduceSpoly: different non-zero components!");
+    dReportError("sca_ReduceSpoly: different non-zero components!");
 #endif
     return(NULL);
@@ -921 +921 @@
     }
 
+#ifdef KDEBUG
     if (TEST_OPT_DEBUG)
     {
@@ -927 +928 @@
       PrintLn();
     }
+#endif
 
     enterpairs(h.p, strat->sl, h.ecart, 0, strat);
@@ -978 +980 @@
 
   PrintS("F: \n");
-  idPrint(F);  
-  PrintS("Q: \n");  
+  idPrint(F);
+  PrintS("Q: \n");
   idPrint(Q);
 #endif
 #endif
 
-  
+
   const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
   const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
@@ -1044 +1046 @@
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
 
+#ifdef KDEBUG
     if (TEST_OPT_DEBUG) messageSets(strat);
+#endif
 
     if (strat->Ll== 0) strat->interpt=TRUE;
@@ -1071 +1075 @@
     if(strat->P.IsNull()) continue;
 
-    
+
     if( pNext(strat->P.p) == strat->tail )
     {
@@ -1180 +1184 @@
 
 
+#ifdef KDEBUG
   if (TEST_OPT_DEBUG) messageSets(strat);
+#endif
 
   /* release temp data-------------------------------- */
@@ -1239 +1245 @@
   // checks...
   //////////////////////////////////////////////////////////////////////////
-  if( rG == NULL ) 
+  if( rG == NULL )
     rG = rGR;
 
@@ -1245 +1251 @@
   assume(rG  != NULL);
   assume(rIsPluralRing(rG));
-  
+
 
 #if MYTEST
@@ -1256 +1262 @@
     return false;
 
-  
+
 //  if( (ncRingType(rG) != nc_skew) || (ncRingType(rG) != nc_comm) )
 //    return false;
@@ -1270 +1276 @@
   PrintS("sca_SetupQuotient: qideal!!!\n");
 #endif
-  
+
   if((rG->qideal != NULL) && (rG != rGR) ) // we cannot change from factor to factor at the time, sorry!
     return false;
@@ -1284 +1290 @@
   PrintS("sca_SetupQuotient: AltVars?!\n");
 #endif
-  
+
   for(int i = 1; i < N; i++)
   {
@@ -1319 +1325 @@
 #endif
 
-  
+
   if( (iAltVarEnd == -1) || (iAltVarStart == (N+1)) )
     return false; // either no alternating varables, or a single one => we are in commutative case!
 
-  
+
   for(int i = 1; i < N; i++)
   {
@@ -1384 +1390 @@
   }
 
-  
+
   assume(rGR->qideal != NULL);
 //  assume(rG->qideal == NULL); // ?
@@ -1396 +1402 @@
 #endif
 
-  
+
   // check for
   // y_{iAltVarStart}^2, y_{iAltVarStart+1}^2, \ldots, y_{iAltVarEnd}^2  (iAltVarEnd > iAltVarStart)
@@ -1435 +1441 @@
 #endif
 #endif
-  
+
 
   //////////////////////////////////////////////////////////////////////////
@@ -1466 +1472 @@
   assume(rIsPluralRing(rGR));
   assume(!rIsSCA(rGR));
-  
+
   const int N = rGR->N;
 
@@ -1476 +1482 @@
   const ideal idQuotient = rGR->qideal;
 
-  
+
   ideal tempQ = idQuotient;
 
   if( b <= N && e >= 1 )
-    tempQ = id_KillSquares(idQuotient, b, e, rGR); 
+    tempQ = id_KillSquares(idQuotient, b, e, rGR);
 
   idSkipZeroes( tempQ );
@@ -1488 +1494 @@
   else
     rGR->GetNC()->SCAQuotient() = tempQ;
-  
+
   ncRingType( rGR, nc_exterior );
 
@@ -1499 +1505 @@
   if(rSaveRing != rGR)
     rChangeCurrRing(rSaveRing);
-  
+
   return true;
-  
+
 }
 
@@ -1658 +1664 @@
 
       strat->P.p = nc_CreateSpoly(strat->P.p1, strat->P.p2, currRing);
+      if (strat->P.p!=NULL) strat->initEcart(&strat->P);
     }//    else
 
 
     if(strat->P.IsNull()) continue;
-    
+
     if (strat->P.p1 == NULL)
     {
@@ -1764 +1771 @@
       {
         assume(p_GetExp(pSave, i, currRing) == 1);
-
-        const poly pNew = sca_pp_Mult_xi_pp(i, pNext, currRing);
-
-#ifdef PDEBUG
-        p_Test(pNew, currRing);
-#endif
-
-        if( pNew == NULL) continue;
-
-        LObject h(pNew); // h = x_i * strat->P
-
-        if (TEST_OPT_INTSTRATEGY)
+        if (pNext!=NULL)
         {
-//           h.pCleardenom(); // also does a pContent
-          pContent(h.p);
+          const poly pNew = sca_pp_Mult_xi_pp(i, pNext, currRing);
+
+#ifdef PDEBUG
+          p_Test(pNew, currRing);
+#endif
+
+          if( pNew == NULL) continue;
+
+          LObject h(pNew); // h = x_i * strat->P
+
+          if (TEST_OPT_INTSTRATEGY)
+          {
+//            h.pCleardenom(); // also does a pContent
+            pContent(h.p);
+          }
+          else
+          {
+            h.pNorm();
+          }
+
+          strat->initEcart(&h);
+          h.sev = pGetShortExpVector(h.p);
+
+          int pos;
+          if (strat->Ll==-1)
+            pos =0;
+          else
+            pos = strat->posInL(strat->L,strat->Ll,&h,strat);
+
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
+/*
+          h.sev = pGetShortExpVector(h.p);
+          strat->initEcart(&h);
+
+          h.PrepareRed(strat->use_buckets);
+
+          // reduction of the element choosen from L(?)
+          red_result = strat->red(&h,strat);
+
+          // reduction to non-zero new poly
+          if (red_result != 1) continue;
+
+
+          int pos = posInS(strat,strat->sl,h.p,h.ecart);
+
+          // reduce the tail and normalize poly
+          if (TEST_OPT_INTSTRATEGY)
+          {
+            h.pCleardenom();
+            if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+            {
+              h.p = redtailBba(&(h),pos-1,strat, withT); // !!!
+              h.pCleardenom();
+            }
+          }
+          else
+          {
+            h.pNorm();
+            if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+              h.p = redtailBba(&(h),pos-1,strat, withT);
+          }
+
+#ifdef KDEBUG
+          if (TEST_OPT_DEBUG){PrintS(" N:");h.wrp();PrintLn();}
+#endif
+
+//          h.PrepareRed(strat->use_buckets); // ???
+
+          h.sev = pGetShortExpVector(h.p);
+          strat->initEcart(&h);
+
+          if (strat->Ll==-1)
+            pos = 0;
+          else
+            pos = strat->posInL(strat->L,strat->Ll,&h,strat);
+
+           enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);*/
+
         }
-        else
-        {
-          h.pNorm();
-        }
-
-        strat->initEcart(&h);
-        h.sev = pGetShortExpVector(h.p);
-
-        int pos;
-
-        if (strat->Ll==-1)
-          pos =0;
-        else
-          pos = strat->posInL(strat->L,strat->Ll,&h,strat);
-
-        enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
-
-
-/*
-        h.sev = pGetShortExpVector(h.p);
-        strat->initEcart(&h);
-
-        h.PrepareRed(strat->use_buckets);
-
-        // reduction of the element choosen from L(?)
-        red_result = strat->red(&h,strat);
-
-        // reduction to non-zero new poly
-        if (red_result != 1) continue;
-
-
-        int pos = posInS(strat,strat->sl,h.p,h.ecart);
-
-        // reduce the tail and normalize poly
-        if (TEST_OPT_INTSTRATEGY)
-        {
-          h.pCleardenom();
-          if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-          {
-            h.p = redtailBba(&(h),pos-1,strat, withT); // !!!
-            h.pCleardenom();
-          }
-        }
-        else
-        {
-
-          h.pNorm();
-          if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-            h.p = redtailBba(&(h),pos-1,strat, withT);
-        }
-
-
-  #ifdef KDEBUG
-        if (TEST_OPT_DEBUG){PrintS(" N:");h.wrp();PrintLn();}
-  #endif
-
-//         h.PrepareRed(strat->use_buckets); // ???
-
-        h.sev = pGetShortExpVector(h.p);
-        strat->initEcart(&h);
-
-        if (strat->Ll==-1)
-          pos = 0;
-        else
-          pos = strat->posInL(strat->L,strat->Ll,&h,strat);
-
-         enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);*/
-
       } // for all x_i \in Ann(lm(P))
-
-
-
-
-
     } // if red(P) != NULL
 
@@ -1896 +1895 @@
 
 //   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
-
 //    PrintS("</sca>\n");
 
@@ -2031 +2029 @@
     if (lrmax< strat->Ll) lrmax=strat->Ll; /*stat*/
     //test_int_std(strat->kIdeal);
+#ifdef KDEBUG
     if (TEST_OPT_DEBUG) messageSets(strat);
+#endif
     if (TEST_OPT_DEGBOUND
     && (strat->L[strat->Ll].ecart+strat->L[strat->Ll].GetpFDeg()> Kstd1_deg))
@@ -2070 +2070 @@
       strat->P.p = nc_CreateSpoly(strat->P.p1, strat->P.p2, currRing);
     }
-    
-    
+
+
 
     if (strat->P.p1 == NULL)
@@ -2550 +2550 @@
 
   assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
-  
+
   const int iSize = id->idelems();