Changeset 9a12097 in git

Timestamp:

May 8, 2012, 11:05:19 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6ff7fd14966b591a5233a7ef59d31a99925575fa

Parents:

a5b5dfd5ca7d49ae6201c6005102422b80cb2eb7

git-author:

Martin Lee <martinlee84@web.de>2012-05-08 11:05:19+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-11 11:06:45+02:00

Message:

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

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (4 diffs)
• cf_map_ext.cc (modified) (1 diff)
• facFqBivar.cc (modified) (4 diffs)
• facFqFactorize.cc (modified) (1 diff)

factory/cf_gcd_smallp.cc

@@ -41 +41 @@
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEX.h>
 #include <NTLconvert.h>
 #endif
@@ -435 +434 @@
 {
   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));
@@ -444 +442 @@
     i= 2;
   BuildIrred (NTLirredpoly, i*m);
-  CanonicalForm mipo= convertNTLZZpX2CF (NTLirredpoly, Variable(1));
+  CanonicalForm mipo= convertNTLzzpX2CF (NTLirredpoly, Variable(1));
   beta= rootOf (mipo);
 }
@@ -1335 +1333 @@
 {
   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

@@ -28 +28 @@
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEXFactoring.h>
 #include "NTLconvert.h"
 #endif

factory/facFqBivar.cc

@@ -154 +154 @@
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
-  ZZ p= to_ZZ (getCharacteristic());
-  ZZ_p::init (p);
+  zz_p::init (getCharacteristic());
   if (GF)
   {
@@ -166 +165 @@
     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);
     }
@@ -198 +197 @@
     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);
     }
@@ -235 +234 @@
     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);
     }

factory/facFqFactorize.cc

@@ -35 +35 @@
 
 #ifdef HAVE_NTL
-#include <NTL/ZZ_pEX.h>
 #include "NTLconvert.h"