Changeset 47f985 in git

Timestamp:

Aug 3, 2011, 6:58:36 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

7e53d9acff21e67d7a47d268428d8f4f7825e91b

Parents:

2a38d905f7089590329433f35ad43c3aaf5fd122

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 18:58:36+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:21+01:00

Message:

FIX: kBucketCreate needs a ring!
CHG: minor bucket-related fixes

Location:

kernel

Files:

• f5gb.cc (modified) (1 diff)
• syz0.cc (modified) (6 diffs)
• syz1.cc (modified) (3 diffs)
• syz2.cc (modified) (1 diff)
• syz3.cc (modified) (1 diff)

kernel/f5gb.cc

@@ -1213 +1213 @@
     //while(NULL != tempMon) {
         // iteration over all monomials in tempMon
-        kBucket* bucket  =   kBucketCreate();
+        kBucket* bucket  =   kBucketCreate(currRing);
         kBucketInit(bucket,tempPoly,0);
         tempPoly    =   kBucketGetLm(bucket);

kernel/syz0.cc

@@ -25 +25 @@
 #include <polys/kbuckets.h>
 #include <polys/prCopy.h>
-
-static kBucket_pt sy0buck;
 
 static void syInitSort(ideal arg,intvec **modcomp)
@@ -506 +504 @@
 static ideal sySchreyersSyzygiesFB(ideal arg,intvec ** modcomp,ideal mW,BOOLEAN redTail=TRUE)
 {
+  kBucket_pt sy0buck = kBucketCreate(currRing);
+
   int Fl=IDELEMS(arg);
   while ((Fl!=0) && (arg->m[Fl-1]==NULL)) Fl--;
@@ -666 +666 @@
               omFreeSize((ADDRESS)pairs,(Fl + gencQ)*sizeof(poly));
               for(k=0;k<IDELEMS(result);k++) pDelete(&((*Shdl)[k]));
+               
+              kBucketDestroy(&(sy0buck));
               return result;
             }
@@ -731 +733 @@
   delete *modcomp;
   *modcomp = newmodcomp;
+   
+  kBucketDestroy(&(sy0buck));
   return result;
 }
@@ -876 +880 @@
   resolvente res = (resolvente)omAlloc0(4*sizeof(ideal)),newres;
   res[0] = idCopy(arg);
+
   while ((!idIs0(res[syzIndex])) && ((maxlength==-1) || (syzIndex<maxlength)))
   {
     i = IDELEMS(res[syzIndex]);
     //while ((i!=0) && (!res[syzIndex]->m[i-1])) i--;
-    sy0buck = kBucketCreate();
     if (syzIndex+1==*length)
     {
@@ -938 +942 @@
     syzIndex++;
     if (TEST_OPT_PROT) Print("[%d]\n",syzIndex);
-    kBucketDestroy(&(sy0buck));
   }
   //syPrintResolution(res,1,*length);

kernel/syz1.cc

@@ -2348 +2348 @@
   rChangeCurrRing(syzstr->syRing);
 //Print("laeufts ");
-  syzstr->bucket = kBucketCreate();
+  syzstr->bucket = kBucketCreate(syzstr->syRing);
   for (index=syzstr->length-1;index>0;index--)
   {
@@ -2506 +2506 @@
   syzstr->Firstelem = (int**)omAlloc0((*length+1)*sizeof(int*));
   syzstr->sev = (unsigned long **) omAlloc0((*length+1)*sizeof(unsigned long *));
-  syzstr->bucket = kBucketCreate();
+  syzstr->bucket = kBucketCreate(currRing);
   int len0=id_RankFreeModule(temp,currRing)+1;
 
@@ -2654 +2654 @@
   assume( syzstr->length == maxlength );
 
-  syzstr->bucket = kBucketCreate();
+  syzstr->bucket = kBucketCreate(currRing);
   int len0=id_RankFreeModule(temp,currRing)+1;
 

kernel/syz2.cc

@@ -1025 +1025 @@
   syzstr->hilb_coeffs = (intvec**)omAlloc0((*length+1)*sizeof(intvec*));
   syzstr->sev = (unsigned long **)omAlloc0((*length+1)*sizeof(unsigned long*));
-  syzstr->bucket = kBucketCreate();
-  syzstr->syz_bucket = kBucketCreate();
+  syzstr->bucket = kBucketCreate(currRing);
+  syzstr->syz_bucket = kBucketCreate(currRing);
   startdeg = actdeg;
   nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);

kernel/syz3.cc

@@ -1829 +1829 @@
   resolvente totake=(resolvente)omAlloc0((*length+1)*sizeof(ideal));
   syzstr->Tl = new intvec(*length+1);
-  syzstr->bucket = kBucketCreate();
-  syzstr->syz_bucket = kBucketCreate();
+  syzstr->bucket = kBucketCreate(currRing);
+  syzstr->syz_bucket = kBucketCreate(currRing);
   ideal new_generators=idInit(1,si_max(rk_arg,1));
   ideal temp_gens,old_std;