Changeset 7415540 in git


Ignore:
Timestamp:
Feb 21, 2013, 12:26:31 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
920c7843408442a9b01c7736f0c717a03afefb10
Parents:
507427e9e0bf212d166ab8f3bb970f562784a172
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-21 12:26:31+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-21 12:29:30+01:00
Message:
Cosmetic p_DegW/iv2array-related changes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r507427 r7415540  
    18941894  int d=-1;
    18951895  int i;
    1896   for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)pDegW(I->m[i],iv));
    1897   omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
     1896  for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)p_DegW(I->m[i],iv,currRing));
     1897  omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
    18981898  res->data = (char *)((long)d);
    18991899  return FALSE;
     
    19051905  {
    19061906    short *iv=iv2array((intvec *)v->Data(),currRing);
    1907     int d=(int)pDegW(p,iv);
    1908     omFreeSize((ADDRESS)iv,(currRing->N+1)*sizeof(short));
    1909     res->data = (char *)(long(d));
     1907    const long d = p_DegW(p,iv,currRing);
     1908    omFreeSize( (ADDRESS)iv, (rVar(currRing)+1)*sizeof(short) );
     1909    res->data = (char *)(d);
    19101910  }
    19111911  else
     
    59915991  short *iw=iv2array((intvec *)w->Data(),currRing);
    59925992  res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
    5993   omFreeSize((ADDRESS)iw,(currRing->N+1)*sizeof(short));
     5993  omFreeSize( (ADDRESS)iw, (rVar(currRing)+1)*sizeof(short) );
    59945994  return FALSE;
    59955995}
     
    67436743  if(v4!=NULL)
    67446744  {
    6745     w=iv2array((intvec *)v4->Data(),currRing);
    6746     short *w0=w+1;
    6747     int i=currRing->N;
    6748     while(i>0&&*w0>0)
     6745    w = iv2array((intvec *)v4->Data(),currRing);
     6746    short * w0 = w + 1;
     6747    int i = currRing->N;
     6748    while( (i > 0) && ((*w0) > 0) )
    67496749    {
    67506750      w0++;
     
    67626762  w2.CleanUp();
    67636763  if(w!=NULL)
    6764     omFree(w);
     6764    omFreeSize( (ADDRESS)w, (rVar(currRing)+1)*sizeof(short) );
    67656765
    67666766  lists L=(lists) omAllocBin(slists_bin);
  • kernel/ideals.cc

    r507427 r7415540  
    11421142      N=si_max(N,p_Deg(Q->m[i],currRing));
    11431143    else
    1144       N=si_max(N,pDegW(Q->m[i],w));
     1144      N=si_max(N,p_DegW(Q->m[i],w,currRing));
    11451145  N+=n;
    11461146
     
    11671167          p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
    11681168        pNormalize(p);
    1169         if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(pDegW(p0,w)>n)))
     1169        if(((w==NULL)&&(p_Deg(p0,currRing)>n))||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
    11701170          p_Delete(&p0,currRing);
    11711171        else
     
    11811181          pNext(p0)=NULL;
    11821182          if(((w==NULL)&&(p_Deg(p0,currRing)>n))
    1183           ||((w!=NULL)&&(pDegW(p0,w)>n)))
     1183          ||((w!=NULL)&&(p_DegW(p0,w,currRing)>n)))
    11841184            p_Delete(&p0,currRing);
    11851185          else
  • kernel/polys.h

    r507427 r7415540  
    342342// maximum weigthed degree of all monomials of p, w is indexed from
    343343// 1..pVariables
     344
     345/// Deprecated: only for compatibility with older code!
    344346#define    pDegW(p,w) p_DegW(p,w,currRing)
    345347
Note: See TracChangeset for help on using the changeset viewer.