chg: use NTL zz_p* instead of ZZ_p*, deleted unneccessary includes

Author: mmklee

factory/cf_gcd_smallp.cc

@@ -36,7 +36,6 @@
 #include "cf_map_ext.h"
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEX.h>
 #include <NTLconvert.h>
 #endif
 
@@ -430,16 +429,15 @@ static inline
 void choose_extension (const int& d, const int& num_vars, Variable& beta)
 {
   int p= getCharacteristic();
-  ZZ NTLp= to_ZZ (p);
-  ZZ_p::init (NTLp);
-  ZZ_pX NTLirredpoly;
+  zz_p::init (p);
+  zz_pX NTLirredpoly;
   //TODO: replace d by max_{i} (deg_x{i}(f))
   int i= (int) (log ((double) ipower (d + 1, num_vars))/log ((double) p));
   int m= degree (getMipo (beta));
   if (i <= 1)
     i= 2;
   BuildIrred (NTLirredpoly, i*m);
-  CanonicalForm mipo= convertNTLZZpX2CF (NTLirredpoly, Variable(1));
+  CanonicalForm mipo= convertNTLzzpX2CF (NTLirredpoly, Variable(1));
   beta= rootOf (mipo);
 }
 
@@ -1330,12 +1328,11 @@ CanonicalForm
 randomIrredpoly (int i, const Variable & x)
 {
   int p= getCharacteristic();
-  ZZ NTLp= to_ZZ (p);
-  ZZ_p::init (NTLp);
-  ZZ_pX NTLirredpoly;
+  zz_p::init (p);
+  zz_pX NTLirredpoly;
   CanonicalForm CFirredpoly;
   BuildIrred (NTLirredpoly, i + 1);
-  CFirredpoly= convertNTLZZpX2CF (NTLirredpoly, x);
+  CFirredpoly= convertNTLzzpX2CF (NTLirredpoly, x);
   return CFirredpoly;
 }
 

factory/cf_map_ext.cc

@@ -23,7 +23,6 @@
 #include "cf_util.h"
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEXFactoring.h>
 #include "NTLconvert.h"
 #endif
 

factory/facFqBivar.cc

@@ -152,8 +152,7 @@ uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
   ASSERT (A.isUnivariate(),
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
-  ZZ p= to_ZZ (getCharacteristic());
-  ZZ_p::init (p);
+  zz_p::init (getCharacteristic());
   if (GF)
   {
     int k= getGFDegree();
@@ -164,13 +163,13 @@ uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
     CanonicalForm buf= GF2FalphaRep (A, beta);
     if (getCharacteristic() > 2)
     {
-      ZZ_pX NTLMipo= convertFacCF2NTLZZpX (mipo.mapinto());
-      ZZ_pE::init (NTLMipo);
-      ZZ_pEX NTLA= convertFacCF2NTLZZ_pEX (buf, NTLMipo);
+      zz_pX NTLMipo= convertFacCF2NTLzzpX (mipo.mapinto());
+      zz_pE::init (NTLMipo);
+      zz_pEX NTLA= convertFacCF2NTLzz_pEX (buf, NTLMipo);
       MakeMonic (NTLA);
-      vec_pair_ZZ_pEX_long NTLFactorsA= CanZass (NTLA);
-      ZZ_pE multi= to_ZZ_pE (1);
-      factorsA= convertNTLvec_pair_ZZpEX_long2FacCFFList (NTLFactorsA, multi,
+      vec_pair_zz_pEX_long NTLFactorsA= CanZass (NTLA);
+      zz_pE multi= to_zz_pE (1);
+      factorsA= convertNTLvec_pair_zzpEX_long2FacCFFList (NTLFactorsA, multi,
                                                          x, beta);
     }
     else
@@ -196,13 +195,13 @@ uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
   {
     if (getCharacteristic() > 2)
     {
-      ZZ_pX NTLMipo= convertFacCF2NTLZZpX (getMipo (alpha));
-      ZZ_pE::init (NTLMipo);
-      ZZ_pEX NTLA= convertFacCF2NTLZZ_pEX (A, NTLMipo);
+      zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
+      zz_pE::init (NTLMipo);
+      zz_pEX NTLA= convertFacCF2NTLzz_pEX (A, NTLMipo);
       MakeMonic (NTLA);
-      vec_pair_ZZ_pEX_long NTLFactorsA= CanZass (NTLA);
-      ZZ_pE multi= to_ZZ_pE (1);
-      factorsA= convertNTLvec_pair_ZZpEX_long2FacCFFList (NTLFactorsA, multi,
+      vec_pair_zz_pEX_long NTLFactorsA= CanZass (NTLA);
+      zz_pE multi= to_zz_pE (1);
+      factorsA= convertNTLvec_pair_zzpEX_long2FacCFFList (NTLFactorsA, multi,
                                                            x, alpha);
     }
     else
@@ -233,11 +232,11 @@ uniFactorizer (const CanonicalForm& A, const Variable& alpha, const bool& GF)
 #else
     if (getCharacteristic() > 2)
     {
-      ZZ_pX NTLA= convertFacCF2NTLZZpX (A);
+      zz_pX NTLA= convertFacCF2NTLzzpX (A);
       MakeMonic (NTLA);
-      vec_pair_ZZ_pX_long NTLFactorsA= CanZass (NTLA);
-      ZZ_p multi= to_ZZ_p (1);
-      factorsA= convertNTLvec_pair_ZZpX_long2FacCFFList (NTLFactorsA, multi,
+      vec_pair_zz_pX_long NTLFactorsA= CanZass (NTLA);
+      zz_p multi= to_zz_p (1);
+      factorsA= convertNTLvec_pair_zzpX_long2FacCFFList (NTLFactorsA, multi,
                                                           x);
     }
     else

factory/facFqFactorize.cc

@@ -32,7 +32,6 @@
 #include "facMul.h"
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEX.h>
 #include "NTLconvert.h"
 
 TIMING_DEFINE_PRINT(fac_bi_factorizer)