Changeset b28747 in git


Ignore:
Timestamp:
Jul 3, 2020, 10:35:16 AM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
f3adf3a165dd0f173fe615a55624a41ff34bdddb
Parents:
a8d220bd457a894b0d527ebb1293c04e2d43bb2c
Message:
fix: factrory with or w/o NTL, FLINT
Location:
factory
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • factory/cf_chinese.cc

    ra8d220b rb28747  
    163163}
    164164
    165 #if 0
     165#if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
    166166CanonicalForm Farey_n (CanonicalForm N, const CanonicalForm P)
    167167//"USAGE:  Farey_n (N,P); P, N number;
    … …  
    251251            }
    252252          }
     253#else
     254          if (c.inZ())
     255            result += power (x, i.exp()) * Farey_n(c,q);
    253256#endif
    254257          else

  • factory/cf_map_ext.cc

    ra8d220b rb28747  
    440440}
    441441
     442#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    442443CanonicalForm
    443444mapPrimElem (const CanonicalForm& primElem, const Variable& alpha,
    … …  
    490491  }
    491492}
     493#endif
    492494
    493495CanonicalForm

  • factory/facFqBivar.cc

    ra8d220b rb28747  
    361361}
    362362
     363#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    363364/// naive factor recombination as decribed in "Factoring
    364365/// multivariate polynomials over a finite field" by L Bernardin.
    … …  
    575576  return result;
    576577}
     578#endif
    577579
    578580/// naive factor recombination as decribed in "Factoring
    … …  
    89228924#endif
    89238925
     8926#ifdef HAVE_NTL // biFactorize
    89248927CFList
    89258928extBiFactorize (const CanonicalForm& F, const ExtensionInfo& info)
    … …  
    90969099}
    90979100#endif
     9101#endif

  • factory/facFqBivar.h

    ra8d220b rb28747  
    5151            );
    5252
     53#ifdef HAVE_NTL // biFactorize
    5354inline CFList
    5455biSqrfFactorizeHelper (const CanonicalForm& G, const ExtensionInfo& info)
    … …  
    129130  return result;
    130131}
     132#endif
    131133
    132134/// factorize a squarefree bivariate polynomial over \f$ F_{p} \f$.
    … …  
    135137///         element is the leading coefficient.
    136138/// @sa FqBiSqrfFactorize(), GFBiSqrfFactorize()
     139#ifdef HAVE_NTL // biSqrfFactorizeHelper, biFactorize
    137140inline
    138141CFList FpBiSqrfFactorize (const CanonicalForm & G ///< [in] a bivariate poly
    … …  
    142145  return biSqrfFactorizeHelper (G, info);
    143146}
     147#endif
    144148
    145149/// factorize a squarefree bivariate polynomial over \f$ F_{p}(\alpha ) \f$.
    … …  
    148152///         element is the leading coefficient.
    149153/// @sa FpBiSqrfFactorize(), GFBiSqrfFactorize()
     154#ifdef HAVE_NTL // biSqrfFactorizeHelper, biFactorize
    150155inline
    151156CFList FqBiSqrfFactorize (const CanonicalForm & G, ///< [in] a bivariate poly
    … …  
    156161  return biSqrfFactorizeHelper (G, info);
    157162}
     163#endif
    158164
    159165/// factorize a squarefree bivariate polynomial over GF
    … …  
    162168///         element is the leading coefficient.
    163169/// @sa FpBiSqrfFactorize(), FqBiSqrfFactorize()
     170#ifdef HAVE_NTL // biSqrfFactorizeHelper, biFactorize
    164171inline
    165172CFList GFBiSqrfFactorize (const CanonicalForm & G ///< [in] a bivariate poly
    … …  
    171178  return biSqrfFactorizeHelper (G, info);
    172179}
     180#endif
    173181
    174182/// factorize a bivariate polynomial over \f$ F_{p} \f$
    … …  
    177185///         multiplicity, the first element is the leading coefficient.
    178186/// @sa FqBiFactorize(), GFBiFactorize()
     187#ifdef HAVE_NTL // biFactorize
    179188inline
    180189CFFList
    … …  
    296305  return result;
    297306}
     307#endif
    298308
    299309/// factorize a bivariate polynomial over \f$ F_{p}(\alpha ) \f$
    … …  
    302312///         multiplicity, the first element is the leading coefficient.
    303313/// @sa FpBiFactorize(), FqBiFactorize()
     314#ifdef HAVE_NTL // biFactorize
    304315inline
    305316CFFList
    … …  
    423434  return result;
    424435}
     436#endif
    425437
    426438/// factorize a bivariate polynomial over GF
    … …  
    429441///         multiplicity, the first element is the leading coefficient.
    430442/// @sa FpBiFactorize(), FqBiFactorize()
     443#ifdef HAVE_NTL // biFactorize
    431444inline
    432445CFFList
    … …  
    551564  return result;
    552565}
     566#endif
    553567
    554568/// \f$ \prod_{f\in L} {f (0, x)} \ mod\ M \f$ via divide-and-conquer

  • factory/facFqFactorize.cc

    ra8d220b rb28747  
    211211}
    212212
     213#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    213214CFList
    214215extFactorRecombination (const CFList& factors, const CanonicalForm& F,
    … …  
    353354  return result;
    354355}
    355 
     356#endif
     357
     358#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    356359CFList
    357360factorRecombination (const CanonicalForm& F, const CFList& factors,
    … …  
    438441  return result;
    439442}
    440 
     443#endif
     444
     445#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    441446int
    442447liftBoundAdaption (const CanonicalForm& F, const CFList& factors, bool&
    … …  
    502507  return adaptedLiftBound;
    503508}
    504 
     509#endif
     510
     511#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    505512int
    506513extLiftBoundAdaption (const CanonicalForm& F, const CFList& factors, bool&
    … …  
    598605  return adaptedLiftBound;
    599606}
    600 
     607#endif
     608
     609#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    601610CFList
    602611earlyFactorDetect (CanonicalForm& F, CFList& factors, int& adaptedLiftBound,
    … …  
    649658  return result;
    650659}
    651 
     660#endif
     661
     662#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    652663CFList
    653664extEarlyFactorDetect (CanonicalForm& F, CFList& factors, int& adaptedLiftBound,
    … …  
    732743  return result;
    733744}
     745#endif
    734746
    735747#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    … …  
    968980}
    969981
     982#ifdef HAVE_NTL // henselLift23
    970983CFList
    971984henselLiftAndEarly (CanonicalForm& A, CFList& MOD, int*& liftBounds, bool&
    … …  
    12501263  return result;
    12511264}
     1265#endif
    12521266
    12531267void
    … …  
    14601474}
    14611475
     1476#ifdef HAVE_NTL // nonMonicHenselLift12
    14621477CFList
    14631478precomputeLeadingCoeff (const CanonicalForm& LCF, const CFList& LCFFactors,
    … …  
    19451960  return result;
    19461961}
     1962#endif
    19471963
    19481964void
    … …  
    21632179
    21642180#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     2181#ifdef HAVE_NTL // GFBiSqrfFactorize
    21652182void
    21662183factorizationWRTDifferentSecondVars (const CanonicalForm& A, CFList*& Aeval,
    … …  
    22012218  }
    22022219}
     2220#endif
    22032221#endif
    22042222
    … …  
    29032921
    29042922#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     2923#ifdef HAVE_NTL // biSqrfFactorizeHelper
    29052924CFList
    29062925extFactorize (const CanonicalForm& F, const ExtensionInfo& info);
    … …  
    36343653  return factors;
    36353654}
     3655#endif
    36363656
    36373657/// multivariate factorization over an extension of the initial field
     3658#ifdef HAVE_NTL // multiFactorize
    36383659CFList
    36393660extFactorize (const CanonicalForm& F, const ExtensionInfo& info)
    … …  
    38283849}
    38293850#endif
     3851#endif

  • factory/facHensel.cc

    ra8d220b rb28747  
    474474diophantine (const CanonicalForm& F, const CFList& factors);
    475475
     476#ifdef HAVE_NTL // diophantine
    476477CFList
    477478diophantineHensel (const CanonicalForm & F, const CFList& factors,
    … …  
    563564  return result;
    564565}
     566#endif
    565567
    566568/// solve \f$ 1=\sum_{i=1}^n{\delta_{i} \prod_{j\neq i}{f_j}} \f$ mod \f$p^k\f$
Note: See TracChangeset for help on using the changeset viewer.