Changeset 3d3ab7 in git for kernel

Timestamp:

Jul 7, 2015, 1:48:23 PM (9 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

41aecf0b6da407ff436939ad6d3daa64856a3da0

Parents:

6d11d24961ab342e357f6f0a5ffaea867ce8d7a3

Message:

cleaned: enterOnePairRing

File:

• kernel/GBEngine/kutil.cc (modified) (15 diffs)

kernel/GBEngine/kutil.cc

@@ -1172 +1172 @@
     int      l,j,compare,compareCoeff;
     LObject  Lp;
-  omTestMemory(1);
     if (strat->interred_flag) return;
   #ifdef KDEBUG
@@ -1199 +1198 @@
         return;
     }
-    omTestMemory(1);
     // basic product criterion
     pLcm(p,strat->S[i],Lp.lcm);
@@ -1224 +1222 @@
     }
     assume(!strat->fromT);
-    omTestMemory(1);
     /*
     *the set B collects the pairs of type (S[j],p)
@@ -1319 +1316 @@
       }
     }
-    omTestMemory(1);
     /*
     *the pair (S[i],p) enters B if the spoly != 0
@@ -1346 +1342 @@
       Lp.p = ksCreateShortSpoly(strat->S[i], p, strat->tailRing);
     }
-    omTestMemory(1);
     if (Lp.p == NULL)
     {
@@ -1370 +1365 @@
       */
       pLmDelete(Lp.lcm);
-      printf("\nsdkjhggh\n");
     }
     else
@@ -1385 +1379 @@
         Lp.i_r1 = strat->S_2_R[i];
       }
-      omTestMemory(1);
       strat->initEcartPair(&Lp,strat->S[i],p,strat->ecartS[i],ecart);
-      omTestMemory(1);
       l = strat->posInL(strat->L,strat->Ll,&Lp,strat);
-      omTestMemory(1);
       enterL(&strat->L,&strat->Ll,&strat->Lmax,Lp,l);
-      omTestMemory(1);
-      printf("\nJust printed and retuirned:\n");
     }
   #else
-  number s, t;
   assume(i<=strat->sl);
   assume(atR >= 0);
@@ -1415 +1403 @@
       return;
   }
+  //This is commented out since it is buggy over ZZ 
+  //(check theory with Gerhard, Anne and Christian)
   #if 0
   // basic chain criterion
@@ -1425 +1415 @@
   *if the leading term of r devides lcm(s,p) then (s,p) will not enter B
   */
-  #if 0
+  
+  #if ADIDEBUG
   idPrint(strat->Shdl);
   for(int ii=0; ii<=strat->Ll; ii++)
@@ -1432 +1423 @@
   {printf("\nB[%i]\n",ii);pWrite(strat->B[ii].p);pWrite(strat->B[ii].p1);pWrite(strat->B[ii].p2);pWrite(strat->B[ii].lcm);}
   #endif
+  
   for(j = strat->Bl;j>=0;j--)
   {
@@ -1508 +1500 @@
   }
   #endif
+  number s, t;
   poly m1, m2, gcd;
-  //#if 1
   #if ADIDEBUG
   printf("\nTrying to add spair S[%i] und p\n",i);pWrite(strat->S[i]);pWrite(p);
@@ -1525 +1517 @@
   poly pm1 = pp_Mult_mm(pNext(p), m1, strat->tailRing);
   poly sim2 = pp_Mult_mm(pNext(si), m2, strat->tailRing);
+  pDelete(&si);
   if(sim2 == NULL)
   {
     if(pm1 == NULL)
     {
+      pDelete(&sim2);
+      pDelete(&pm1);
+      pDelete(&gcd);
+      pDelete(&m1);
+      pDelete(&m2);
       return;
     }
@@ -1534 +1532 @@
     {
       gcd = pCopy(pm1);
+      pDelete(&pm1);
+      pDelete(&sim2);
+      pDelete(&m1);
+      pDelete(&m2);
     }
   }
@@ -1564 +1566 @@
   int posx;
   h.pCleardenom();
-  //printf("\nThis is our new achieved polynomial:\n");pWrite(gcd);
   if(h.p == NULL)
     return;
   pSetm(h.p);
-  //#if 1
   #if ADIDEBUG
   printf("\nThis is afterwards:\n");
@@ -1594 +1594 @@
     h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
   #if ADIDEBUG
-  printf("\nThis s-poly was added to L:\n");pWrite(h.p);pWrite(h.p1);pWrite(h.p2);printf("\ni_r1 = %i, i_r2 = %i\n",h.i_r1, h.i_r2);pWrite(strat->T[h.i_r1].p);pWrite(strat->T[h.i_r2].p);
+  printf("\nThis s-poly was added to B:\n");pWrite(h.p);pWrite(h.p1);pWrite(h.p2);printf("\ni_r1 = %i, i_r2 = %i\n",h.i_r1, h.i_r2);pWrite(strat->T[h.i_r1].p);pWrite(strat->T[h.i_r2].p);
   #endif
   enterL(&strat->B,&strat->Bl,&strat->Bmax,h,posx);
-  #if 0
-  for(int i=0; i<=strat->Bl; i++)
-  {
-    printf("\n    B[%i]\n",i);
-    p_Write(strat->B[i].p, strat->B[i].tailRing);
-    p_Write(strat->B[i].p1, strat->B[i].tailRing);
-    p_Write(strat->B[i].p2, strat->B[i].tailRing);
-  }
-  #endif
   kTest_TS(strat);
 }