Changeset 1558d5 in git


Ignore:
Timestamp:
Jul 25, 2011, 6:45:32 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
b7cfaff1d9a4ec8364a64a54d2b7e009f91418e2
Parents:
7b25fe96bd4a8e5c88b73cb0561e3b39b26d1981
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 18:45:32+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:34+01:00
Message:
fix gr_kstd2.cc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/gr_kstd2.cc

    r7b25fe r1558d5  
    5656  int j = 0;
    5757
    58   d = pFDeg((*h).p,currRing)+(*h).ecart;
     58  d = currRing->pFDeg((*h).p,currRing)+(*h).ecart;
    5959  reddeg = strat->LazyDegree+d;
    6060  loop
    … …  
    106106      if (TEST_OPT_INTSTRATEGY)
    107107      {
    108         if (rField_is_Zp_a()) p_Content(h->p,currRing);
     108        if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    109109        else h->pCleardenom();// also does a p_Content
    110110      }
    111111      /*computes the ecart*/
    112       d = pLDeg((*h).p,&((*h).length),currRing);
    113       (*h).FDeg=pFDeg((*h).p,currRing);
     112      d = currRing->pLDeg((*h).p,&((*h).length),currRing);
     113      (*h).FDeg=currRing->pFDeg((*h).p,currRing);
    114114      (*h).ecart = d-(*h).FDeg; /*pFDeg((*h).p);*/
    115115      if ((strat->syzComp!=0) && !strat->honey)
    … …  
    232232
    233233  ratGB_divide_out((*h).p);
    234   d = pFDeg((*h).p,currRing)+(*h).ecart;
     234  d = currRing->pFDeg((*h).p,currRing)+(*h).ecart;
    235235  reddeg = strat->LazyDegree+d;
    236236  if (!TEST_OPT_INTSTRATEGY)
    237237  {
    238     if (rField_is_Zp_a()) p_Content(h->p,currRing);
     238    if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    239239    else h->pCleardenom();// also does a pContentRat
    240240  }
    … …  
    273273        if (!TEST_OPT_INTSTRATEGY)
    274274        {
    275           if (rField_is_Zp_a()) p_Content(h->p,currRing);
     275          if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    276276          else h->pCleardenom();// also does a p_Content
    277277        }
    … …  
    291291        }
    292292        ratGB_divide_out((*h).p);
    293         d = pLDeg((*h).p,&((*h).length),currRing);
    294         (*h).FDeg=pFDeg((*h).p,currRing);
     293        d = currRing->pLDeg((*h).p,&((*h).length),currRing);
     294        (*h).FDeg=currRing->pFDeg((*h).p,currRing);
    295295        (*h).ecart = d-(*h).FDeg; /*pFDeg((*h).p);*/
    296296        /*- try to reduce the s-polynomial again -*/
    … …  
    323323        currRing->real_var_start,currRing->real_var_end))
    324324    {
    325       int a_e=(p_Totaldegree(strat->S[j],currRing)-pFDeg(strat->S[j],currRing));
     325      int a_e=(p_Totaldegree(strat->S[j],currRing)-currRing->pFDeg(strat->S[j],currRing));
    326326#ifdef KDEBUG
    327327      if(TEST_OPT_DEBUG)
    … …  
    472472        if (TEST_OPT_INTSTRATEGY)
    473473        {
    474           if (rField_is_Zp_a()) p_Content(h->p,currRing);
     474          if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    475475          else h->pCleardenom();// also does a pContent
    476476        }
    … …  
    496496        if (TEST_OPT_INTSTRATEGY)
    497497        {
    498           if (rField_is_Zp_a()) p_Content(h->p,currRing);
     498          if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    499499          else h->pCleardenom();// also does a p_Content
    500500        }
    … …  
    525525  int j = 0;
    526526  int pass = 0;
    527   int reddeg = pFDeg((*h).p,currRing);
     527  int reddeg = currRing->pFDeg((*h).p,currRing);
    528528
    529529  if (TEST_OPT_DEBUG)
    … …  
    578578      /*- try to reduce the s-polynomial -*/
    579579      pass++;
    580       d = pFDeg((*h).p,currRing);
     580      d = currRing->pFDeg((*h).p,currRing);
    581581      if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
    582582      {
    … …  
    616616        if (TEST_OPT_INTSTRATEGY)
    617617        {
    618           if (rField_is_Zp_a()) p_Content(h->p,currRing);
     618          if (rField_is_Zp_a(currRing)) p_Content(h->p,currRing);
    619619          else h->pCleardenom();// also does a p_Content
    620620        }
    … …  
    644644
    645645  pass = j = 0;
    646   d = reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
     646  d = reddeg = currRing->pFDeg((*h).p,currRing)+(*h).ecart;
    647647  if (TEST_OPT_DEBUG)
    648648  {
    … …  
    737737      /* compute the ecart */
    738738      if (ei <= (*h).ecart)
    739         (*h).ecart = d-pFDeg((*h).p,currRing);
     739        (*h).ecart = d-currRing->pFDeg((*h).p,currRing);
    740740      else
    741         (*h).ecart = d-pFDeg((*h).p,currRing)+ei-(*h).ecart;
     741        (*h).ecart = d-currRing->pFDeg((*h).p,currRing)+ei-(*h).ecart;
    742742//      if (strat->syzComp)
    743743//      {
    … …  
    759759      */
    760760      pass++;
    761       d = pFDeg((*h).p,currRing)+(*h).ecart;
     761      d = currRing->pFDeg((*h).p,currRing)+(*h).ecart;
    762762      if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
    763763      {
    … …  
    825825
    826826  if (strat->honey)
    827     reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
     827    reddeg = currRing->pFDeg((*h).p,currRing)+(*h).ecart;
    828828  else
    829     reddeg = pFDeg((*h).p,currRing);
     829    reddeg = currRing->pFDeg((*h).p,currRing);
    830830  loop
    831831  {
    … …  
    924924      {
    925925        pass++;
    926         d = pFDeg((*h).p,currRing);
     926        d = currRing->pFDeg((*h).p,currRing);
    927927        if (strat->honey)
    928928          d += (*h).ecart;
    … …  
    10171017//  {
    10181018//     //interred  machen   Aenderung
    1019 //     pFDegOld=pFDeg;
    1020 //     pLDegOld=pLDeg;
     1019//     pFDegOld=currRing->pFDeg;
     1020//     pLDegOld=currRing->pLDeg;
    10211021//  //   h=ggetid("ecart");
    10221022//  //   if ((h!=NULL) && (IDTYP(h)==INTVEC_CMD))
    … …  
    10301030//      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
    10311031//    }
    1032 //    pFDeg=totaldegreeWecart;
    1033 //    pLDeg=maxdegreeWecart;
     1032//    currRing->pFDeg=totaldegreeWecart;
     1033//    currRing->pLDeg=maxdegreeWecart;
    10341034//    for(i=1; i<=(currRing->N); i++)
    10351035//      Print(" %d",ecartWeights[i]);
    … …  
    10961096    if (TEST_OPT_DEGBOUND
    10971097    && ((strat->honey
    1098     && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1099        || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     1098    && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1099       || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
    11001100    {
    11011101      /*
    … …  
    12771277  /* release temp data-------------------------------- */
    12781278  exitBuchMora(strat);
    1279   if (TEST_OPT_WEIGHTM)
    1280   {
    1281     pFDeg=pFDegOld;
    1282     pLDeg=pLDegOld;
    1283     if (ecartWeights)
    1284     {
    1285       omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
    1286       ecartWeights=NULL;
    1287     }
    1288   }
     1279//  if (TEST_OPT_WEIGHTM)
     1280//  {
     1281//    currRing->pFDeg=pFDegOld;
     1282//    currRing->pLDeg=pLDegOld;
     1283//    if (ecartWeights)
     1284//    {
     1285//      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
     1286//      ecartWeights=NULL;
     1287//    }
     1288//  }
    12891289  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
    12901290  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
Note: See TracChangeset for help on using the changeset viewer.