Changeset 7fdedf in git for factory

Timestamp:

Jul 13, 2020, 5:52:25 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

2486f460fbcdd44c72acea7779937ed446323e1f

Parents:

7c7d2697b29c975a9f58a4232aedffacdabc13ec

Message:

factory: check for NTL/FLINT, p2

Location:

factory

Files:

• cf_char.cc (modified) (3 diffs)
• cf_util.h (modified) (1 diff)
• facBivar.cc (modified) (3 diffs)
• facFqBivar.cc (modified) (2 diffs)
• facFqSquarefree.cc (modified) (1 diff)
• fac_cantzass.cc (modified) (2 diffs)
• fac_sqrfree.cc (modified) (3 diffs)
• fac_univar.cc (modified) (2 diffs)
• int_pp.cc (modified) (2 diffs)

factory/cf_char.cc

@@ -18 +18 @@
 #include "cf_util.h"
 #include "int_pp.h"
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h" // for __FLINT_RELEASE
+#endif
 
 STATIC_VAR int theCharacteristic = 0;
@@ -44 +48 @@
 }
 
-#if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
+#if !defined(HAVE_NTL)
+#if !defined(HAVE_FLINT) || (__FLINT_RELEASE==20600)
 void setCharacteristic( int c, int n )
 {
@@ -52 +57 @@
     CFFactory::settype( PrimePowerDomain );
 }
+#endif
 #endif
 

factory/cf_util.h

@@ -4 +4 @@
 #define INCL_CF_UTIL_H
 
-// #include "config.h"
+#include "globaldefs.h"
 
 int ilog2 (int a);

factory/facBivar.cc

@@ -16 +16 @@
 
 #include "cf_assert.h"
+#include "cf_util.h"
 #include "debug.h"
 #include "timing.h"
@@ -553 +554 @@
     ZZ NTLD= discriminant (NTLmipo);
     den= abs (convertZZ2CF (NTLD*NTLf));
+    #else
+    factoryError("NTL/FLINT missing: biFactorize");
     #endif
 
@@ -572 +575 @@
     #elif defined(HAVE_NTL)
     CanonicalForm discMipo= convertZZ2CF (NTLD);
+    #else
+    factoryError("NTL/FLINT missing: biFactorize");
     #endif
     findGoodPrime (F*discMipo,i);

factory/facFqBivar.cc

@@ -22 +22 @@
 
 #include "cf_assert.h"
+#include "cf_util.h"
 #include "debug.h"
 #include "timing.h"
@@ -841 +842 @@
   BuildIrred (NTLIrredpoly, i*m);
   CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
+  #else
+  factoryError("NTL/FLINT missing: chooseExtension");
   #endif
   return rootOf (newMipo);

factory/facFqSquarefree.cc

@@ -258 +258 @@
     buffer= pthRoot (A, q, alpha);
   }
+#else
+  factoryError("NTL/FLINT missing: squarefreeFactorization");
 #endif
 

factory/fac_cantzass.cc

@@ -14 +14 @@
 #include "gmpext.h"
 
-#if !defined(HAVE_FLINT) && !defined(HAVE_NTL)
+#ifdef HAVE_FLINT
+#include"FLINTconvert.h"
+#endif
+
+#if !defined(HAVE_NTL)
+#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
 static CanonicalForm randomPoly( int n, const Variable & x, const CFRandom & gen );
 
@@ -292 +297 @@
 }
 #endif
+#endif

factory/fac_sqrfree.cc

@@ -11 +11 @@
 #include "cf_map.h"
 #include "cf_algorithm.h"
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h" // for __FLINT_RELEASE
+#endif
 
 static int
@@ -150 +154 @@
 }
 
-#if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
+#if !defined(HAVE_NTL)
+#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
 static int divexp = 1;
 
@@ -206 +211 @@
 }
 #endif
+#endif

factory/fac_univar.cc

@@ -20 +20 @@
 #include "cfUnivarGcd.h"
 
-#if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h" // for __FLINT_RELEASE
+#endif
+
+#if !defined(HAVE_NTL)
+#if !defined(HAVE_FLINT) || (__FLINT_RELEASE==20600)
 TIMING_DEFINE_PRINT(fac_choosePrimes)
 TIMING_DEFINE_PRINT(fac_facModPrimes)
@@ -565 +570 @@
 }
 #endif
+#endif

factory/int_pp.cc

@@ -13 +13 @@
 #include "imm.h"
 
-#if !defined(HAVE_NTL) && !defined(HAVE_FLINT)
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+#endif
+
+#if !defined(HAVE_NTL)
+#if !defined(HAVE_FLINT)||(__FLINT_RELEASE==20600)
 GLOBAL_VAR mpz_t InternalPrimePower::primepow;
 GLOBAL_VAR mpz_t InternalPrimePower::primepowhalf;
@@ -410 +415 @@
 //}}}
 #endif
+#endif