Changeset 329dd3 in git

Timestamp:

Jun 17, 2020, 10:38:49 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

a75c5d55f5f22a81f3d176edfa4c64c01e1672a4

Parents:

cac0f8a0c0c0b22b71b76c3b44841f5cc1fec229

Message:

build factroy also without NTL (not so useful yet)

Location:

factory

Files:

• cf_factor.cc (modified) (5 diffs)
• facMul.cc (modified) (1 diff)
• facMul.h (modified) (2 diffs)

factory/cf_factor.cc

@@ -509 +509 @@
     else
     {
-      #if defined(HAVE_NTL) || defined(HAVE_FLINT)
+      #if defined(HAVE_NTL)
       if (issqrfree)
       {
@@ -530 +530 @@
       }
       #else
-      ASSERT( f.isUnivariate(), "multivariate factorization depends on FLINT/NTL(missing)" );
-      factoryError ("multivariate factorization depends on FLINT/NTL(missing)");
+      ASSERT( f.isUnivariate(), "multivariate factorization depends on NTL(missing)" );
+      factoryError ("multivariate factorization depends on NTL(missing)");
       return CFFList (CFFactor (f, 1));
       #endif
@@ -619 +619 @@
       }
       else
+      {
+        #ifdef HAVE_NTL
         F = ratFactorize (fz);
+        #else
+        factoryError ("multivariate factorization over Z depends on NTL(missing)");
+        return CFFList (CFFactor (f, 1));
+        #endif
+      }
       Off (SW_RATIONAL);
     }
@@ -763 +770 @@
     else
     {
+      #ifdef HAVE_NTL
       F= FqFactorize (f, alpha);
+      #else
+      factoryError ("univariate factorization  depends on NTL(missing)");
+      return CFFList (CFFactor (f, 1));
+      #endif
     }
   }
@@ -774 +786 @@
     else //Q(a)[x1,...,xn]
     {
+      #ifdef HAVE_NTL
       F= ratFactorize (f, alpha);
+      #else
+      factoryError ("multivariate factorization  depends on NTL(missing)");
+      return CFFList (CFFactor (f, 1));
+      #endif
     }
   }

factory/facMul.cc

@@ -27 +27 @@
 #include "facMul.h"
 #include "cf_util.h"
+#include "cf_iter.h"
+#include "cf_algorithm.h"
 #include "templates/ftmpl_functions.h"
 

factory/facMul.h

@@ -18 +18 @@
 #include "fac_util.h"
 
-#ifdef HAVE_NTL
 /// multiplication of univariate polys using FLINT/NTL over F_p, F_q, Z/p^k,
 /// Z/p^k[t]/(f), Z, Q, Q(a), if we are in GF factory's default multiplication
@@ -175 +174 @@
              );
 #endif
-#endif
 
 #endif