Changeset 142afd in git

Timestamp:

Sep 11, 2013, 3:30:00 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

1e5bbd70c45325682c85dd82ac76bdd5d0cdecbf

Parents:

d83c0bc579fb38d2539c9c3b55cba1c04ccf3ff2

git-author:

Martin Lee <martinlee84@web.de>2013-09-11 15:30:00+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-09-11 15:31:05+02:00

Message:

deleted more unnecessary stuff using NTL in non-word size case in univariate factorization

File:

• factory/cf_factor.cc (modified) (4 diffs)

factory/cf_factor.cc

@@ -455 +455 @@
           {
             fac_NTL_char = getCharacteristic();
-            #ifndef NTL_ZZ
-            if (fac_NTL_char > NTL_SP_BOUND)
-            {
-              ZZ r;
-              r=getCharacteristic();
-              ZZ_pContext ccc(r);
-              ccc.restore();
-              ZZ_p::init(r);
-            }
-            else
-            #endif
-            {
-              #ifdef NTL_ZZ
-              ZZ r;
-              r=getCharacteristic();
-              ZZ_pContext ccc(r);
-              #else
-              zz_pContext ccc(getCharacteristic());
-              #endif
-              ccc.restore();
-              #ifdef NTL_ZZ
-              ZZ_p::init(r);
-              #else
-              zz_p::init(getCharacteristic());
-              #endif
-            }
+            zz_p::init(getCharacteristic());
           }
-          #ifndef NTL_ZZ
-          if (fac_NTL_char > NTL_SP_BOUND)
-          {
-            // convert to NTL
-            ZZ_pX f1=convertFacCF2NTLZZpX(f);
-            ZZ_p leadcoeff = LeadCoeff(f1);
-            //make monic
-            f1=f1 / LeadCoeff(f1);
-            // factorize
-            vec_pair_ZZ_pX_long factors;
-            CanZass(factors,f1);
-            // convert back to factory
-            F=convertNTLvec_pair_ZZpX_long2FacCFFList(factors,leadcoeff,f.mvar());
-          }
-          else
-          #endif
-          {
-            // convert to NTL
-            #ifdef NTL_ZZ
-            ZZ_pX f1=convertFacCF2NTLZZpX(f);
-            ZZ_p leadcoeff = LeadCoeff(f1);
-            #else
-            zz_pX f1=convertFacCF2NTLzzpX(f);
-            zz_p leadcoeff = LeadCoeff(f1);
-            #endif
-            //make monic
-            f1=f1 / LeadCoeff(f1);
-            // factorize
-            #ifdef NTL_ZZ
-            vec_pair_ZZ_pX_long factors;
-            #else
-            vec_pair_zz_pX_long factors;
-            #endif
-            CanZass(factors,f1);
-            // convert back to factory
-            #ifdef NTL_ZZ
-            F=convertNTLvec_pair_ZZpX_long2FacCFFList(factors,leadcoeff,f.mvar());
-            #else
-            F=convertNTLvec_pair_zzpX_long2FacCFFList(factors,leadcoeff,f.mvar());
-            #endif
-          }
+
+          // convert to NTL
+          zz_pX f1=convertFacCF2NTLzzpX(f);
+          zz_p leadcoeff = LeadCoeff(f1);
+
+          //make monic
+          f1=f1 / LeadCoeff(f1);
+          // factorize
+          vec_pair_zz_pX_long factors;
+          CanZass(factors,f1);
+
+          F=convertNTLvec_pair_zzpX_long2FacCFFList(factors,leadcoeff,f.mvar());
           //test_cff(F,f);
         }
@@ -716 +662 @@
         {
           fac_NTL_char = getCharacteristic();
-          #ifdef NTL_ZZ
-          ZZ r;
-          r=getCharacteristic();
-          ZZ_pContext ccc(r);
-          #else
-          zz_pContext ccc(getCharacteristic());
-          #endif
-          ccc.restore();
-          #ifdef NTL_ZZ
-          ZZ_p::init(r);
-          #else
           zz_p::init(getCharacteristic());
-          #endif
         }
 
         // set minimal polynomial in NTL
-        #ifdef NTL_ZZ
-        ZZ_pX minPo=convertFacCF2NTLZZpX(getMipo(alpha));
-        ZZ_pEContext c(minPo);
-        #else
         zz_pX minPo=convertFacCF2NTLzzpX(getMipo(alpha));
-        zz_pEContext c(minPo);
-        #endif
-
-        c.restore();
+        zz_pE::init (minPo);
 
         // convert to NTL
-        #ifdef NTL_ZZ
-        ZZ_pEX f1=convertFacCF2NTLZZ_pEX(f,minPo);
-        ZZ_pE leadcoeff= LeadCoeff(f1);
-        #else
         zz_pEX f1=convertFacCF2NTLzz_pEX(f,minPo);
         zz_pE leadcoeff= LeadCoeff(f1);
-        #endif
 
         //make monic
@@ -755 +677 @@
 
         // factorize using NTL
-        #ifdef NTL_ZZ
-        vec_pair_ZZ_pEX_long factors;
-        #else
         vec_pair_zz_pEX_long factors;
-        #endif
         CanZass(factors,f1);
 
         // return converted result
-        #ifdef NTL_ZZ
-        F=convertNTLvec_pair_ZZpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
-        #else
         F=convertNTLvec_pair_zzpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
-        #endif
       }
       else if (/*getCharacteristic()*/ch==2)
@@ -774 +688 @@
 
         // remainder is two ==> nothing to do
-        // set remainder
-        ZZ r;
-        r=getCharacteristic();
-        ZZ_pContext ccc(r);
-        ccc.restore();
 
         // set minimal polynomial in NTL using the optimized conversion routines for characteristic 2
         GF2X minPo=convertFacCF2NTLGF2X(getMipo(alpha,f.mvar()));
-        GF2EContext c(minPo);
-        c.restore();
+        GF2E::init (minPo);
 
         // convert to NTL again using the faster conversion routines