Changeset f4365f in git for factory

Timestamp:

Jun 23, 2014, 2:49:07 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

949793687548f95943c5a7e30247ef88cc844168

Parents:

1d31b9ab5a347fc7dbdd63db34ebb73ef85f23f2

git-author:

Martin Lee <martinlee84@web.de>2014-06-23 14:49:07+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-06-24 12:06:06+02:00

Message:

fix: compilation without NTL

Location:

factory

Files:

• cfEzgcd.cc (modified) (2 diffs)
• cfGcdUtil.cc (modified) (1 diff)
• cfUnivarGcd.cc (modified) (1 diff)
• cf_gcd.cc (modified) (1 diff)
• cf_irred.cc (modified) (2 diffs)
• facAlgFuncUtil.cc (modified) (1 diff)

factory/cfEzgcd.cc

@@ -789 +789 @@
 }
 
+#ifdef HAVE_NTL
 static inline
 int Hensel_P (const CanonicalForm & UU, CFArray & G, const Evaluation & AA,
@@ -1491 +1492 @@
   return N (d*cand);
 }
-
+#endif
+

factory/cfGcdUtil.cc

@@ -5 +5 @@
 #include "cf_reval.h"
 #include "cf_util.h"
+#include "cf_iter.h"
 #include "gfops.h"
 #include "cf_map_ext.h"

factory/cfUnivarGcd.cc

@@ -1 +1 @@
 #include "config.h"
+
+#include "debug.h"
+
+#include "cf_algorithm.h"
+#include "templates/ftmpl_functions.h"
+#include "cf_primes.h"
+#include "cfGcdUtil.h"
 
 #ifdef HAVE_NTL

factory/cf_gcd.cc

@@ -125 +125 @@
     if ( isOn( SW_USE_EZGCD ) )
       fc= ezgcd (fc, gc);
+#ifdef HAVE_NTL
     else if (isOn(SW_USE_CHINREM_GCD))
       fc = modGCDZ( fc, gc);
+#endif
     else
     {

factory/cf_irred.cc

@@ -36 +36 @@
 }
 
+#ifdef HAVE_NTL
 /// computes a random monic irreducible univariate polynomial in x over Fp of
 /// degree i via NTL
@@ -53 +54 @@
   return CFirredpoly;
 }
+#endif

factory/facAlgFuncUtil.cc

@@ -90 +90 @@
 generateMipo (int degOfExt)
 {
+#ifndef HAVE_NTL
+  FFRandom gen;
+  return find_irreducible (degOfExt, gen, Variable (1));
+#else
   return randomIrredpoly (degOfExt, Variable (1));
+#endif
 }