Changeset 7032db in git

Timestamp:

Jul 4, 2020, 1:57:00 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

89005e409e564feafbec751f5c65109638c47368d78356197b75c5a7efd1896ede6a66356bbb6d94

Parents:

cbdf0e507d7f2e431e05eeee9c7e8a7437d2c9c8

Message:

factory: more routine does not depend on NTL only

Location:

factory

Files:

• facFactorize.cc (modified) (4 diffs)
• facFqBivar.cc (modified) (19 diffs)

factory/facFactorize.cc

@@ -45 +45 @@
 TIMING_DEFINE_PRINT(fac_compress)
 
-#ifdef HAVE_NTL
 CFList evalPoints (const CanonicalForm& F, CFList& eval, Evaluation& E)
 {
@@ -154 +153 @@
 }
 
+#ifdef HAVE_NTL // ratBiSqrfFactorize
 void
 factorizationWRTDifferentSecondVars (const CanonicalForm& A, CFList*& Aeval,
@@ -190 +190 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_NTL // ratBiSqrfFactorize
 CFList
 multiFactorize (const CanonicalForm& F, const Variable& v)
@@ -829 +831 @@
   return factors;
 }
-
 #endif

factory/facFqBivar.cc

@@ -155 +155 @@
 }
 
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CFList
 uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
@@ -360 +361 @@
   return uniFactors;
 }
+#endif
 
 #if defined(HAVE_NTL) || defined(HAVE_FLINT)
@@ -800 +802 @@
 }
 
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
 {
@@ -844 +847 @@
   return rootOf (newMipo);
 }
+#endif
 
 void
@@ -1461 +1465 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 long isReduced (const mat_zz_p& M)
 {
@@ -1499 +1503 @@
 #endif
   
-#ifdef HAVE_NTL // mat_zz_pE
+#ifdef HAVE_NTL
 long isReduced (const mat_zz_pE& M)
 {
@@ -1518 +1522 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 int * extractZeroOneVecs (const mat_zz_p& M)
 {
@@ -1570 +1574 @@
 #endif
 
-#ifdef HAVE_NTL // mat_zz_pE
+#ifdef HAVE_NTL
 int * extractZeroOneVecs (const mat_zz_pE& M)
 {
@@ -1596 +1600 @@
 #endif
 
-#ifdef HAVE_NTL // mat_zz_pE
+#ifdef HAVE_NTL
 void
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
@@ -1680 +1684 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 void
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
@@ -1848 +1852 @@
 #endif
 
-#ifdef HAVE_NTL //mat_zz_pE
+#ifdef HAVE_NTL
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
@@ -1899 +1903 @@
 #endif
 
-#ifdef HAVE_NTL // mat_zz_pE
+#ifdef HAVE_NTL
 CFList
 monicReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
@@ -1952 +1956 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 CFList
 extReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
@@ -2114 +2118 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
@@ -2216 +2220 @@
 #endif
 
-#ifndef HAVE_FLINT
+#ifdef HAVE_NTL
 void
 extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const
@@ -2476 +2480 @@
 #endif
 
-#ifndef HAVE_FLINT
-#ifdef HAVE_NTL // logarithmicDerivative
+#ifdef HAVE_NTL
 //over Fp
 int
@@ -2600 +2603 @@
   return l;
 }
-#endif
 #endif
 
@@ -2742 +2744 @@
 #endif
 
-#ifndef HAVE_FLINT
-#ifdef HAVE_NTL //logarithmicDerivative
+#ifdef HAVE_NTL
 //over field extension
 int
@@ -2939 +2940 @@
   return l;
 }
-#endif
 #endif