Changeset 0341f1 in git

Timestamp:

Jan 27, 2021, 8:01:47 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

3f6520f1c7bb6b3f1b488999d99fba9a01350437

Parents:

de0206679260cf307f7081a89657f8875ef6d7f3

Message:

fix: absFactorize with Flint, w/o NTL

Files:

• Singular/extra.cc (modified) (2 diffs)
• factory/cfModResultant.cc (modified) (2 diffs)
• factory/facAbsBiFact.cc (modified) (4 diffs)
• factory/facAbsBiFact.h (modified) (2 diffs)
• factory/facAbsFact.cc (modified) (2 diffs)
• factory/facAbsFact.h (modified) (3 diffs)

Singular/extra.cc

@@ -1011 +1011 @@
     else
   /*================= absBiFact ======================*/
-    #ifdef HAVE_NTL
     if (strcmp(sys_cmd, "absFact") == 0)
     {
@@ -1042 +1041 @@
     }
     else
-    #endif
   /* =================== LLL via NTL ==============================*/
   #ifdef HAVE_NTL

factory/cfModResultant.cc

@@ -555 +555 @@
   return result;
 }
-#ifdef HAVE_NTL // mapPrimitiveElem
+
 CanonicalForm
 resultantZ (const CanonicalForm& A, const CanonicalForm& B, const Variable& x,
@@ -684 +684 @@
 }
 #endif
-#endif
-
+

factory/facAbsBiFact.cc

@@ -208 +208 @@
 }
 
-#ifdef HAVE_NTL // henselLiftAndEarly
 //G is assumed to be bivariate, irreducible over Q, primitive wrt x and y, compressed
 CFAFList absBiFactorizeMain (const CanonicalForm& G, bool full)
@@ -470 +469 @@
     convertFmpz_poly_t2FacCF ((fmpz_poly_t &)liftedFactors->p[1],x);
     modpk pk= modpk (p, k);
-#else
+#elif defined(HAVE_NTL)
     modpk pk= modpk (p, k);
     ZZX NTLFi=convertFacCF2NTLZZX (pk (Fi*pk.inverse (lc(Fi))));
@@ -503 +502 @@
     CanonicalForm otherFactor=
                   convertNTLZZX2CF (liftedFactors[1], x);
+#else
+   factoryError("absBiFactorizeMain: NTL/FLINT missing");
 #endif
 
@@ -851 +852 @@
 }
 #endif
-#endif

factory/facAbsBiFact.h

@@ -17 +17 @@
 #include "canonicalform.h"
 
-#ifdef HAVE_NTL
 /// main absolute factorization routine, expects bivariate poly which is
 /// irreducible over Q
@@ -33 +32 @@
                                                      ///< returned
                             );
-#endif
 
 /// normalize factors, i.e. make factors monic

factory/facAbsFact.cc

@@ -32 +32 @@
 #endif
 
-#if defined(HAVE_NTL)
 TIMING_DEFINE_PRINT(abs_fac_bi_factorizer)
 TIMING_DEFINE_PRINT(abs_fac_hensel_lift)
@@ -940 +939 @@
 }
 
-#endif

factory/facAbsFact.h

@@ -16 +16 @@
 #include "facAbsBiFact.h"
 
-#if defined(HAVE_NTL)
 /// main absolute factorization routine, expects poly which is
 /// irreducible over Q
@@ -29 +28 @@
 CFAFList absFactorizeMain (const CanonicalForm& F ///<[in] irred poly over Q
                           );
-#endif
 
 /*BEGINPUBLIC*/
-#if defined(HAVE_NTL)
 /// absolute factorization of a multivariate poly over Q
 ///
@@ -44 +41 @@
 CFAFList absFactorize (const CanonicalForm& G ///<[in] poly over Q
                       );
-#endif
 /*ENDPUBLIC*/