Changeset 47f985 in git


Ignore:
Timestamp:
Aug 3, 2011, 6:58:36 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
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:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/f5gb.cc

    r2a38d90 r47f985  
    12131213    //while(NULL != tempMon) {
    12141214        // iteration over all monomials in tempMon
    1215         kBucket* bucket  =   kBucketCreate();
     1215        kBucket* bucket  =   kBucketCreate(currRing);
    12161216        kBucketInit(bucket,tempPoly,0);
    12171217        tempPoly    =   kBucketGetLm(bucket);
  • kernel/syz0.cc

    r2a38d90 r47f985  
    2525#include <polys/kbuckets.h>
    2626#include <polys/prCopy.h>
    27 
    28 static kBucket_pt sy0buck;
    2927
    3028static void syInitSort(ideal arg,intvec **modcomp)
     
    506504static ideal sySchreyersSyzygiesFB(ideal arg,intvec ** modcomp,ideal mW,BOOLEAN redTail=TRUE)
    507505{
     506  kBucket_pt sy0buck = kBucketCreate(currRing);
     507
    508508  int Fl=IDELEMS(arg);
    509509  while ((Fl!=0) && (arg->m[Fl-1]==NULL)) Fl--;
     
    666666              omFreeSize((ADDRESS)pairs,(Fl + gencQ)*sizeof(poly));
    667667              for(k=0;k<IDELEMS(result);k++) pDelete(&((*Shdl)[k]));
     668               
     669              kBucketDestroy(&(sy0buck));
    668670              return result;
    669671            }
     
    731733  delete *modcomp;
    732734  *modcomp = newmodcomp;
     735   
     736  kBucketDestroy(&(sy0buck));
    733737  return result;
    734738}
     
    876880  resolvente res = (resolvente)omAlloc0(4*sizeof(ideal)),newres;
    877881  res[0] = idCopy(arg);
     882
    878883  while ((!idIs0(res[syzIndex])) && ((maxlength==-1) || (syzIndex<maxlength)))
    879884  {
    880885    i = IDELEMS(res[syzIndex]);
    881886    //while ((i!=0) && (!res[syzIndex]->m[i-1])) i--;
    882     sy0buck = kBucketCreate();
    883887    if (syzIndex+1==*length)
    884888    {
     
    938942    syzIndex++;
    939943    if (TEST_OPT_PROT) Print("[%d]\n",syzIndex);
    940     kBucketDestroy(&(sy0buck));
    941944  }
    942945  //syPrintResolution(res,1,*length);
  • kernel/syz1.cc

    r2a38d90 r47f985  
    23482348  rChangeCurrRing(syzstr->syRing);
    23492349//Print("laeufts ");
    2350   syzstr->bucket = kBucketCreate();
     2350  syzstr->bucket = kBucketCreate(syzstr->syRing);
    23512351  for (index=syzstr->length-1;index>0;index--)
    23522352  {
     
    25062506  syzstr->Firstelem = (int**)omAlloc0((*length+1)*sizeof(int*));
    25072507  syzstr->sev = (unsigned long **) omAlloc0((*length+1)*sizeof(unsigned long *));
    2508   syzstr->bucket = kBucketCreate();
     2508  syzstr->bucket = kBucketCreate(currRing);
    25092509  int len0=id_RankFreeModule(temp,currRing)+1;
    25102510
     
    26542654  assume( syzstr->length == maxlength );
    26552655
    2656   syzstr->bucket = kBucketCreate();
     2656  syzstr->bucket = kBucketCreate(currRing);
    26572657  int len0=id_RankFreeModule(temp,currRing)+1;
    26582658
  • kernel/syz2.cc

    r2a38d90 r47f985  
    10251025  syzstr->hilb_coeffs = (intvec**)omAlloc0((*length+1)*sizeof(intvec*));
    10261026  syzstr->sev = (unsigned long **)omAlloc0((*length+1)*sizeof(unsigned long*));
    1027   syzstr->bucket = kBucketCreate();
    1028   syzstr->syz_bucket = kBucketCreate();
     1027  syzstr->bucket = kBucketCreate(currRing);
     1028  syzstr->syz_bucket = kBucketCreate(currRing);
    10291029  startdeg = actdeg;
    10301030  nextPairs = syChosePairs(syzstr,&index,&howmuch,&actdeg);
  • kernel/syz3.cc

    r2a38d90 r47f985  
    18291829  resolvente totake=(resolvente)omAlloc0((*length+1)*sizeof(ideal));
    18301830  syzstr->Tl = new intvec(*length+1);
    1831   syzstr->bucket = kBucketCreate();
    1832   syzstr->syz_bucket = kBucketCreate();
     1831  syzstr->bucket = kBucketCreate(currRing);
     1832  syzstr->syz_bucket = kBucketCreate(currRing);
    18331833  ideal new_generators=idInit(1,si_max(rk_arg,1));
    18341834  ideal temp_gens,old_std;
Note: See TracChangeset for help on using the changeset viewer.