Changeset 8c73aaf in git


Ignore:
Timestamp:
Oct 3, 2020, 10:55:01 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
1b2761dba1ef4402e8cb0e95ce3a34e83dd7f691
Parents:
6c613e319ffabdf574fa1930801650f989bb855a
Message:
use flint, comment unused stuff
Location:
factory
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • factory/cfEzgcd.cc

    r6c613e r8c73aaf  
    5151TIMING_DEFINE_PRINT(ez_termination)
    5252
     53#ifdef HAVE_NTL // unused otherwise
    5354static
    5455int compress4EZGCD (const CanonicalForm& F, const CanonicalForm& G, CFMap & M,
    … …  
    189190  return both_non_zero;
    190191}
     192#endif
    191193
    192194static inline
    … …  
    380382#endif
    381383
     384#ifdef HAVE_NTL // unused otherwise
    382385static
    383386bool findeval (const CanonicalForm & F, const CanonicalForm & G,
    … …  
    445448  }
    446449}
     450#endif
     451
    447452static void gcd_mon_rec(CanonicalForm G, CanonicalForm &cf,int *exp,int pl)
    448453{  // prevoius level: pl
    … …  
    462467}
    463468
     469#ifdef HAVE_NTL // unused otherwise
    464470static CanonicalForm gcd_mon(CanonicalForm F, CanonicalForm G)
    465471{
    … …  
    485491  return res;
    486492}
     493#endif
    487494
    488495#ifdef HAVE_NTL // Hensel
    … …  
    860867
    861868#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     869#ifdef HAVE_NTL // Hensel
    862870// parameters for heuristic
    863871STATIC_VAR int maxNumEval= 200;
    … …  
    866874/// Extended Zassenhaus GCD for finite fields.
    867875/// In case things become too dense we switch to a modular algorithm.
    868 #ifdef HAVE_NTL // Hensel
    869876CanonicalForm EZGCD_P( const CanonicalForm & FF, const CanonicalForm & GG )
    870877{

  • factory/cfGcdAlgExt.cc

    r6c613e r8c73aaf  
    657657myicontent ( const CanonicalForm & f, const CanonicalForm & c )
    658658{
    659 #ifdef HAVE_NTL
     659#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    660660    if (f.isOne() || c.isOne())
    661661      return 1;
    … …  
    707707static CanonicalForm myicontent ( const CanonicalForm & f )
    708708{
    709 #ifdef HAVE_NTL
     709#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    710710    return myicontent( f, 0 );
    711711#else

  • factory/cfSubResGcd.cc

    r6c613e r8c73aaf  
    5050    }
    5151    C = gcd( Ci, Ci1 );
     52    #ifdef HAVE_NTL // gcd_test_one, primitiveElement
    5253    int d= 0;
    53     #ifdef HAVE_NTL // gcd_test_one, primitiveElement
    5454    if ( !( pi.isUnivariate() && pi1.isUnivariate() ) )
    5555    {

  • factory/cf_irred.cc

    r6c613e r8c73aaf  
    3131  nmod_poly_init(Irredpoly,p);
    3232  nmod_poly_randtest_monic_irreducible(Irredpoly, FLINTrandom, i+1);
    33   CanonicalForm CFirredpoly=convertnmod_poly_t2FacCF(Irredpoly,Variable(1));
     33  CanonicalForm CFirredpoly=convertnmod_poly_t2FacCF(Irredpoly,x);
    3434  nmod_poly_clear(Irredpoly);
    3535  #elif defined(HAVE_NTL)

  • factory/facAlgExt.cc

    r6c613e r8c73aaf  
    5959  mipo *= bCommonDen (mipo);
    6060
    61   int degg= degree (g);
    62   int degmipo= degree (mipo);
    6361  CanonicalForm norm;
    6462  TIMING_START (fac_alg_resultant);
    6563#ifdef HAVE_NTL
     64  int degg= degree (g);
     65  int degmipo= degree (mipo);
    6666  if (degg >= 8 || degmipo >= 8)
    6767    norm= resultantZ (g, mipo, x);

  • factory/facSparseHensel.cc

    r6c613e r8c73aaf  
    3131  int si=termsF.size();
    3232  int fl=factors.length();
    33   int ch=getCharacteristic();
    3433  //printf("size:%d, length=%d, char=%d\n",si,fl,getCharacteristic());
    3534  if ((si > threshold)
Note: See TracChangeset for help on using the changeset viewer.