Changeset aef70f7 in git


Ignore:
Timestamp:
Jul 25, 2011, 5:14:27 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
327d4171334ba3ac4cad34df7614be19f13910af
Parents:
f32381cc5321a6e0dfafe932d999404e0190fd5c
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 17:14:27+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:32+01:00
Message:
fixes related to pLDeg
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/kstd1.cc

    rf32381c raef70f7  
    499499  int z = 10;
    500500  int o = H.SetpFDeg();
    501   H.ecart = pLDeg(H.p,&H.length,currRing)-o;
     501  H.ecart = currRing->pLDeg(H.p,&H.length,currRing)-o;
    502502  if ((flag & 2) == 0) cancelunit(&H,TRUE);
    503503  H.sev = pGetShortExpVector(H.p);
    … …  
    578578      o = H.SetpFDeg();
    579579      if ((flag &2 ) == 0) cancelunit(&H,TRUE);
    580       H.ecart = pLDeg(H.p,&(H.length),currRing)-o;
     580      H.ecart = currRing->pLDeg(H.p,&(H.length),currRing)-o;
    581581      j = 0;
    582582      H.sev = pGetShortExpVector(H.p);
    … …  
    11651165//    }
    11661166//  }
    1167   kOptimizeLDeg(pLDeg, strat);
     1167  kOptimizeLDeg(currRing->pLDeg, strat);
    11681168}
    11691169
    … …  
    17461746    strat->kHomW=kHomW=vw;
    17471747    pFDegOld = currRing->pFDeg;
    1748     pLDegOld = pLDeg;
     1748    pLDegOld = currRing->pLDeg;
    17491749    pSetDegProcs(currRing,kHomModDeg);
    17501750    toReset = TRUE;
    … …  
    17711771      {
    17721772        pFDegOld = currRing->pFDeg;
    1773         pLDegOld = pLDeg;
     1773        pLDegOld = currRing->pLDeg;
    17741774        pSetDegProcs(currRing,kModDeg);
    17751775        toReset = TRUE;
    … …  
    18681868    strat->kHomW=kHomW=vw;
    18691869    pFDegOld = currRing->pFDeg;
    1870     pLDegOld = pLDeg;
     1870    pLDegOld = currRing->pLDeg;
    18711871    pSetDegProcs(currRing,kHomModDeg);
    18721872    toReset = TRUE;
    … …  
    18931893      {
    18941894        pFDegOld = currRing->pFDeg;
    1895         pLDegOld = pLDeg;
     1895        pLDegOld = currRing->pLDeg;
    18961896        pSetDegProcs(currRing,kModDeg);
    18971897        toReset = TRUE;
    … …  
    19921992      kModW = *w;
    19931993      strat->kModW = *w;
    1994       assume(pFDeg != NULL && pLDeg != NULL);
     1994      assume(currRing->pFDeg != NULL && currRing->pLDeg != NULL);
    19951995      pFDegOld = currRing->pFDeg;
    1996       pLDegOld = pLDeg;
     1996      pLDegOld = currRing->pLDeg;
    19971997      pSetDegProcs(currRing,kModDeg);
    19981998
    … …  
    23032303      strat->kModW = kModW = w;
    23042304      pFDegOld = currRing->pFDeg;
    2305       pLDegOld = pLDeg;
     2305      pLDegOld = currRing->pLDeg;
    23062306      pSetDegProcs(currRing,kModDeg);
    23072307      toReset = TRUE;

  • kernel/kstdfac.cc

    rf32381c raef70f7  
    930930      strat->kModW = *w;
    931931      pFDegOld = currRing->pFDeg;
    932       pLDegOld = pLDeg;
     932      pLDegOld = currRing->pLDeg;
    933933      pSetDegProcs(currRing,kModDeg);
    934934      toReset = TRUE;

  • kernel/kutil.cc

    rf32381c raef70f7  
    53105310  if (maxIndex >= 0)
    53115311  {
    5312     e = pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
     5312    e = currRing->pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
    53135313    do
    53145314    {
    … …  
    53275327        // pDelete(&h);
    53285328        if (h == NULL) return NULL;
    5329         e = pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
     5329        e = currRing->pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
    53305330        j = 0;
    53315331        not_sev = ~ pGetShortExpVector(h);
    … …  
    64886488#endif
    64896489  pOrigFDeg = currRing->pFDeg;
    6490   pOrigLDeg = pLDeg;
     6490  pOrigLDeg = currRing->pLDeg;
    64916491}
    64926492
Note: See TracChangeset for help on using the changeset viewer.