Changeset bfa04e in git


Ignore:
Timestamp:
Apr 29, 2011, 7:04:05 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
62604d2f2d4a187dd1464fdb07625f99d535f3b6
Parents:
aec5c92fa3e0f853348936026c999351aa972656
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-29 19:04:05+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:31+01:00
Message:
fix typos
minpoly is a poly in r->cf->algring
Location:
libpolys
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/gnumpc.cc

    raec5c9 rbfa04e  
    327327{
    328328  assume( getCoeffType(r) == ID );
    329   assume( r->compex_parameter != NULL );
     329  assume( r->complex_parameter != NULL );
     330
    330331  if ((*s >= '0') && (*s <= '9'))
    331332  {
     
    336337    delete re;
    337338  }
    338   else if (strncmp(s, r->compex_parameter,strlen(r->compex_parameter))==0)
    339   {
    340     s+=strlen(r->compex_parameter);
     339  else if (strncmp(s, r->complex_parameter,strlen(r->complex_parameter))==0)
     340  {
     341    s+=strlen(r->complex_parameter);
    341342    gmp_complex *aa=new gmp_complex((long)0,(long)1);
    342343    *a=(number)aa;
     
    487488/// TODO: Any variables?
    488489  if( p == NULL )
    489     n->compex_parameter = "i"; //??
    490   else
    491     n->compex_parameter = omStrDup( (char*) p );
     490    n->complex_parameter = "i"; //??
     491  else
     492    n->complex_parameter = omStrDup( (char*) p );
    492493   
    493494  return FALSE;
  • libpolys/coeffs/mpr_complex.cc

    raec5c9 rbfa04e  
    708708char *complexToStr( gmp_complex & c, const unsigned int oprec, const coeffs src )
    709709{
    710   assume( src->compex_parameter != NULL );
     710  assume( src->complex_parameter != NULL );
    711711 
    712712  char *out,*in_imag,*in_real;
     
    721721    if (nCoeff_is_long_C(src))
    722722    {
    723       int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->compex_parameter))*sizeof(char);
     723      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->complex_parameter))*sizeof(char);
    724724      out=(char*)omAlloc(len);
    725725      memset(out,0,len);
    726726      if (  !c.real().isZero() )  // (-23-i*5.43) or (15.1+i*5.3)
    727         sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",src->compex_parameter,in_imag);
     727        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",src->complex_parameter,in_imag);
    728728      else // (-i*43) or (i*34)
    729729      {
    730730        if (c.imag().isOne())
    731           sprintf(out,"%s",src->compex_parameter);
     731          sprintf(out,"%s",src->complex_parameter);
    732732        else if (c.imag().isMOne())
    733           sprintf(out,"-%s",src->compex_parameter);
     733          sprintf(out,"-%s",src->complex_parameter);
    734734        else
    735           sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->compex_parameter,in_imag);
     735          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->complex_parameter,in_imag);
    736736      }
    737737    }
  • libpolys/polys/monomials/ring.cc

    raec5c9 rbfa04e  
    15591559  {
    15601560    if ( rMinpolyIsNULL(r2) ) return FALSE;
    1561     if (! n_Equal(r1->cf->algring->minideal->m[0],
    1562                   r2->cf->algring->minideal->m[0], r1->cf)) return FALSE;
     1561    if (! p_EqualPolys(r1->cf->algring->minideal->m[0],
     1562                  r2->cf->algring->minideal->m[0],
     1563                  r1->cf->algring))
     1564      return FALSE;
    15631565  }
    15641566  else if (!rMinpolyIsNULL(r2)) return FALSE;
Note: See TracChangeset for help on using the changeset viewer.