Changeset 9ee586 in git


Ignore:
Timestamp:
Sep 15, 2014, 6:32:29 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
1b62751a4d0f3f4b875f0161483c1a86cc1e1ebf
Parents:
7df5dbe44d6ad4e3b6b80e8f74c0a85ec6452b3e
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 18:32:29+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 18:33:25+02:00
Message:
chg: version test for flint 2.4
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • dox/Doxyfile.in

    r7df5dbe r9ee586  
    19851985"HAVE_RINGS=1" \
    19861986"HAVE_MORE_FIELDS_IMPLEMENTED=1" \
    1987 "__FLINT_VERSION_MINOR=4" \
     1987"__FLINT_RELEASE=20400" \
    19881988"__GMP_BITS_PER_MP_LIMB=100" \
    19891989__cplusplus \

  • factory/FLINTconvert.cc

    r7df5dbe r9ee586  
    4646#include <flint/nmod_mat.h>
    4747#include <flint/fmpz_mat.h>
    48 #if (__FLINT_VERSION_MINOR >= 4)
     48#if ( __FLINT_RELEASE >= 20400)
    4949#include <flint/fq.h>
    5050#include <flint/fq_poly.h>
    … …  
    271271}
    272272
    273 #if __FLINT_VERSION_MINOR >= 4
     273#if __FLINT_RELEASE >= 20400
    274274CFFList
    275275convertFLINTFq_nmod_poly_factor2FacCFFList (const fq_nmod_poly_factor_t fac,
    … …  
    313313}
    314314
    315 #if __FLINT_VERSION_MINOR >= 4
     315#if __FLINT_RELEASE >= 20400
    316316void
    317317convertFacCF2Fq_nmod_t (fq_nmod_t result, const CanonicalForm& f,
    … …  
    501501}
    502502
    503 #if __FLINT_VERSION_MINOR >= 4
     503#if __FLINT_RELEASE >= 20400
    504504void
    505505convertFacCFMatrix2Fq_nmod_mat_t (fq_nmod_mat_t M,

  • factory/FLINTconvert.h

    r7df5dbe r9ee586  
    3535#include <flint/nmod_mat.h>
    3636#include <flint/fmpz_mat.h>
    37 #if (__FLINT_VERSION_MINOR >= 4)
     37#if ( __FLINT_RELEASE >= 20400)
    3838#include <flint/fq.h>
    3939#include <flint/fq_poly.h>
    … …  
    141141                             );
    142142
    143 #if __FLINT_VERSION_MINOR >= 4
     143#if __FLINT_RELEASE >= 20400
    144144/// conversion of a FLINT element of F_q to a CanonicalForm with alg. variable
    145145/// alpha
    … …  
    224224                                       );
    225225
    226 #if __FLINT_VERSION_MINOR >= 4
     226#if __FLINT_RELEASE >= 20400
    227227/// conversion of a FLINT matrix over F_q to a factory matrix
    228228CFMatrix*

  • factory/canonicalform.cc

    r7df5dbe r9ee586  
    708708        value = value->mulcoeff( cf.value );
    709709    else  if ( value->level() == cf.value->level() ) {
    710 #if (HAVE_NTL && HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     710#if (HAVE_NTL && HAVE_FLINT && __FLINT_RELEASE >= 20400)
    711711        if (value->levelcoeff() == cf.value->levelcoeff() && cf.isUnivariate() && (*this).isUnivariate())
    712712        {
    … …  
    762762        value = value->dividecoeff( cf.value, false );
    763763    else  if ( value->level() == cf.value->level() ) {
    764 #if (HAVE_NTL && HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     764#if (HAVE_NTL && HAVE_FLINT && __FLINT_RELEASE >= 20400)
    765765        if ( value->levelcoeff() == cf.value->levelcoeff() && (*this).isUnivariate() && cf.isUnivariate())
    766766        {

  • factory/cf_factor.cc

    r7df5dbe r9ee586  
    637637    if (ch>2)
    638638    {
    639 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     639#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    640640      nmod_poly_t FLINTmipo, leadingCoeff;
    641641      fq_nmod_ctx_t fq_con;

  • factory/facFqBivar.cc

    r7df5dbe r9ee586  
    172172    if (getCharacteristic() > 2)
    173173    {
    174 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     174#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    175175      nmod_poly_t FLINTmipo, leadingCoeff;
    176176      fq_nmod_ctx_t fq_con;
    … …  
    239239    if (getCharacteristic() > 2)
    240240    {
    241 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     241#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    242242      nmod_poly_t FLINTmipo, leadingCoeff;
    243243      fq_nmod_ctx_t fq_con;

  • factory/facFqSquarefree.cc

    r7df5dbe r9ee586  
    8080#endif
    8181
    82 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     82#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    8383CanonicalForm
    8484pthRoot (const CanonicalForm & F, const fmpz_t& q, const Variable& alpha)
    … …  
    238238
    239239  CanonicalForm buffer;
    240 #if defined(HAVE_NTL) || (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     240#if defined(HAVE_NTL) || (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    241241  if (alpha.level() == 1)
    242242#endif
    243243    buffer= pthRoot (A, ipower (p, k));
    244 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     244#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    245245  else
    246246  {

  • factory/facHensel.cc

    r7df5dbe r9ee586  
    4747TIMING_DEFINE_PRINT (hensel)
    4848
    49 #if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
     49#if (!(HAVE_FLINT && __FLINT_RELEASE >= 20400))
    5050static
    5151CFList productsNTL (const CFList& factors, const CanonicalForm& M)
    … …  
    8787#endif
    8888
    89 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     89#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    9090static
    9191CFList productsFLINT (const CFList& factors, const CanonicalForm& M)
    … …  
    168168    i.getItem()= reduce (i.getItem()*inv, M);
    169169  }
    170 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     170#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    171171  bufFactors= productsFLINT (bufFactors, M);
    172172#else

  • factory/facMul.cc

    r7df5dbe r9ee586  
    424424        if (!is_rat)
    425425          Off (SW_RATIONAL);
    426 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     426#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    427427        fmpz_t FLINTp;
    428428        fmpz_mod_poly_t FLINTmipo;
    … …  
    509509        if (hasFirstAlgVar (G, alpha) || hasFirstAlgVar (F, alpha))
    510510        {
    511 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     511#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    512512          fmpz_t FLINTp;
    513513          fmpz_mod_poly_t FLINTmipo;
    … …  
    623623      return result;
    624624    }
    625 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     625#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    626626    nmod_poly_t FLINTmipo;
    627627    fq_nmod_ctx_t fq_con;
    … …  
    737737      if (b.getp() != 0)
    738738      {
    739 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     739#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    740740        fmpz_t FLINTp;
    741741        fmpz_mod_poly_t FLINTmipo;
    … …  
    797797  if (hasFirstAlgVar (F, alpha) || hasFirstAlgVar (G, alpha))
    798798  {
    799 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     799#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    800800    nmod_poly_t FLINTmipo;
    801801    fq_nmod_ctx_t fq_con;
    … …  
    865865        hasFirstAlgVar (F, alpha);
    866866        hasFirstAlgVar (G, alpha);
    867 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     867#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    868868        fmpz_t FLINTp;
    869869        fmpz_mod_poly_t FLINTmipo;
    … …  
    915915        Variable alpha;
    916916        hasFirstAlgVar (G, alpha);
    917 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     917#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    918918        fmpz_t FLINTp;
    919919        fmpz_mod_poly_t FLINTmipo;
    … …  
    10001000      if (b.getp() != 0)
    10011001      {
    1002 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     1002#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    10031003        fmpz_t FLINTp;
    10041004        fmpz_mod_poly_t FLINTmipo;
    … …  
    10581058  if (hasFirstAlgVar (F, alpha) || hasFirstAlgVar (G, alpha))
    10591059  {
    1060 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     1060#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    10611061    nmod_poly_t FLINTmipo;
    10621062    fq_nmod_ctx_t fq_con;
    … …  
    11341134}
    11351135
    1136 #if (__FLINT_VERSION_MINOR >= 4)
     1136#if ( __FLINT_RELEASE >= 20400)
    11371137void
    11381138kronSubFq (fq_nmod_poly_t result, const CanonicalForm& A, int d,
    … …  
    12921292}
    12931293
    1294 #if (__FLINT_VERSION_MINOR >= 4)
     1294#if ( __FLINT_RELEASE >= 20400)
    12951295void
    12961296kronSubReciproFq (fq_nmod_poly_t subA1, fq_nmod_poly_t subA2,
    … …  
    16441644}
    16451645
    1646 #if (__FLINT_VERSION_MINOR >= 4)
     1646#if ( __FLINT_RELEASE >= 20400)
    16471647CanonicalForm
    16481648reverseSubstReciproFq (const fq_nmod_poly_t F, const fq_nmod_poly_t G, int d,
    … …  
    18821882}
    18831883
    1884 #if (__FLINT_VERSION_MINOR >= 4)
     1884#if ( __FLINT_RELEASE >= 20400)
    18851885CanonicalForm
    18861886reverseSubstFq (const fq_nmod_poly_t F, int d, const Variable& alpha,
    … …  
    20232023}
    20242024
    2025 #if (__FLINT_VERSION_MINOR >= 4)
     2025#if ( __FLINT_RELEASE >= 20400)
    20262026CanonicalForm
    20272027mulMod2FLINTFqReci (const CanonicalForm& F, const CanonicalForm& G, const
    … …  
    22672267#endif
    22682268
    2269 #if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
     2269#if (!(HAVE_FLINT &&  __FLINT_RELEASE >= 20400))
    22702270zz_pEX kronSubFq (const CanonicalForm& A, int d, const Variable& alpha)
    22712271{
    … …  
    23832383#endif
    23842384
    2385 #if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
     2385#if (!(HAVE_FLINT &&  __FLINT_RELEASE >= 20400))
    23862386CanonicalForm
    23872387reverseSubstReciproFq (const zz_pEX& F, const zz_pEX& G, int d, int k,
    … …  
    26112611#endif
    26122612
    2613 #if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
     2613#if (!(HAVE_FLINT &&  __FLINT_RELEASE >= 20400))
    26142614CanonicalForm reverseSubstFq (const zz_pEX& F, int d, const Variable& alpha)
    26152615{
    … …  
    27502750#endif
    27512751
    2752 #if (!(HAVE_FLINT && __FLINT_VERSION_MINOR >= 4))
     2752#if (!(HAVE_FLINT &&  __FLINT_RELEASE >= 20400))
    27532753// assumes input to be reduced mod M and to be an element of Fq not Fp
    27542754CanonicalForm
    … …  
    28002800  if (hasFirstAlgVar (A, alpha) || hasFirstAlgVar (B, alpha))
    28012801  {
    2802 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     2802#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    28032803    nmod_poly_t FLINTmipo;
    28042804    convertFacCF2nmod_poly_t (FLINTmipo, getMipo (alpha));
    … …  
    32143214    {
    32153215      Variable y= Variable (2);
    3216 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     3216#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    32173217      nmod_poly_t FLINTmipo;
    32183218      fq_nmod_ctx_t fq_con;
    … …  
    32973297    {
    32983298      Variable y= Variable (2);
    3299 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     3299#if (HAVE_FLINT &&  __FLINT_RELEASE >= 20400)
    33003300      nmod_poly_t FLINTmipo;
    33013301      fq_nmod_ctx_t fq_con;
    … …  
    36503650    if (hasFirstAlgVar (A, alpha) || hasFirstAlgVar (B, alpha))
    36513651    {
    3652 #if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
     3652#if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
    36533653      nmod_poly_t FLINTmipo;
    36543654      fq_nmod_ctx_t fq_con;
Note: See TracChangeset for help on using the changeset viewer.