Changeset 7032db in git


Ignore:
Timestamp:
Jul 4, 2020, 1:57:00 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
89005e409e564feafbec751f5c65109638c47368d78356197b75c5a7efd1896ede6a66356bbb6d94
Parents:
cbdf0e507d7f2e431e05eeee9c7e8a7437d2c9c8
Message:
factory: more routine does not depend on NTL only
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/facFactorize.cc

    rcbdf0e r7032db  
    4545TIMING_DEFINE_PRINT(fac_compress)
    4646
    47 #ifdef HAVE_NTL
    4847CFList evalPoints (const CanonicalForm& F, CFList& eval, Evaluation& E)
    4948{
     
    154153}
    155154
     155#ifdef HAVE_NTL // ratBiSqrfFactorize
    156156void
    157157factorizationWRTDifferentSecondVars (const CanonicalForm& A, CFList*& Aeval,
     
    190190  }
    191191}
    192 
     192#endif
     193
     194#ifdef HAVE_NTL // ratBiSqrfFactorize
    193195CFList
    194196multiFactorize (const CanonicalForm& F, const Variable& v)
     
    829831  return factors;
    830832}
    831 
    832833#endif
  • factory/facFqBivar.cc

    rcbdf0e r7032db  
    155155}
    156156
     157#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    157158CFList
    158159uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
     
    360361  return uniFactors;
    361362}
     363#endif
    362364
    363365#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     
    800802}
    801803
     804#if defined(HAVE_NTL) || defined(HAVE_FLINT)
    802805Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
    803806{
     
    844847  return rootOf (newMipo);
    845848}
     849#endif
    846850
    847851void
     
    14611465#endif
    14621466
    1463 #ifndef HAVE_FLINT
     1467#ifdef HAVE_NTL
    14641468long isReduced (const mat_zz_p& M)
    14651469{
     
    14991503#endif
    15001504 
    1501 #ifdef HAVE_NTL // mat_zz_pE
     1505#ifdef HAVE_NTL
    15021506long isReduced (const mat_zz_pE& M)
    15031507{
     
    15181522#endif
    15191523
    1520 #ifndef HAVE_FLINT
     1524#ifdef HAVE_NTL
    15211525int * extractZeroOneVecs (const mat_zz_p& M)
    15221526{
     
    15701574#endif
    15711575
    1572 #ifdef HAVE_NTL // mat_zz_pE
     1576#ifdef HAVE_NTL
    15731577int * extractZeroOneVecs (const mat_zz_pE& M)
    15741578{
     
    15961600#endif
    15971601
    1598 #ifdef HAVE_NTL // mat_zz_pE
     1602#ifdef HAVE_NTL
    15991603void
    16001604reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
     
    16801684#endif
    16811685
    1682 #ifndef HAVE_FLINT
     1686#ifdef HAVE_NTL
    16831687void
    16841688reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
     
    18481852#endif
    18491853
    1850 #ifdef HAVE_NTL //mat_zz_pE
     1854#ifdef HAVE_NTL
    18511855CFList
    18521856reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
     
    18991903#endif
    19001904
    1901 #ifdef HAVE_NTL // mat_zz_pE
     1905#ifdef HAVE_NTL
    19021906CFList
    19031907monicReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
     
    19521956#endif
    19531957
    1954 #ifndef HAVE_FLINT
     1958#ifdef HAVE_NTL
    19551959CFList
    19561960extReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
     
    21142118#endif
    21152119
    2116 #ifndef HAVE_FLINT
     2120#ifdef HAVE_NTL
    21172121CFList
    21182122reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
     
    22162220#endif
    22172221
    2218 #ifndef HAVE_FLINT
     2222#ifdef HAVE_NTL
    22192223void
    22202224extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const
     
    24762480#endif
    24772481
    2478 #ifndef HAVE_FLINT
    2479 #ifdef HAVE_NTL // logarithmicDerivative
     2482#ifdef HAVE_NTL
    24802483//over Fp
    24812484int
     
    26002603  return l;
    26012604}
    2602 #endif
    26032605#endif
    26042606
     
    27422744#endif
    27432745
    2744 #ifndef HAVE_FLINT
    2745 #ifdef HAVE_NTL //logarithmicDerivative
     2746#ifdef HAVE_NTL
    27462747//over field extension
    27472748int
     
    29392940  return l;
    29402941}
    2941 #endif
    29422942#endif
    29432943
Note: See TracChangeset for help on using the changeset viewer.