Changeset d78356 in git for factory/facFqBivar.cc

Timestamp:

Jul 4, 2020, 3:13:10 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

89005e409e564feafbec751f5c65109638c47368

Parents:

7032db2a39319cc0c7a7814003e93cae02793c5e67e34d703a09cd2924973f990bf59c52ba5c4cd2

Message:

Merge branch 'execute' of https://github.com/sachinkm308/Sources into sachinkm308-execute

File:

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

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