Changeset 7fdedf in git


Ignore:
Timestamp:
Jul 13, 2020, 5:52:25 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
2486f460fbcdd44c72acea7779937ed446323e1f
Parents:
7c7d2697b29c975a9f58a4232aedffacdabc13ec
Message:
factory: check for NTL/FLINT, p2
Location:
factory
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • factory/cf_char.cc

    r7c7d26 r7fdedf  
    1818#include "cf_util.h"
    1919#include "int_pp.h"
     20
     21#ifdef HAVE_FLINT
     22#include "FLINTconvert.h" // for __FLINT_RELEASE
     23#endif
    2024
    2125STATIC_VAR int theCharacteristic = 0;
     
    4448}
    4549
    46 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
     50#if !defined(HAVE_NTL)
     51#if !defined(HAVE_FLINT) || (__FLINT_RELEASE==20600)
    4752void setCharacteristic( int c, int n )
    4853{
     
    5257    CFFactory::settype( PrimePowerDomain );
    5358}
     59#endif
    5460#endif
    5561
  • factory/cf_util.h

    r7c7d26 r7fdedf  
    44#define INCL_CF_UTIL_H
    55
    6 // #include "config.h"
     6#include "globaldefs.h"
    77
    88int ilog2 (int a);
  • factory/facBivar.cc

    r7c7d26 r7fdedf  
    1616
    1717#include "cf_assert.h"
     18#include "cf_util.h"
    1819#include "debug.h"
    1920#include "timing.h"
     
    553554    ZZ NTLD= discriminant (NTLmipo);
    554555    den= abs (convertZZ2CF (NTLD*NTLf));
     556    #else
     557    factoryError("NTL/FLINT missing: biFactorize");
    555558    #endif
    556559
     
    572575    #elif defined(HAVE_NTL)
    573576    CanonicalForm discMipo= convertZZ2CF (NTLD);
     577    #else
     578    factoryError("NTL/FLINT missing: biFactorize");
    574579    #endif
    575580    findGoodPrime (F*discMipo,i);
  • factory/facFqBivar.cc

    r7c7d26 r7fdedf  
    2222
    2323#include "cf_assert.h"
     24#include "cf_util.h"
    2425#include "debug.h"
    2526#include "timing.h"
     
    841842  BuildIrred (NTLIrredpoly, i*m);
    842843  CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
     844  #else
     845  factoryError("NTL/FLINT missing: chooseExtension");
    843846  #endif
    844847  return rootOf (newMipo);
  • factory/facFqSquarefree.cc

    r7c7d26 r7fdedf  
    258258    buffer= pthRoot (A, q, alpha);
    259259  }
     260#else
     261  factoryError("NTL/FLINT missing: squarefreeFactorization");
    260262#endif
    261263
  • factory/fac_cantzass.cc

    r7c7d26 r7fdedf  
    1414#include "gmpext.h"
    1515
    16 #if !defined(HAVE_FLINT) && !defined(HAVE_NTL)
     16#ifdef HAVE_FLINT
     17#include"FLINTconvert.h"
     18#endif
     19
     20#if !defined(HAVE_NTL)
     21#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
    1722static CanonicalForm randomPoly( int n, const Variable & x, const CFRandom & gen );
    1823
     
    292297}
    293298#endif
     299#endif
  • factory/fac_sqrfree.cc

    r7c7d26 r7fdedf  
    1111#include "cf_map.h"
    1212#include "cf_algorithm.h"
     13
     14#ifdef HAVE_FLINT
     15#include "FLINTconvert.h" // for __FLINT_RELEASE
     16#endif
    1317
    1418static int
     
    150154}
    151155
    152 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
     156#if !defined(HAVE_NTL)
     157#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
    153158static int divexp = 1;
    154159
     
    206211}
    207212#endif
     213#endif
  • factory/fac_univar.cc

    r7c7d26 r7fdedf  
    2020#include "cfUnivarGcd.h"
    2121
    22 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
     22#ifdef HAVE_FLINT
     23#include "FLINTconvert.h" // for __FLINT_RELEASE
     24#endif
     25
     26#if !defined(HAVE_NTL)
     27#if !defined(HAVE_FLINT) || (__FLINT_RELEASE==20600)
    2328TIMING_DEFINE_PRINT(fac_choosePrimes)
    2429TIMING_DEFINE_PRINT(fac_facModPrimes)
     
    565570}
    566571#endif
     572#endif
  • factory/int_pp.cc

    r7c7d26 r7fdedf  
    1313#include "imm.h"
    1414
    15 #if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
     15#ifdef HAVE_FLINT
     16#include "FLINTconvert.h"
     17#endif
     18
     19#if !defined(HAVE_NTL)
     20#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
    1621GLOBAL_VAR mpz_t InternalPrimePower::primepow;
    1722GLOBAL_VAR mpz_t InternalPrimePower::primepowhalf;
     
    410415//}}}
    411416#endif
     417#endif
Note: See TracChangeset for help on using the changeset viewer.