Changeset fe6b62 in git for libpolys/polys


Ignore:
Timestamp:
Nov 28, 2014, 7:30:47 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
12e275d84e2be0f90130dd2c323ad7733f0cc304
Parents:
a3cc3fc3171dee60192b2d6a9f0049cc7bed99a8
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-28 19:30:47+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-12-15 18:49:40+01:00
Message:
Removed the definition of convFactoryNSingAN from clapconv.cc in favor of using n_convFactoryNSingN (=nlConvFactoryNSingN in this case)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/clapconv.cc

    ra3cc3fc rfe6b62  
    248248static number convFactoryNSingAN( const CanonicalForm &f, const ring r)
    249249{
    250   if ( f.isImm() )
    251   {
    252     long longf=f.intval();
    253     int intf=(int) longf;
    254     if((long)intf==longf)
    255     {
    256       assume (r->cf->extRing != NULL);
    257       return n_Init(f.intval(),r->cf->extRing->cf);
    258     }
    259     else return nlRInit( longf );
    260   }
    261   else
    262   {
    263     number z=ALLOC_RNUMBER();
    264 #if defined(LDEBUG)
    265     z->debug=123456;
    266 #endif
    267     gmp_numerator( f, z->z );
    268     if ( f.den().isOne() )
    269     {
    270       z->s = 3;
    271     }
    272     else
    273     {
    274       gmp_denominator( f, z->n );
    275       z->s = 0;
    276       nlNormalize(z,r->cf->extRing->cf);
    277     }
    278     /*#ifdef LDEBUG
    279     nlTest(z,r->cf->extRing->cf);
    280     #endif*/
    281     return z;
    282   }
     250  assume (r != NULL);
     251  assume (r->cf != NULL);
     252  assume (r->cf->extRing != NULL);
     253  // it seems that r->cf->extRing->cf has to be Q ... ?
     254  return n_convFactoryNSingN( f, r->cf->extRing->cf );
    283255}
    284256
Note: See TracChangeset for help on using the changeset viewer.