Changeset 48e0bcb in git for factory/facMul.cc

Timestamp:

Jun 17, 2020, 3:34:43 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e4514d3151a5c53437b9fa2f30bda8febfd87539ed6f2bb0876535189130e32d71be46f776012a36

Parents:

95e373294f19817a4516238a9d8dd18b1a626ab9

Message:

seperate NTL and FLINT: nulNTL and factorize

File:

• factory/facMul.cc (modified) (10 diffs)

factory/facMul.cc

@@ -32 +32 @@
 #include <NTL/lzz_pEX.h>
 #include "NTLconvert.h"
+#endif
 
 #ifdef HAVE_FLINT
@@ -452 +453 @@
         fq_ctx_clear (fq_con);
         return b (result);
-#else
+#endif
+#ifdef HAVE_NTL
         ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
         ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (mipo));
@@ -489 +491 @@
       }
       return mulFLINTQ (F, G);
-#else
+#endif
+#ifdef HAVE_NTL
       if (b.getp() != 0)
       {
@@ -569 +572 @@
 
           return b (result);
-#else
+#endif
+#ifdef HAVE_NTL
           ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
           ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
@@ -607 +611 @@
   ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
   ASSERT (F.level() == G.level(), "expected polys of same level");
+#ifdef HAVE_NTL
 #if (!defined(HAVE_FLINT) ||  __FLINT_RELEASE < 20400)
   if (fac_NTL_char != getCharacteristic())
@@ -613 +618 @@
     zz_p::init (getCharacteristic());
   }
+#endif
 #endif
   Variable alpha;
@@ -646 +652 @@
     nmod_poly_clear (FLINTmipo);
     fq_nmod_ctx_clear (fq_con);
-#else
+    return result;
+#elif defined(AHVE_NTL)
     zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
     zz_pE::init (NTLMipo);
@@ -653 +660 @@
     mul (NTLF, NTLF, NTLG);
     result= convertNTLzz_pEX2CF(NTLF, F.mvar(), alpha);
+    return result;
 #endif
   }
@@ -665 +673 @@
     nmod_poly_clear (FLINTF);
     nmod_poly_clear (FLINTG);
-#else
+    return result;
+#endif
+#ifdef HAVE_NTL
     zz_pX NTLF= convertFacCF2NTLzzpX (F);
     zz_pX NTLG= convertFacCF2NTLzzpX (G);
     mul (NTLF, NTLF, NTLG);
-    result= convertNTLzzpX2CF(NTLF, F.mvar());
-#endif
-  }
-  return result;
+    return convertNTLzzpX2CF(NTLF, F.mvar());
+#endif
+  }
+  return F*G;
 }
 
@@ -3735 +3745 @@
 // end division
 
-#endif