Changeset afdd55 in git


Ignore:
Timestamp:
May 5, 2010, 3:43:04 PM (14 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
81bff55bd91793d5286706a40319145c80986141
Parents:
2336d0a674d92415a0e20e0b4abf6b1a96ab56e2
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-05 15:43:04+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:51:39+01:00
Message:
nField_is -> getCoeffType
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r2336d0 rafdd55  
    66*.exe
    77depend
     8tags
    89Makefile
    910GNUMakefile
  • coeffs/coeffs.h

    r2336d0 rafdd55  
    110110
    111111   coeffs next;
    112    n_coeffType fieldtype;
    113112   unsigned int  ringtype;  /* 0 => coefficient field, 1 => coeffs from Z/2^m */
    114113
  • coeffs/modulop.cc

    r2336d0 rafdd55  
    361361#endif
    362362    }
     363    r->type=n_Zp;
     364    r->cfInitChar=npInitChar;
    363365    r->cfKillChar=npKillChar;
    364366    r->cfSetChar=npSetChar;
    365367    npSetChar(r);
    366     r->cfSetChar=NULL;
    367368    r->cfInit = npInit;
    368369    r->nInit_bigint=npMap0;
  • coeffs/numbers.cc

    r2336d0 rafdd55  
    266266  n->nGetUnit = (nMapFunc)NULL;
    267267#endif
     268  #if 0 /*vertagt*/
    268269  if (nField_is_Extension(r))
    269270  {
     
    305306#endif
    306307  }
     308  #endif
    307309#ifdef HAVE_RINGS
    308310  /* -------------- Z/2^m ----------------------- */
     
    321323     n->cfInit  = nrzInit;
    322324     n->cfDelete= nrzDelete;
    323      n->nCopy  = nrzCopy;
     325     n->cfCopy  = nrzCopy;
    324326     n->cfCopy = cfrzCopy;
    325327     n->nSize  = nrzSize;
     
    374376    n->nNeg   = nlNeg;
    375377    n->nInvers= nlInvers;
    376     n->nCopy  = nlCopy;
     378    n->cfCopy  = nlCopy;
    377379    n->nGreater = nlGreater;
    378380    n->nEqual = nlEqual;
     
    454456    n->nNeg   = nfNeg;
    455457    n->nInvers= nfInvers;
    456     n->nCopy  = ndCopy;
     458    n->cfCopy  = ndCopy;
    457459    n->nGreater = nfGreater;
    458460    n->nEqual = nfEqual;
     
    484486    n->nNeg   = nrNeg;
    485487    n->nInvers= nrInvers;
    486     n->nCopy  = ndCopy;
     488    n->cfCopy  = ndCopy;
    487489    n->nGreater = nrGreater;
    488490    n->nEqual = nrEqual;
     
    514516    n->nNeg   = ngfNeg;
    515517    n->nInvers= ngfInvers;
    516     n->nCopy  = ngfCopy;
     518    n->cfCopy  = ngfCopy;
    517519    n->nGreater = ngfGreater;
    518520    n->nEqual = ngfEqual;
     
    545547    n->nNeg   = ngcNeg;
    546548    n->nInvers= ngcInvers;
    547     n->nCopy  = ngcCopy;
     549    n->cfCopy  = ngcCopy;
    548550    n->nGreater = ngcGreater;
    549551    n->nEqual = ngcEqual;
     
    571573#endif
    572574#ifdef HAVE_RINGS
    573   if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->nCopy;
     575  if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->cfCopy;
    574576#endif
    575577  if (!errorreported)
  • coeffs/numbers.h

    r2336d0 rafdd55  
    118118
    119119
    120 static inline n_coeffType nField_is(const coeffs r)
    121 { return r->fieldtype; }
    122120static inline BOOLEAN nField_is_Zp(const coeffs r)
    123 { return nField_is(r)==n_Zp; }
     121{ return getCoeffType(r)==n_Zp; }
    124122
    125123static inline BOOLEAN nField_is_Zp(const coeffs r, int p)
    126 { return (nField_is_Zp(r)  && (r->ch == ABS(p))); }
     124{ return (getCoeffType(r)  && (r->ch == ABS(p))); }
    127125
    128126static inline BOOLEAN nField_is_Q(const coeffs r)
    129 { return nField_is(r)==n_Q; }
     127{ return getCoeffType(r)==n_Q; }
    130128
    131129static inline BOOLEAN nField_is_numeric(const coeffs r) /* R, long R, long C */
    132 {  return (nField_is(r)==n_R) || (nField_is(r)==n_long_R) || (nField_is(r)==n_long_C); }
     130{  return (getCoeffType(r)==n_R) || (getCoeffType(r)==n_long_R) || (getCoeffType(r)==n_long_C); }
    133131
    134132static inline BOOLEAN nField_is_R(const coeffs r)
    135 { return nField_is(r)==n_R; }
     133{ return getCoeffType(r)==n_R; }
    136134
    137135static inline BOOLEAN nField_is_GF(const coeffs r)
    138 { return nField_is(r)==n_GF; }
     136{ return getCoeffType(r)==n_GF; }
    139137
    140138static inline BOOLEAN nField_is_GF(const coeffs r, int q)
    141 { return (nField_is(r)==n_GF) && (r->ch == q); }
     139{ return (getCoeffType(r)==n_GF) && (r->ch == q); }
    142140
    143141static inline BOOLEAN nField_is_Zp_a(const coeffs r)
     
    151149
    152150static inline BOOLEAN nField_is_long_R(const coeffs r)
    153 { return nField_is(r)==n_long_R; }
     151{ return getCoeffType(r)==n_long_R; }
    154152
    155153static inline BOOLEAN nField_is_long_C(const coeffs r)
    156 { return nField_is(r)==n_long_C; }
     154{ return getCoeffType(r)==n_long_C; }
    157155
    158156static inline BOOLEAN nField_has_simple_inverse(const coeffs r)
Note: See TracChangeset for help on using the changeset viewer.