Changeset ad23ba in git


Ignore:
Timestamp:
Oct 26, 2010, 10:32:51 AM (14 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
f7449ff74c2f2331426674adbf6689f8bb8c3e8c
Parents:
2f6c2530ff0c14d62689daf53d8fec72d51fc12e
Message:
code simplifcation

git-svn-id: file:///usr/local/Singular/svn/trunk@13567 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/pInline1.h

    r2f6c253 rad23ba  
    114114  omTypeAllocBin(poly, np, r->PolyBin);
    115115  p_SetRingOfLm(np, r);
    116   p_ExpVectorCopy(np, p, r);
     116  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
    117117  pNext(np) = NULL;
    118118  pSetCoeff0(np, NULL);
    119119  return np;
    120 }
    121 PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r)
    122 {
    123   pAssume1(d_r != NULL);
    124   return p_LmInit(s_p, s_r, d_r, d_r->PolyBin);
    125120}
    126121PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r, omBin d_bin)
     
    141136  return d_p;
    142137}
     138PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r)
     139{
     140  pAssume1(d_r != NULL);
     141  return p_LmInit(s_p, s_r, d_r, d_r->PolyBin);
     142}
    143143PINLINE1 poly p_Head(poly p, const ring r)
    144144{
     
    148148  omTypeAllocBin(poly, np, r->PolyBin);
    149149  p_SetRingOfLm(np, r);
    150   p_ExpVectorCopy(np, p, r);
     150  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
    151151  pNext(np) = NULL;
    152152  pSetCoeff0(np, n_Copy(pGetCoeff(p), r));
     
    163163  omTypeAllocBin(poly, np, r->PolyBin);
    164164  p_SetRingOfLm(np, r);
    165   p_ExpVectorCopy(np, p, r);
     165  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
    166166  pNext(np) = NULL;
    167167  pSetCoeff0(np, n_Init(1, r));
  • kernel/pInline2.h

    r2f6c253 rad23ba  
    370370}
    371371
    372 PINLINE2 unsigned long
    373 p_GetMaxExp(const unsigned long l, const ring r, const int number_of_exps)
     372PINLINE2 unsigned long p_GetMaxExp(const unsigned long l, const ring r)
    374373{
    375374  unsigned long bitmask = r->bitmask;
    376375  unsigned long max = (l & bitmask);
    377   unsigned long j = number_of_exps - 1;
     376  unsigned long j = r->ExpPerLong - 1;
    378377
    379378  if (j > 0)
     
    392391  }
    393392  return max;
    394 }
    395 
    396 PINLINE2 unsigned long p_GetMaxExp(const unsigned long l, const ring r)
    397 {
    398   return p_GetMaxExp(l, r, r->ExpPerLong);
    399393}
    400394
Note: See TracChangeset for help on using the changeset viewer.