Changeset 9084a3 in git

Timestamp:

Jun 26, 2020, 11:45:10 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b7cc2b30ec0e493f5f022b5a29a071d4b7ce31a7

Parents:

f87a54f01779194a0163ca39873f5b4255a4f510

Message:

fix: univariate factorization over Z/p(alpha) via NTL

Location:

factory

Files:

• NTLconvert.cc (modified) (1 diff)
• cf_factor.cc (modified) (3 diffs)

factory/NTLconvert.cc

@@ -130 +130 @@
     {  //This case will never happen if the characteristic is in fact a prime
        // number, since all coefficients are represented as immediates
+       out_cf("f:->",f,"\n");
+       out_cf("c:->",c,"\n");
        #ifndef NOSTREAMIO
        cout<<"convertFacCF2NTLzz_pX: coefficient not immediate! : "<<f<<"\n";

factory/cf_factor.cc

@@ -565 +565 @@
         if ( ! ic.isOne() )
         {
-           // according to convertFLINTfmpz_polyfactor2FcaCFFlist,
-           //  first entry is in CoeffDomain
+           // according to convertFLINTfmpz_polyfactor2FcaCFFlist,
+           //  first entry is in CoeffDomain
           CFFactor new_first( F.getFirst().factor() * ic );
           F.removeFirst();
@@ -585 +585 @@
         if ( ! ic.isOne() )
         {
-           // according to convertNTLvec_pair_ZZX_long2FacCFFList
-           //  first entry is in CoeffDomain
+           // according to convertNTLvec_pair_ZZX_long2FacCFFList
+           //  first entry is in CoeffDomain
           CFFactor new_first( F.getFirst().factor() * ic );
           F.removeFirst();
@@ -735 +735 @@
         }
 
+        // set minimal polynomial in NTL
+        zz_pX minPo=convertFacCF2NTLzzpX(getMipo(alpha));
+        zz_pE::init (minPo);
+
         // convert to NTL
-        zz_pX f1=convertFacCF2NTLzzpX(f);
-        zz_p leadcoeff = LeadCoeff(f1);
+        zz_pEX f1=convertFacCF2NTLzz_pEX(f,minPo);
+        zz_pE leadcoeff= LeadCoeff(f1);
 
         //make monic
         f1=f1 / LeadCoeff(f1);
+
         // factorize
-        vec_pair_zz_pX_long factors;
+        vec_pair_zz_pEX_long factors;
         CanZass(factors,f1);
 
-        F=convertNTLvec_pair_zzpX_long2FacCFFList(factors,leadcoeff,f.mvar());
+        // return converted result
+        F=convertNTLvec_pair_zzpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
         //test_cff(F,f);
         if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);