Changeset 615ca8 in git

Timestamp:

Nov 18, 2011, 3:03:56 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

eb070851d6400fd61a79cd17498882927ecb83df

Parents:

6036d9049f8adc7fa28abe7e6404b7ca2f6c3b99

git-author:

Martin Lee <martinlee84@web.de>2011-11-18 15:03:56+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:27:46+01:00

Message:

added #ifdef HAVE_NTL for linking against libfactory.so

Location:

factory

Files:

• facBivar.cc (modified) (2 diffs)
• facFqBivar.h (modified) (4 diffs)
• facFqBivarUtil.cc (modified) (2 diffs)
• facHensel.h (modified) (2 diffs)

factory/facBivar.cc

@@ -23 +23 @@
 #include "facBivar.h"
 
+#ifdef HAVE_NTL
 TIMING_DEFINE_PRINT(fac_uni_factorizer)
 TIMING_DEFINE_PRINT(fac_hensel_lift)
@@ -395 +396 @@
   return factors;
 }
+
+#endif

factory/facFqBivar.h

@@ -31 +31 @@
 static const double log2exp= 1.442695041;
 
+#ifdef HAVE_NTL
 /// Factorization of a squarefree bivariate polynomials over an arbitrary finite
 /// field, information on the current field we work over is in @a info. @a info
@@ -51 +52 @@
 ///         element is the leading coefficient.
 /// @sa FqBiSqrfFactorize(), GFBiSqrfFactorize()
-#ifdef HAVE_NTL
 inline
 CFList FpBiSqrfFactorize (const CanonicalForm & G ///< [in] a bivariate poly
@@ -440 +440 @@
 }
 
-#endif
-
 /// \f$ \prod_{f\in L} {f (0, x)} \ mod\ M \f$ via divide-and-conquer
 ///
@@ -610 +608 @@
                );
 
-
+#endif
 #endif
 /* FAC_FQ_BIVAR_H */

factory/facFqBivarUtil.cc

@@ -430 +430 @@
 }
 
+#ifdef HAVE_NTL
 CFArray
 logarithmicDerivative (const CanonicalForm& F, const CanonicalForm& G, int l,
@@ -516 +517 @@
   return result;
 }
+#endif
 
 void

factory/facHensel.h

@@ -29 +29 @@
 #include "algext.h"
 
+#ifdef HAVE_NTL
 /// multiplication of univariate polys over a finite field using NTL, if we are
 /// in GF factory's default multiplication is used.
@@ -358 +359 @@
                                            ///< correspondence
                    );
+#endif /* HAVE_NTL */
 #endif
 /* FAC_HENSEL_H */