Changeset e84421 in git


Ignore:
Timestamp:
Jul 25, 2011, 5:02:43 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
f32381cc5321a6e0dfafe932d999404e0190fd5c
Parents:
e533660f00e4b44288438fadc044c2920f73f40c
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 17:02:43+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:32+01:00
Message:
fix kstdfac.cc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstdfac.cc

    re533660 re84421  
    253253BOOLEAN k_factorize(poly p,ideal &rfac, ideal &fac_copy)
    254254{
    255   int facdeg=pFDeg(p,currRing);
    256   ideal fac=singclap_factorize(pCopy(p),NULL,1);
     255  int facdeg=currRing->pFDeg(p,currRing);
     256  ideal fac=singclap_factorize(pCopy(p),NULL,1,currRing);
    257257  int fac_elems;
    258258#ifndef HAVE_FACTORY
     
    269269  fac_copy=idInit(fac_elems,1);
    270270
    271   if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0],currRing)))
     271  if ((fac_elems!=1)||(facdeg!=currRing->pFDeg(fac->m[0],currRing)))
    272272  {
    273273    if (TEST_OPT_DEBUG)
     
    568568    if (TEST_OPT_DEGBOUND
    569569    && ((strat->honey
    570         && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    571       || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     570        && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     571      || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
    572572    {
    573573      /*
     
    594594    {
    595595      if (TEST_OPT_PROT)
    596         message(strat->P.ecart+pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     596        message(strat->P.ecart+currRing->pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
    597597    }
    598598    else
    599599    {
    600600      if (TEST_OPT_PROT)
    601         message(pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     601        message(currRing->pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
    602602    }
    603603    /* reduction of the element choosen from L */
     
    884884  if (TEST_OPT_WEIGHTM)
    885885  {
    886     pRestoreDegProcs(pFDegOld, pLDegOld);
     886    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
    887887    if (ecartWeights)
    888888    {
     
    907907  ideal_list L=NULL;
    908908
    909   if (rField_has_simple_inverse())
     909  if (rField_has_simple_inverse(currRing))
    910910    strat->LazyPass=20;
    911911  else
    912912    strat->LazyPass=2;
    913913  strat->LazyDegree = 1;
    914   strat->ak = idRankFreeModule(F);
     914  strat->ak = id_RankFreeModule(F,currRing);
    915915  if ((h==testHomog))
    916916  {
     
    929929      kModW = *w;
    930930      strat->kModW = *w;
    931       pFDegOld = pFDeg;
     931      pFDegOld = currRing->pFDeg;
    932932      pLDegOld = pLDeg;
    933       pSetDegProcs(kModDeg);
     933      pSetDegProcs(currRing,kModDeg);
    934934      toReset = TRUE;
    935935    }
     
    10321032  if (toReset)
    10331033  {
    1034     pRestoreDegProcs(pFDegOld, pLDegOld);
     1034    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
    10351035    kModW = NULL;
    10361036  }
Note: See TracChangeset for help on using the changeset viewer.