Changeset 0b5e3d in git for kernel


Ignore:
Timestamp:
Mar 23, 2010, 6:21:51 PM (14 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
283d86b527147bf837a6040685999a8c1f187996
Parents:
ed5c8d1e2dbab67d9d30ee55afe96866951bb06e
Message:
Exponent_t removed

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

Legend:

Unmodified
Added
Removed
  • kernel/ideals.cc

    red5c8d r0b5e3d  
    28322832  ring origR;
    28332833  sip_sring tmpR;
    2834   Exponent_t bound;
     2834  long bound;
    28352835
    28362836  if((ar<=0) || (ar>r) || (ar>c))
  • kernel/kInline.cc

    red5c8d r0b5e3d  
    936936
    937937  int i;
    938   Exponent_t x;
     938  long x;
    939939  m1 = p_Init(m_r);
    940940  m2 = p_Init(m_r);
     
    979979
    980980  int i;
    981   Exponent_t x;
    982   Exponent_t e1;
    983   Exponent_t e2;
    984   Exponent_t s;
     981  long x;
     982  long e1;
     983  long e2;
     984  long s;
    985985  m1 = p_Init(tailRing);
    986986  m2 = p_Init(tailRing);
  • kernel/kbuckets.cc

    red5c8d r0b5e3d  
    10131013// Hmm... for now I'm too lazy to implement those independent of currRing
    10141014// But better declare it extern than including polys.h
    1015 extern void pTakeOutComp(poly *p, Exponent_t comp, poly *q, int *lq);
    1016 void pDecrOrdTakeOutComp(poly *p, Exponent_t comp, long order,
     1015extern void pTakeOutComp(poly *p, long comp, poly *q, int *lq);
     1016void pDecrOrdTakeOutComp(poly *p, long comp, long order,
    10171017                         poly *q, int *lq);
    10181018
    10191019void kBucketTakeOutComp(kBucket_pt bucket,
    1020                         Exponent_t comp,
     1020                        long comp,
    10211021                        poly *r_p, int *l)
    10221022{
     
    10531053
    10541054void kBucketDecrOrdTakeOutComp(kBucket_pt bucket,
    1055                                Exponent_t comp, long order,
     1055                               long comp, long order,
    10561056                               poly *r_p, int *l)
    10571057{
  • kernel/kbuckets.h

    red5c8d r0b5e3d  
    9797
    9898void kBucketTakeOutComp(kBucket_pt bucket,
    99                         Exponent_t comp,
     99                        long comp,
    100100                        poly *p, int *l);
    101101
     
    105105//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
    106106void kBucketDecrOrdTakeOutComp(kBucket_pt bucket,
    107                                Exponent_t comp, long order,
     107                               long comp, long order,
    108108                               poly *p, int *l);
    109109
  • kernel/kspoly.cc

    red5c8d r0b5e3d  
    403403{
    404404  poly a1 = pNext(p1), a2 = pNext(p2);
    405   Exponent_t c1=p_GetComp(p1, currRing),c2=p_GetComp(p2, currRing);
    406   Exponent_t c;
     405  long c1=p_GetComp(p1, currRing),c2=p_GetComp(p2, currRing);
     406  long c;
    407407  poly m1,m2;
    408408  number t1 = NULL,t2 = NULL;
  • kernel/kutil.cc

    red5c8d r0b5e3d  
    63606360  unsigned long l = 0;
    63616361  int i;
    6362   Exponent_t e;
     6362  long e;
    63636363
    63646364  assume(strat->tailRing == currRing);
  • kernel/p_polys.cc

    red5c8d r0b5e3d  
    549549{
    550550  p_CheckPolyRing(p, r);
    551   Exponent_t k= p_GetComp(p, r);
     551  long k= p_GetComp(p, r);
    552552  int ll=1;
    553553
     
    625625{
    626626  p_CheckPolyRing(p, r);
    627   Exponent_t k= p_GetComp(p, r);
     627  long k= p_GetComp(p, r);
    628628  long o = r->pFDeg(p, r);
    629629  int ll=1;
     
    655655{
    656656  p_CheckPolyRing(p, r);
    657   Exponent_t k= p_GetComp(p, r);
     657  long k= p_GetComp(p, r);
    658658  int ll=1;
    659659  long  t,max;
     
    725725  assume(r->pFDeg == pDeg);
    726726  p_CheckPolyRing(p, r);
    727   Exponent_t k= p_GetComp(p, r);
     727  long k= p_GetComp(p, r);
    728728  int ll=1;
    729729  long  t,max;
     
    789789{
    790790  p_CheckPolyRing(p, r);
    791   Exponent_t k= p_GetComp(p, r);
     791  long k= p_GetComp(p, r);
    792792  int ll=1;
    793793  long  t,max;
     
    852852{
    853853  p_CheckPolyRing(p, r);
    854   Exponent_t k= p_GetComp(p, r);
     854  long k= p_GetComp(p, r);
    855855  int ll=1;
    856856  long  t,max;
  • kernel/polys-impl.cc

    red5c8d r0b5e3d  
    6262
    6363
    64 static inline unsigned long GetBitFields(Exponent_t e,
     64static inline unsigned long GetBitFields(long e,
    6565                                         unsigned int s, unsigned int n)
    6666{
     
    7272  {
    7373    assume(s+i < BIT_SIZEOF_LONG);
    74     if (e > (Exponent_t) i) ev |= Sy_bit_L(s+i);
     74    if (e > (long) i) ev |= Sy_bit_L(s+i);
    7575    else break;
    7676    i++;
  • kernel/polys-impl.h

    red5c8d r0b5e3d  
    3535#endif
    3636
    37 typedef Exponent_t* Exponent_pt;
    3837struct  spolyrec
    3938{
  • kernel/polys.cc

    red5c8d r0b5e3d  
    242242        return s_save;
    243243      }
    244       p_AddExp(rc,1+j, (Exponent_t)i, r);
     244      p_AddExp(rc,1+j, (long)i, r);
    245245    }
    246246    else
     
    340340      if (ii!=0)
    341341      {
    342         pAddExp(q,varnum, (Exponent_t)ii);
     342        pAddExp(q,varnum, (long)ii);
    343343        pSetm(q);
    344344      }
     
    531531// Splits *p into two polys: *q which consists of all monoms with
    532532// component == comp and *p of all other monoms *lq == pLength(*q)
    533 void pTakeOutComp(poly *r_p, Exponent_t comp, poly *r_q, int *lq)
     533void pTakeOutComp(poly *r_p, long comp, poly *r_q, int *lq)
    534534{
    535535  spolyrec pp, qq;
     
    579579}
    580580
    581 void pDecrOrdTakeOutComp(poly *r_p, Exponent_t comp, long order,
     581void pDecrOrdTakeOutComp(poly *r_p, long comp, long order,
    582582                         poly *r_q, int *lq)
    583583{
  • kernel/polys.h

    red5c8d r0b5e3d  
    132132
    133133// Gets a copy of (resp. set) the exponent vector, where e is assumed
    134 // to point to (r->N +1)*sizeof(Exponent_t) memory. Exponents are
     134// to point to (r->N +1)*sizeof(long) memory. Exponents are
    135135// filled in as follows: comp, e_1, .., e_n
    136136#define pGetExpV(p, e)      p_GetExpV(p, e, currRing)
     
    399399// component == comp and *p of all other monoms *lq == pLength(*q)
    400400// On return all components pf *q == 0
    401 void pTakeOutComp(poly *p, Exponent_t comp, poly *q, int *lq);
     401void pTakeOutComp(poly *p, long comp, poly *q, int *lq);
    402402// Similar to pTakeOutComp, except that only those components are
    403403// taken out whose Order == order
    404404// ASSUME: monomial ordering is Order compatible, i.e., if m1, m2 Monoms then
    405405//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
    406 void pDecrOrdTakeOutComp(poly *p, Exponent_t comp, long order,
     406void pDecrOrdTakeOutComp(poly *p, long comp, long order,
    407407                         poly *q, int *lq);
    408408// This is something weird -- Don't use it, unless you know what you are doing
  • kernel/polys0.cc

    red5c8d r0b5e3d  
    5454  {
    5555    {
    56       Exponent_t ee = p_GetExp(p,i+1,r);
     56      int ee = p_GetExp(p,i+1,r);
    5757      if (ee!=0)
    5858      {
     
    7272  }
    7373  //StringAppend("{%d}",p->Order);
    74   if (p_GetComp(p, r) != (Exponent_t)ko)
     74  if (p_GetComp(p, r) != (long)ko)
    7575  {
    7676    if (writeGen) StringAppendS("*");
     
    9999  }
    100100
    101   Exponent_t k = 1;
     101  long k = 1;
    102102  StringAppendS("[");
    103103  loop
  • kernel/ringgb.cc

    red5c8d r0b5e3d  
    6262{
    6363  int i;
    64   Exponent_t x;
     64  int x;
    6565  m1 = p_Init(m_r);
    6666  m2 = p_Init(m_r);
  • kernel/sparsmat.h

    red5c8d r0b5e3d  
    3131ideal smCallSolv(ideal I);
    3232
    33 void smRingChange(ring *, sip_sring &, Exponent_t);
     33void smRingChange(ring *, sip_sring &, long);
    3434void smRingClean(ring, ip_sring &);
    35 Exponent_t smExpBound(ideal, int, int, int);
     35long smExpBound(ideal, int, int, int);
    3636BOOLEAN smCheckDet(ideal, int, BOOLEAN);
    3737#endif
Note: See TracChangeset for help on using the changeset viewer.