Changeset 9b3ad3 in git

Timestamp:

May 8, 2013, 6:02:54 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

31e974b5248d027aefd2b1f1898b085e9f9e9cbb

Parents:

47fff556be2c2414e0228fdd969a7369db9d35fd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-05-08 18:02:54+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-05-10 10:24:01+02:00

Message:

fix: tr. #490 (missing kMergeBintoL in enterpairsSpecial)

from master

Files:

• Tst/Short/bug_ring_quot.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_ring_quot.stat (modified) (1 diff)
• Tst/Short/bug_ring_quot.tst (modified) (1 diff)
• kernel/kutil.cc (modified) (25 diffs)

Tst/Short/bug_ring_quot.res.gz.uu

@@ -1 +1 @@
 begin 644 bug_ring_quot.res.gz
-M'XL("`L5,E```V)U9U]R:6YG7W%U;W0N<F5S`$6006O#,`R%[_D5C]*#0XW;
-M=$NZ$N+#V,4PMK'T5DI(%Q,,P>T<A[;^]7-*YUPD(7T2[ZG<O8D/``G'NWC%
-MS/:6=>HXRZ/R,5ES^&:EM+(DSJ,Q@W,<A[8R2K?5[W"R3,L+ZVUMP]831ZB?
-M&99+7,Q)MY#:2O.IY5>M3'F6/ZKN`I<RC!?Q72A/M=)0<J4WZF+:G"<]&8=J
-M9-U!%-G5+6Z.WN/"3<B&H[<-$5YNM4\.1>K'F?/U^E`\X,"^<(P.E!=&!$W_
-<5U8!V$Y.DA6[_V)T.O0DB?-Y]`?V^;]]00$`````
+M'XL("/1VBE$``V)U9U]R:6YG7W%U;W0N<F5S`(V1P6Z#,`R&[SR%U>T`:I8V
+M%.@J1`[3+DAK-XW=*H3HR%`D!ET(*O#T"ZP-[6T7Q[$_1_\?1Q_/X0X`"(67
+M\`EFLI:XX(>9;T3GCDU!%1-><FE:OC&<0"D<FCP1O,R3GZ:2N&0G7,M4ZJD5
+M!9T[&!8+.(FJS(&5DHG7DKVE7$1']LG30G,NAN%%>`^XHG(FD-FB#O46RHZ3
+M'H\"SUA:0!AX;3_O>C3&>3\A:PJUS,Q0R4WV)`Y<U?9ZE=MQ<(8U^TAA<,"5
+M,#-$[G]&-I,WLAR]28'A#IS-4M?)Q<NMF1LK1'WM=Y4U!8-=L&\1B9&*73P!
+M*PUL@R_!V-_%M*T)<:[T[]#VHK_M'EK-N%>"/3SE:SRN=EA<4YO$\N^-7SVD
+&:3H0`@``
 `
 end

Tst/Short/bug_ring_quot.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1345459467:3150:3-1-5:ix86-Linux:mamawutz:180296
-1 >> tst_memory_1 :: 1345459467:3150:3-1-5:ix86-Linux:mamawutz:2239256
-1 >> tst_memory_2 :: 1345459467:3150:3-1-5:ix86-Linux:mamawutz:2272040
-1 >> tst_timer_1 :: 1345459467:3150:3-1-5:ix86-Linux:mamawutz:2
+1 >> tst_memory_0 :: 1368028916:3160:3-1-6:ix86-Linux:mamawutz:156912
+1 >> tst_memory_1 :: 1368028916:3160:3-1-6:ix86-Linux:mamawutz:2214676
+1 >> tst_memory_2 :: 1368028916:3160:3-1-6:ix86-Linux:mamawutz:2255648
+1 >> tst_timer_1 :: 1368028916:3160:3-1-6:ix86-Linux:mamawutz:2

Tst/Short/bug_ring_quot.tst

@@ -8 +8 @@
 quotient(I,5);
 
+// tr. # 490
+ring RR=integer,(x,y),dp;
+module N=[x,1],[x,y];
+module M=freemodule(2);
+quotient(N,M);
+
+
 tst_status(1);$

kernel/kutil.cc

@@ -1194 +1194 @@
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
     compareCoeff = n_DivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm), currRing->cf);
-    if (compareCoeff == pDivComp_EQUAL || compare == compareCoeff)
+    if ((compareCoeff == pDivComp_EQUAL) || (compare == compareCoeff))
     {
       if (compare == 1)
@@ -1282 +1282 @@
   */
   /*-  compute the short s-polynomial -*/
-  if ((strat->S[i]==NULL) || (p==NULL)) {
+  if ((strat->S[i]==NULL) || (p==NULL))
+  {
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)
@@ -1785 +1786 @@
   sSigMult = currRing->p_Procs->pp_Mult_mm(sSigMult,m2,currRing);
   sSigMultNegSev = ~p_GetShortExpVector(sSigMult,currRing);
-  
+
   pDelete (&m1);
   pDelete (&m2);
@@ -1796 +1797 @@
   Print("----------------\n");
 #endif
-  // testing by syzCrit = F5 Criterion 
+  // testing by syzCrit = F5 Criterion
   // testing by rewCrit1 = Rewritten Criterion
   if  ( strat->syzCrit(pSigMult,pSigMultNegSev,strat) ||
-        strat->syzCrit(sSigMult,sSigMultNegSev,strat) 
+        strat->syzCrit(sSigMult,sSigMultNegSev,strat)
         || strat->rewCrit1(sSigMult,sSigMultNegSev,strat,i+1)
       )
@@ -1813 +1814 @@
   // to S right after this critical pair creation.
   // NOTE: this even holds if the 2nd generator gives the bigger signature
-  //       moreover, this improves rewCriterion, 
+  //       moreover, this improves rewCriterion,
   //       i.e. strat->checked > strat->from if and only if the 2nd generator
-  //       gives the bigger signature. 
+  //       gives the bigger signature.
   Lp.checked = strat->sl+1;
   int sigCmp = p_LmCmp(pSigMult,sSigMult,currRing);
@@ -1839 +1840 @@
 
   // store from which element this pair comes from for further tests
-  Lp.from = strat->sl+1;    
+  Lp.from = strat->sl+1;
   if(sigCmp==currRing->OrdSgn)
   {
@@ -2865 +2866 @@
   for (j=strat->Ll; j>=0; j--)
   {
-    if (strat->L[j].lcm != NULL && n_DivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(p), currRing->cf))
+    if ((strat->L[j].lcm != NULL) && n_DivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(p), currRing->cf))
     {
       if (pCompareChain(p,strat->L[j].p1,strat->L[j].p2,strat->L[j].lcm))
@@ -3399 +3400 @@
 //      if (((unsigned long) pGetCoeff(h) % (unsigned long) pGetCoeff(strat->S[j]) != 0) &&
 //         ((unsigned long) pGetCoeff(strat->S[j]) % (unsigned long) pGetCoeff(h) != 0))
-      if ( iCompH == pGetComp(strat->S[j]) )
+      if ((iCompH == pGetComp(strat->S[j]))
+      || (0 == pGetComp(strat->S[j])))
       {
         enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR);
@@ -3626 +3628 @@
       }
     }
+    kMergeBintoL(strat);
   }
   else
-#endif  
+#endif
   for (j=0; j<=k; j++)
   {
@@ -4498 +4501 @@
 
 /*2
-* 
+*
 * is only used in F5C, must ensure that the interreduction process does add new
 * critical pairs to strat->L only behind all other critical pairs which are
@@ -5096 +5099 @@
     }
 
-    if (strat->P.GetLmCurrRing() != NULL && strat->L[strat->Ll].GetLmCurrRing() != NULL)
+    if ((strat->P.GetLmCurrRing() != NULL)
+    && (strat->L[strat->Ll].GetLmCurrRing() != NULL))
     {
       if (pLmCmp(strat->P.GetLmCurrRing(),strat->L[strat->Ll].GetLmCurrRing()) == -1)
@@ -5852 +5856 @@
       //p_SetCoeff(h.sig,nInit(1),currRing);
       p_SetComp(h.sig,i+1,currRing);
-      // if we are working with the Schreyer order we generate it 
+      // if we are working with the Schreyer order we generate it
       // by multiplying the initial signatures with the leading monomial
       // of the corresponding initial polynomials generating the ideal
-      // => we can keep the underlying monomial order and get a Schreyer 
+      // => we can keep the underlying monomial order and get a Schreyer
       //    order without any bigger overhead
       if (!strat->incremental)
       {
-        p_ExpVectorAdd (h.sig,F->m[i],currRing);  
+        p_ExpVectorAdd (h.sig,F->m[i],currRing);
       }
       h.sevSig = pGetShortExpVector(h.sig);
@@ -5902 +5906 @@
           // add LM(F->m[i]) to the signature to get a Schreyer order
           // without changing the underlying polynomial ring at all
-          p_ExpVectorAdd (strat->syz[ctr],F->m[i],currRing);  
+          p_ExpVectorAdd (strat->syz[ctr],F->m[i],currRing);
           // since p_Add_q() destroys all input
-          // data we need to recreate help 
+          // data we need to recreate help
           // each time
           poly help = pCopy(F->m[i]);
@@ -5951 +5955 @@
     {
       if (pGetComp(strat->sig[i-1]) != pGetComp(strat->sig[i]))
-      { 
+      {
         ps += i;
       }
@@ -5966 +5970 @@
     printf("------------- GENERATING SYZ RULES NEW ---------------\n");
 #endif
-    i = 1; 
+    i = 1;
     j = 0;
     /************************************************************
@@ -7049 +7053 @@
   }
 
-  if (strat->tailBin != NULL && (pNext(p.p) != NULL))
+  if ((strat->tailBin != NULL) && (pNext(p.p) != NULL))
   {
     pNext(p.p)=p_ShallowCopyDelete(pNext(p.p),
@@ -7100 +7104 @@
   while (cc>-1)
   {
-    if (p_LmShortDivisibleBy( strat->syz[strat->syzl-1], strat->sevSyz[strat->syzl-1], 
+    if (p_LmShortDivisibleBy( strat->syz[strat->syzl-1], strat->sevSyz[strat->syzl-1],
                               strat->L[cc].sig, ~strat->L[cc].sevSig, currRing))
     {
@@ -7928 +7932 @@
   poly p2_max = (strat->R[L->i_r2])->max;
 
-  if ((p1_max != NULL && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
-      (p2_max != NULL && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
+  if (((p1_max != NULL) && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
+      ((p2_max != NULL) && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
   {
     p_LmFree(m1, strat->tailRing);
@@ -7955 +7959 @@
   poly p2_max = (strat->R[strat->S_2_R[atS]])->max;
 
-  if ((p1_max != NULL && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
-      (p2_max != NULL && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
+  if (((p1_max != NULL) && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
+      ((p2_max != NULL) && !p_LmExpVectorAddIsOk(m2, p2_max, strat->tailRing)))
   {
     return FALSE;
@@ -8015 +8019 @@
       strat->L[i].ShallowCopyDelete(new_tailRing, p_shallow_copy_delete);
   }
-  if (strat->P.t_p != NULL ||
-      (strat->P.p != NULL && pNext(strat->P.p) != strat->tail))
+  if ((strat->P.t_p != NULL) ||
+      ((strat->P.p != NULL) && pNext(strat->P.p) != strat->tail))
     strat->P.ShallowCopyDelete(new_tailRing, p_shallow_copy_delete);
 
-  if (L != NULL && L->tailRing != new_tailRing)
+  if ((L != NULL) && (L->tailRing != new_tailRing))
   {
     if (L->i_r < 0)
@@ -8035 +8039 @@
   }
 
-  if (T != NULL && T->tailRing != new_tailRing && T->i_r < 0)
+  if ((T != NULL) && (T->tailRing != new_tailRing && T->i_r < 0))
     T->ShallowCopyDelete(new_tailRing, new_tailBin, p_shallow_copy_delete);
 
@@ -8140 +8144 @@
     return (res);
   }
-  
+
   // not incremental => use Schreyer order
   // this is done by a trick when initializing the signatures
   // in initSLSba():
   // Instead of using the signature 1e_i for F->m[i], we start
-  // with the signature LM(F->m[i])e_i for F->m[i]. Doing this we get a 
+  // with the signature LM(F->m[i])e_i for F->m[i]. Doing this we get a
   // Schreyer order w.r.t. the underlying monomial order.
   // => we do not need to change the underlying polynomial ring at all!
@@ -8246 +8250 @@
   }
   */
-  
+
   assume(FALSE);
   return(NULL);
@@ -8553 +8557 @@
     if(TEST_OPT_DEGBOUND)
       Print(" degBound: %d\n", Kstd1_deg);
-   
+
     if( ecartWeights != NULL )
-    { 
-       PrintS("ecartWeights: "); 
+    {
+       PrintS("ecartWeights: ");
        for (int i = rVar(currRing); i > 0; i--)
          Print("%hd ", ecartWeights[i]);
@@ -8562 +8566 @@
        assume( TEST_OPT_WEIGHTM );
     }
-     
+
 #ifndef NDEBUG
     rDebugPrint(currRing);