Changeset 03c742 in git for factory/facFqBivar.cc

Timestamp:

Jun 26, 2020, 6:03:59 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f87a54f01779194a0163ca39873f5b4255a4f510

Parents:

b666c768103c724ed3617954c684de0e621144d2

Message:

factory: BuildIrred, FLINT/NTL seperation

File:

• factory/facFqBivar.cc (modified) (57 diffs)

factory/facFqBivar.cc

@@ -39 +39 @@
 #ifdef HAVE_NTL
 #include "NTLconvert.h"
+#endif
 
 #ifdef HAVE_FLINT
@@ -79 +80 @@
 }
 
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CanonicalForm evalPoint (const CanonicalForm& F, CanonicalForm & eval,
                          const Variable& alpha, CFList& list, const bool& GF,
@@ -170 +172 @@
     Variable beta= rootOf (mipo.mapinto());
     CanonicalForm buf= GF2FalphaRep (A, beta);
+#ifdef HAVE_NTL    
     if (getCharacteristic() > 2)
+#else
+    if (getCharacteristic() > 0)
+#endif
     {
 #if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
@@ -215 +221 @@
 #endif
     }
+#ifdef HAVE_NTL    
     else
     {
@@ -226 +233 @@
                                                            x, beta);
     }
+#endif    
     setCharacteristic (getCharacteristic(), k, cGFName);
     for (CFFListIterator i= factorsA; i.hasItem(); i++)
@@ -237 +245 @@
   else if (alpha.level() != 1)
   {
+#ifdef HAVE_NTL  
     if (getCharacteristic() > 2)
+#else
+    if (getCharacteristic() > 0)
+#endif
     {
 #if (HAVE_FLINT && __FLINT_RELEASE >= 20400)
@@ -282 +294 @@
 #endif
     }
+#ifdef HAVE_NTL
     else
     {
@@ -293 +306 @@
                                                            x, alpha);
     }
+#endif    
   }
   else
   {
 #ifdef HAVE_FLINT
+#ifdef HAVE_NTL
     if (degree (A) < 300)
+#endif    
     {
       nmod_poly_t FLINTA;
@@ -310 +326 @@
       nmod_poly_clear (FLINTA);
     }
+#ifdef HAVE_NTL
     else
 #endif
+#endif /* HAVE_FLINT */
+#ifdef HAVE_NTL
     if (getCharacteristic() > 2)
     {
@@ -334 +353 @@
                                                           x);
     }
+#endif
   }
   CFList uniFactors;
@@ -780 +800 @@
 Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
 {
+  #if 0//#ifdef HAVE_NTL
   if (fac_NTL_char != getCharacteristic())
   {
@@ -786 +807 @@
   }
   zz_pX NTLIrredpoly;
+  #elif defined(HAVE_FLINT)
+  nmod_poly_t Irredpoly;
+  nmod_poly_init(Irredpoly,getCharacteristic());
+  #endif
   int i=1, m= 2;
   // extension of F_p needed
@@ -808 +833 @@
     i= degree (getMipo (alpha))/m + 1;
   }
+  #if 0 //#ifdef HAVE_NTL
   BuildIrred (NTLIrredpoly, i*m);
   CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
+  #elif defined(HAVE_FLINT)
+  nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
+  CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
+  #endif
   return rootOf (newMipo);
 }
@@ -1112 +1142 @@
 }
 
+#ifdef HAVE_NTL // henselLift12
 CFList
 henselLiftAndEarly (CanonicalForm& A, bool& earlySuccess, CFList&
@@ -1412 +1443 @@
   return bufUniFactors;
 }
-
+#endif
+
+#ifdef HAVE_NTL // henselLiftAndEarly
 CFList
 henselLiftAndEarly (CanonicalForm& A, bool& earlySuccess, CFList&
@@ -1424 +1457 @@
                              uniFactors, info, eval, dummy, den);
 }
+#endif
 
 #ifndef HAVE_FLINT
@@ -1462 +1496 @@
 }
 #endif
-
+  
+#ifdef HAVE_NTL // mat_zz_pE
 long isReduced (const mat_zz_pE& M)
 {
@@ -1479 +1514 @@
   return 1;
 }
+#endif
 
 #ifndef HAVE_FLINT
@@ -1532 +1568 @@
 #endif
 
+#ifdef HAVE_NTL // mat_zz_pE
 int * extractZeroOneVecs (const mat_zz_pE& M)
 {
@@ -1555 +1592 @@
   return result;
 }
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 void
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
@@ -1637 +1676 @@
     F= bufF (y+eval,y);
 }
+#endif
 
 #ifndef HAVE_FLINT
@@ -1806 +1846 @@
 #endif
 
+#ifdef HAVE_NTL //mat_zz_pE
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
@@ -1854 +1895 @@
   return result;
 }
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 CFList
 monicReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
@@ -1905 +1948 @@
   return result;
 }
+#endif
 
 #ifndef HAVE_FLINT
@@ -2431 +2475 @@
 
 #ifndef HAVE_FLINT
+#ifdef HAVE_NTL // logarithmicDerivative
 //over Fp
 int
@@ -2554 +2599 @@
 }
 #endif
-
-#ifdef HAVE_FLINT
+#endif
+
+#ifdef HAVE_FLINT
+#ifdef HAVE_NTL // henselLift12
 int
 liftAndComputeLattice (const CanonicalForm& F, int* bounds, int sizeBounds, int
@@ -2691 +2738 @@
 }
 #endif
+#endif
 
 #ifndef HAVE_FLINT
+#ifdef HAVE_NTL //logarithmicDerivative
 //over field extension
 int
@@ -2889 +2938 @@
 }
 #endif
-
-#ifdef HAVE_FLINT
+#endif
+
+#ifdef HAVE_FLINT
+#ifdef HAVE_NTL // henselLift12
 //over field extension
 int
@@ -3097 +3148 @@
 }
 #endif
+#endif
 
 // over Fq
+#ifdef HAVE_NTL
 int
 liftAndComputeLattice (const CanonicalForm& F, int* bounds, int sizeBounds,
@@ -3230 +3283 @@
   return l;
 }
-
+#endif
+
+#ifdef HAVE_NTL // henselLift12
 #ifdef HAVE_FLINT
 int
@@ -3412 +3467 @@
   return l;
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int factorsFound,
@@ -3619 +3676 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int factorsFound,
@@ -3758 +3817 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 //over field extension
 CFList
@@ -4065 +4126 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 CFList
 increasePrecision2 (const CanonicalForm& F, CFList& factors,
@@ -4196 +4259 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 CFList
 increasePrecisionFq2Fp (CanonicalForm& F, CFList& factors, int factorsFound,
@@ -4404 +4469 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -4572 +4639 @@
   return result;
 }
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int oldL, int
@@ -4677 +4746 @@
   return result;
 }
+#endif
 
 //over field extension
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -4934 +5005 @@
   return result;
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -5092 +5165 @@
   return result;
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -5325 +5400 @@
   return CFList();
 }
+#endif
 
 //Fq
+#ifdef HAVE_NTL
 CFList
 furtherLiftingAndIncreasePrecision (CanonicalForm& F, CFList&
@@ -5470 +5547 @@
   return CFList();
 }
+#endif
 
 //over field extension
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -5785 +5864 @@
   return CFList();
 }
-
+#endif
+
+#ifdef HAVE_NTL // logarithmicDerivative
 #ifdef HAVE_FLINT
 CFList
@@ -6018 +6099 @@
   return CFList();
 }
+#endif
 
 #ifndef HAVE_FLINT
@@ -6052 +6134 @@
 
 #ifdef HAVE_FLINT
+#ifdef HAVE_NTL // henselLift12
 void
 refineAndRestartLift (const CanonicalForm& F, const nmod_mat_t FLINTN, int
@@ -6082 +6165 @@
 }
 #endif
-
+#endif
+
+#ifdef HAVE_NTL // mat_zz_pE
 void
 refineAndRestartLift (const CanonicalForm& F, const mat_zz_pE& NTLN, int
@@ -6112 +6197 @@
   henselLift12 (F, factors, l, Pi, diophant, M);
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -6327 +6413 @@
 }
 
+#ifdef HAVE_NTL // mat_zz_pE
 CFList
 earlyReconstructionAndLifting (const CanonicalForm& F, const mat_zz_pE& N,
@@ -6483 +6570 @@
   return result;
 }
+#endif
 
 //over field extension
@@ -6668 +6756 @@
 }
 
+#ifdef HAVE_NTL // henselLift12
 CFList
 sieveSmallFactors (const CanonicalForm& G, CFList& uniFactors, DegreePattern&
@@ -6712 +6801 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_NTL // henselLift12
 CFList
 extSieveSmallFactors (const CanonicalForm& G, CFList& uniFactors, DegreePattern&
@@ -6760 +6851 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_NTL // matrix Fq
 CFList
 henselLiftAndLatticeRecombi (const CanonicalForm& G, const CFList& uniFactors,
@@ -7556 +7649 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_NTL //primitiveElement
 ExtensionInfo
 init4ext (const ExtensionInfo& info, const CanonicalForm& evaluation,
@@ -7609 +7704 @@
   return info2;
 }
-
+#endif
+
+#ifdef HAVE_NTL // init4ext
 CFList
 extHenselLiftAndLatticeRecombi(const CanonicalForm& G, const CFList& uniFactors,
@@ -8193 +8290 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_NTL // henselLiftAndLatticeRecombi
 CFList
 extBiFactorize (const CanonicalForm& F, const ExtensionInfo& info);
@@ -8821 +8920 @@
   return factors;
 }
-
+#endif
+
+#ifdef HAVE_NTL // primitiveElement
 CFList
 extBiFactorize (const CanonicalForm& F, const ExtensionInfo& info)
@@ -8995 +9096 @@
   }
 }
-
-#endif
-/* HAVE_NTL */
-
-
+#endif
+#endif