Changeset 3bc01c7 in git


Ignore:
Timestamp:
May 5, 2010, 4:34:09 PM (14 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
dc093ce0cffbd8b24b4eb47a678f5b0d90e52231
Parents:
81bff55bd91793d5286706a40319145c80986141
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-05 16:34:09+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:51:40+01:00
Message:
nDummy2 -> ndNormalize
Location:
coeffs
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • coeffs/coeffs.h

    r81bff55 r3bc01c7  
    193193   int     ref;
    194194   n_coeffType type;
    195    short   nChar;
    196195////-----------------------------------------
    197196  char**     parameter; /* names of parameters, rInit */
  • coeffs/modulop.cc

    r81bff55 r3bc01c7  
    366366    r->cfSetChar=npSetChar;
    367367    npSetChar(r);
     368    // dummy stuff
     369    r->nPar  = ndPar;
     370    r->nParDeg=ndParDeg;
     371    r->cfGetDenom= ndGetDenom;
     372    r->cfGetNumerator= ndGetNumerator;
     373    r->nImPart=ndReturn0;
     374    r->nInpMult=ndInpMult;
     375    r->nIntMod=ndIntMod;
     376    r->nNormalize=ndNormalize;
     377    r->nGcd  = ndGcd;
     378    r->nLcm  = ndGcd; /* tricky, isn't it ?*/
     379    // the real stuff
    368380    r->cfInit = npInit;
    369381    r->nInit_bigint=npMap0;
  • coeffs/numbers.cc

    r81bff55 r3bc01c7  
    6565#endif
    6666
    67 void   nDummy2(number& d, const coeffs r) { }
     67void   ndNormalize(number& d, const coeffs r) { }
    6868
    6969char * ndName(number n, const coeffs r) { return NULL; }
     
    203203  n_coeffType t=nFieldType(r);
    204204
     205  #if 0 /* vertagt*/
    205206  if (nField_is_Extension(r))
    206207  {
     
    214215    }
    215216  }
     217  #endif
    216218
    217219  n_coeffType t=rFieldType(r);
     
    221223  n_Procs_s *n=cf_root;
    222224  while((n!=NULL)
    223     && ((n->nChar!=c) || (n->type!=t)))
     225    && ((n->ch!=c) || (n->type!=t)))
    224226      n=n->next;
    225227  if (n==NULL)
     
    228230    n->next=cf_root;
    229231    n->ref=1;
    230     n->nChar=c;
     232    n->ch=c;
    231233    n->type=t;
    232234    cf_root=n;
    233235  }
    234   else if ((n->nChar==c) && (n->type==t))
     236  else if ((n->ch==c) && (n->type==t))
    235237  {
    236238    n->ref++;
     
    244246  }
    245247  r=n;
    246   n->nChar = c;
     248  n->ch = c;
    247249  n->nPar  = ndPar;
    248250  n->nParDeg=ndParDeg;
     
    256258  n->cfCopy=nd_Copy;
    257259  n->nIntMod=ndIntMod; /* dummy !! */
    258   n->nNormalize=nDummy2;
     260  n->nNormalize=ndNormalize;
    259261  n->nGcd  = ndGcd;
    260262  n->nLcm  = ndGcd; /* tricky, isn't it ?*/
     
    348350     n->nPower = nrzPower;
    349351     n->cfSetMap = nrzSetMap;
    350      n->nNormalize = nDummy2;
     352     n->nNormalize = ndNormalize;
    351353     n->nLcm          = nrzLcm;
    352354     n->nGcd          = nrzGcd;
     
    537539  {
    538540    n->cfDelete= ngcDelete;
    539     n->nNormalize=nDummy2;
     541    n->nNormalize=ndNormalize;
    540542    n->cfInit = ngcInit;
    541543    n->n_Int  = ngcInt;
  • coeffs/numbers.h

    r81bff55 r3bc01c7  
    6060#define nSetMap(R) (currRing->cf->cfSetMap(R,currRing))
    6161
     62/* the dummy routines: */
    6263void nDummy1(number* d);
    6364void ndDelete(number* d, const coeffs r);
    64 void nDummy2(number &d);
    6565number ndGcd(number a, number b, const coeffs);
    6666number ndCopy(number a, const coeffs r);
     
    6868int ndSize(number a, const coeffs r);
    6969char * ndName(number n, const coeffs r);
     70number ndPar(int i, const coeffs r);
     71int    ndParDeg(number n, const coeffs r);
     72number ndGetDenom(number &n, const coeffs r);
     73number ndGetNumerator(number &a,const coeffs r);
     74number ndReturn0(number n, const coeffs r);
     75number ndIntMod(number a, number b, const coeffs r);
    7076
    7177void   ndInpMult(number &a, number b, const coeffs r);
     
    8490
    8591// dummy routines
    86 void   nDummy2(number& d); // nNormalize...
     92void   ndNormalize(number& d, const coeffs); // nNormalize...
    8793
    8894// Tests:
  • coeffs/rmodulo2m.cc

    r81bff55 r3bc01c7  
    5151     n->nPower = nr2mPower;
    5252     n->cfSetMap = nr2mSetMap;
    53      n->nNormalize = nDummy2;
     53     n->nNormalize = ndNormalize;
    5454     n->nLcm          = nr2mLcm;
    5555     n->nGcd          = nr2mGcd;
  • coeffs/rmodulon.cc

    r81bff55 r3bc01c7  
    5656     n->nPower = nrnPower;
    5757     n->cfSetMap = nrnSetMap;
    58      n->nNormalize = nDummy2;
     58     n->nNormalize = ndNormalize;
    5959     n->nLcm          = nrnLcm;
    6060     n->nGcd          = nrnGcd;
Note: See TracChangeset for help on using the changeset viewer.