Changeset 0afa07 in git


Ignore:
Timestamp:
Jul 12, 2011, 11:31:27 AM (13 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
Children:
44d5adb209a6c64fd34d3985f93a7c9dc6e37179
Parents:
6a7368df0618cc5b104f43cceb2a3f3b41ba9366
git-author:
Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-07-12 11:31:27+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:14+01:00
Message:
removed cfPar, cfParDeg, n_Par, n_ParDeg, ndPar, ndParDeg from coeffs
Location:
libpolys
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/coeffs.h

    r6a7368 r0afa07  
    109109   /// init with an integer
    110110   number  (*cfInit)(int i,const coeffs r);
    111    number  (*cfPar)(int i, const coeffs r);
    112    int     (*cfParDeg)(number n, const coeffs r);
    113111   /// how complicated, (0) => 0, or positive
    114112   int     (*cfSize)(number n, const coeffs r);
     
    383381{ assume(src != NULL && dst != NULL); assume(dst->cfSetMap!=NULL); return dst->cfSetMap(src,dst); }
    384382
    385 static inline number n_Par(int n, const coeffs r)
    386 { assume(r != NULL); assume(r->cfPar!=NULL); return r->cfPar(n,r); }
    387 
    388 static inline int n_ParDeg(number n, const coeffs r)
    389 { assume(r != NULL); assume(r->cfParDeg!=NULL); return r->cfParDeg(n,r); }
    390 
    391383/// Tests whether n is a correct number: only used if LDEBUG is defined
    392384static inline BOOLEAN n_DBTest(number n, const char *filename, const int linenumber, const coeffs r)
  • libpolys/coeffs/ffields.cc

    r6a7368 r0afa07  
    773773  r->cfExactDiv= nfDiv;
    774774  r->cfInit = nfInit;
    775   //r->cfPar = ndPar;
    776   //r->cfParDeg = ndParDeg;
    777775  //r->cfSize  = ndSize;
    778776  r->cfInt  = nfInt;
  • libpolys/coeffs/gnumpc.cc

    r6a7368 r0afa07  
    3838#endif
    3939
    40 
     40/*
    4141number   ngcPar(int i, const coeffs r)
    4242{
     
    4747  return (number)n;
    4848}
     49*/
    4950
    5051/*2
     
    402403  n->cfPower   = ngcPower;
    403404  n->cfSetMap = ngcSetMap;
    404   n->cfPar     = ngcPar;
    405405  n->cfRePart  = ngcRePart;
    406406  n->cfImPart  = ngcImPart;
     
    429429  r->cfExactDiv= nlExactDiv;
    430430  r->cfInit = nlInit;
    431   r->cfPar = ndPar;
    432   r->cfParDeg = ndParDeg;
    433431  r->cfSize  = nlSize;
    434432  r->cfInt  = nlInt;
  • libpolys/coeffs/longrat.cc

    r6a7368 r0afa07  
    25632563  r->cfExactDiv= nlExactDiv;
    25642564  r->cfInit = nlInit;
    2565   //r->cfPar = ndPar;
    2566   //r->cfParDeg = ndParDeg;
    25672565  r->cfSize  = nlSize;
    25682566  r->cfInt  = nlInt;
  • libpolys/coeffs/modulop.cc

    r6a7368 r0afa07  
    353353  r->cfExactDiv= npDiv;
    354354  r->cfInit = npInit;
    355   //r->cfPar = ndPar;
    356   //r->cfParDeg = ndParDeg;
    357355  //r->cfSize  = ndSize;
    358356  r->cfInt  = npInt;
  • libpolys/coeffs/numbers.cc

    r6a7368 r0afa07  
    9494char * ndName(number, const coeffs) { return NULL; }
    9595
    96 number ndPar(int, const coeffs r) { return n_Init(0,r); }
    97 
    9896number ndReturn0(number, const coeffs r) { return n_Init(0,r); }
    99 
    100 int    ndParDeg(number, const coeffs) { return 0; }
    10197
    10298number ndGcd(number, number, const coeffs r) { return n_Init(1,r); }
     
    205201
    206202    // default entries (different from NULL) for some routines:
    207     n->cfPar  = ndPar;
    208     n->cfParDeg=ndParDeg;
    209203    n->cfSize = ndSize;
    210204    n->cfGetDenom= ndGetDenom;
     
    268262    assume(n->cfExactDiv!=NULL);
    269263    assume(n->cfInit!=NULL);
    270     assume(n->cfPar!=NULL);
    271     assume(n->cfParDeg!=NULL);
    272264    assume(n->cfSize!=NULL);
    273265    assume(n->cfInt!=NULL);
  • libpolys/coeffs/numbers.h

    r6a7368 r0afa07  
    6060int ndSize(number a, const coeffs r);
    6161char * ndName(number n, const coeffs r);
    62 number ndPar(int i, const coeffs r);
    63 int    ndParDeg(number n, const coeffs r);
    6462number ndGetDenom(number &n, const coeffs r);
    6563number ndGetNumerator(number &a,const coeffs r);
  • libpolys/polys/coeffrings.h

    r6a7368 r0afa07  
    4040static inline number n_Gcd(number a, number b, const ring r){ return n_Gcd(a,b, r->cf);}
    4141static inline number n_Lcm(number a, number b, const ring r){ return n_Lcm(a,b, r->cf);}
    42 static inline number n_Par(int n, const ring r){ return n_Par(n, r->cf);}
    43 static inline int n_ParDeg(number n, const ring r){ return n_ParDeg(n, r->cf);}
    4442
    4543#ifdef HAVE_RINGS
  • libpolys/polys/ext_fields/algext.cc

    r6a7368 r0afa07  
    6161number   naNeg(number a, const coeffs cf);
    6262number   naInvers(number a, const coeffs cf);
    63 number   naPar(int i, const coeffs cf);
    6463number   naAdd(number a, number b, const coeffs cf);
    6564number   naSub(number a, number b, const coeffs cf);
     
    245244}
    246245
    247 number naPar(int i, const coeffs cf)
    248 {
    249   assume(i == 1);   // there is only one parameter in this extension field
    250   poly p = p_ISet(1, naRing);   // p = 1
    251   p_SetExp(p, 1, 1, naRing);    // p = the sole extension variable
    252   p_Setm(p, naRing);
    253   return (number)p;
    254 }
    255 
    256246number naAdd(number a, number b, const coeffs cf)
    257247{
     
    642632  cf->cfInt          = naInt;
    643633  cf->cfNeg          = naNeg;
    644   cf->cfPar          = naPar;
    645634  cf->cfAdd          = naAdd;
    646635  cf->cfSub          = naSub;
  • libpolys/polys/ext_fields/algext.h

    r6a7368 r0afa07  
    6060number   naNeg(number a, const coeffs cf);
    6161number   naInvers(number a, const coeffs cf);
    62 number   naPar(int i, const coeffs cf);
    6362number   naAdd(number a, number b, const coeffs cf);
    6463number   naSub(number a, number b, const coeffs cf);
  • libpolys/polys/ext_fields/transext.cc

    r6a7368 r0afa07  
    7070number   ntNeg(number a, const coeffs cf);
    7171number   ntInvers(number a, const coeffs cf);
    72 number   ntPar(int i, const coeffs cf);
    7372number   ntAdd(number a, number b, const coeffs cf);
    7473number   ntSub(number a, number b, const coeffs cf);
     
    343342  PrintS(") with\n");
    344343  PrintS("//   K: "); n_CoeffWrite(cf->extRing->cf);
    345 }
    346 
    347 /* the i-th parameter */
    348 number ntPar(int i, const coeffs cf)
    349 {
    350   assume((1 <= i) && (i <= rVar(ntRing)));
    351   poly p = p_ISet(1, ntRing);
    352   p_SetExp(p, i, 1, ntRing);
    353   p_Setm(p, ntRing);
    354   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
    355   NUM(result) = p;
    356   DEN(result) = NULL;
    357   COM(result) = 0;
    358   return (number)result;
    359344}
    360345
     
    10721057  cf->cfInt          = ntInt;
    10731058  cf->cfNeg          = ntNeg;
    1074   cf->cfPar          = ntPar;
    10751059  cf->cfAdd          = ntAdd;
    10761060  cf->cfSub          = ntSub;
  • libpolys/polys/ext_fields/transext.h

    r6a7368 r0afa07  
    108108number   ntNeg(number a, const coeffs cf);
    109109number   ntInvers(number a, const coeffs cf);
    110 number   ntPar(int i, const coeffs cf);
    111110number   ntAdd(number a, number b, const coeffs cf);
    112111number   ntSub(number a, number b, const coeffs cf);
  • libpolys/polys/monomials/p_polys.cc

    r6a7368 r0afa07  
    22732273
    22742274number p_InitContent_a(poly ph, const ring r)
    2275 // only for coefficients in K(a) anf K(a,...)
     2275// only for coefficients in K(a)/<minpoly(a)> and K(t_1, t_2, ..., t_n)
    22762276{
    22772277  number d=pGetCoeff(ph);
    2278   int s=n_ParDeg(d,r->cf);
    2279   if (s /* n_ParDeg(d)*/ <=1) return n_Copy(d,r->cf);
     2278  /* old: int s=n_ParDeg(d,r->cf);   new: */
     2279  int s = p_Totaldegree((poly)d, r->cf->extRing);
     2280  if (s <=1) return n_Copy(d,r->cf);
    22802281  int s2=-1;
    22812282  number d2;
     
    22892290      break;
    22902291    }
    2291     if ((ss=n_ParDeg(pGetCoeff(ph),r->cf))<s)
     2292    /* old: if ((ss=n_ParDeg(pGetCoeff(ph),r->cf))<s)   new: */
     2293    if ((ss = p_Totaldegree((poly)pGetCoeff(ph), r->cf->extRing)) < s)
    22922294    {
    22932295      s2=s;
     
    34373439            {
    34383440              number c=pGetCoeff(qq);
    3439               number ee=n_Par(1,dst->cf);
     3441              number ee=(number)rGetVar(1, dst->cf->extRing);
    34403442              number eee;n_Power(ee,e,&eee,dst->cf); //nfDelete(ee,dst);
    34413443              ee=n_Mult(c,eee,dst->cf);
  • libpolys/polys/monomials/ring.cc

    r6a7368 r0afa07  
    53815381}
    53825382
     5383poly rGetVar(const int varIndex, const ring r)
     5384{
     5385    poly p = p_ISet(1, r);
     5386    p_SetExp(p, varIndex, 1, r);
     5387    p_Setm(p, r);
     5388    return p;
     5389}
     5390
  • libpolys/polys/monomials/ring.h

    r6a7368 r0afa07  
    722722//
    723723
     724/* return the varIndex-th ring variable as a poly;
     725   varIndex starts at index 1 */
     726poly rGetVar(const int varIndex, const ring r);
     727
    724728BOOLEAN rSetISReference(const ring r, const ideal F, const int i = 0, const int p = 0, const intvec * componentWeights = NULL);
    725729
Note: See TracChangeset for help on using the changeset viewer.