Changeset d990001 in git

Timestamp:

Sep 26, 2011, 4:43:09 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

dfc60c82a16c9b03ecb8def0e0bff88d77446b9e

Parents:

f86531bba4599504e5ff7c611b008080720c66da

git-author:

Martin Lee <martinlee84@web.de>2011-09-26 16:43:09+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:32+01:00

Message:

HAVE_NTL stuff

Location:

factory

Files:

• cf_factor.cc (modified) (1 diff)
• cf_gcd.cc (modified) (3 diffs)
• cf_map_ext.cc (modified) (7 diffs)
• facBivar.cc (modified) (1 diff)
• facBivar.h (modified) (3 diffs)
• facFactorize.cc (modified) (3 diffs)
• facFactorize.h (modified) (2 diffs)
• facFqFactorize.h (modified) (2 diffs)

factory/cf_factor.cc

@@ -805 +805 @@
   else //Q(a)[x1,...,xn]
   {
+#ifdef HAVE_NTL
     F= ratFactorize (f, alpha);
+#else
+    ASSERT( f.isUnivariate(), "multivariate factorization not implemented" );
+#endif
   }
   if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);

factory/cf_gcd.cc

@@ -21 +21 @@
 #include "cf_map_ext.h"
 #include "cf_util.h"
+#include "gfops.h"
 
 #ifdef HAVE_NTL
@@ -100 +101 @@
     {
       bool extOfExt= false;
+#ifdef HAVE_NTL
       int d= degree (getMipo (v));
       CFList source, dest;
@@ -150 +152 @@
         v= v2;
       }
+#endif
     }
 

factory/cf_map_ext.cc

@@ -24 +24 @@
 #include "canonicalform.h"
 #include "cf_util.h"
+#include "imm.h"
+#include "cf_iter.h"
 
 #ifdef HAVE_NTL
@@ -35 +37 @@
 #include "cf_map_ext.h"
 
-#ifdef HAVE_NTL
-
 /// helper function
 int findItem (const CFList& list, const CanonicalForm& item)
@@ -64 +64 @@
 }
 
-
+#ifdef HAVE_NTL
 /// \f$ F_{p} (\alpha ) \subset F_{p}(\beta ) \f$ and \f$ \alpha \f$ is a
 /// primitive element, returns the image of \f$ \alpha \f$
@@ -78 +78 @@
   return convertNTLzzpE2CF (root, beta);
 }
+
+#endif
 
 /// the CanonicalForm G is the output of map_up, returns F considered as an
@@ -307 +309 @@
 }
 
+#ifdef HAVE_NTL
 /// determine a primitive element of \f$ F_{p} (\alpha ) \f$,
 /// \f$ \beta \f$ is a primitive element of a field which is isomorphic to
@@ -348 +351 @@
   return convertNTLzzpE2CF (root, alpha);
 }
+#endif
 
 CanonicalForm
@@ -367 +371 @@
 }
 
+#ifdef HAVE_NTL
 CanonicalForm
 mapPrimElem (const CanonicalForm& primElem, const Variable& alpha,

factory/facBivar.cc

@@ -19 +19 @@
 #include "timing.h"
 
+#include "cf_algorithm.h"
 #include "facFqBivar.h"
 #include "facBivar.h"

factory/facBivar.h

@@ -16 +16 @@
 #define FAC_BIVAR_H
 
-// #include "config.h"
+#include <config.h>
 
 #include "assert.h"
@@ -39 +39 @@
 /// @ return @a ratBiSqrfFactorize returns a list of monic factors, the first
 ///         element is the leading coefficient.
+#ifdef HAVE_NTL
 inline
 CFList ratBiSqrfFactorize (const CanonicalForm & G, ///< [in] a bivariate poly
@@ -146 +147 @@
 }
 
+#endif
+
 /// convert a CFFList to a CFList by dropping the multiplicity
 CFList conv (const CFFList& L ///< [in] a CFFList

factory/facFactorize.cc

@@ -19 +19 @@
 #include "timing.h"
 
+#include "cf_algorithm.h"
 #include "facFqFactorizeUtil.h"
 #include "facFactorize.h"
@@ -29 +30 @@
 #include "cf_reval.h"
 
+#ifdef HAVE_NTL
 CFList evalPoints (const CanonicalForm& F, CFList& eval, Evaluation& E)
 {
@@ -884 +886 @@
   return factors;
 }
+
+#endif

factory/facFactorize.h

@@ -33 +33 @@
 /// @return @a ratSqrfFactorize returns a list of monic factors, the first
 ///         element is the leading coefficient.
+#ifdef HAVE_NTL
 inline
 CFList ratSqrfFactorize (const CanonicalForm & G, ///< [in] a multivariate poly
@@ -89 +90 @@
   return result;
 }
+#endif
 
 #endif

factory/facFqFactorize.h

@@ -40 +40 @@
 ///         element is the leading coefficient.
 /// @sa FqSqrfFactorize(), GFSqrfFactorize()
+#ifdef HAVE_NTL
 inline
 CFList FpSqrfFactorize (const CanonicalForm & F ///< [in] a multivariate poly
@@ -231 +232 @@
 }
 
+#endif
+
 /// Naive factor recombination for multivariate factorization over an extension
 /// of the initial field. No precomputed is used to exclude combinations.