Changeset e4e36c in git

Timestamp:

Apr 30, 2013, 3:46:37 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

08a955b3ca689a48afd7f7c5849c4179954a1ddb

Parents:

cd4d87371ccfef4e30358d86d7d9b9c7d69ed4aa

git-author:

Martin Lee <martinlee84@web.de>2013-04-30 15:46:37+02:00

git-committer:

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

Message:

chg: in case there is no FLINT use NTL

Location:

factory

Files:

• facAbsFact.cc (modified) (7 diffs)
• facAbsFact.h (modified) (1 diff)

factory/facAbsFact.cc

@@ -29 +29 @@
 #endif
 
-#ifdef HAVE_FLINT
 #ifdef HAVE_NTL
 
@@ -238 +237 @@
     //TODO take floor (log2(k))
     k= k+1;
+#ifdef HAVE_FLINT
     fmpz_poly_t FLINTFi;
     convertFacCF2Fmpz_poly_t (FLINTFi, Fi);
@@ -277 +277 @@
 
     setCharacteristic(0);
-    modpk pk= modpk (p,k);
     CanonicalForm liftedSmallestFactor=
     convertFmpz_poly_t2FacCF ((fmpz_poly_t &)liftedFactors->p[0],Variable (1));
@@ -283 +282 @@
     CanonicalForm otherFactor=
     convertFmpz_poly_t2FacCF ((fmpz_poly_t &)liftedFactors->p[1],Variable (1));
-    CanonicalForm test= pk (otherFactor*liftedSmallestFactor);
+    modpk pk= modpk (p, k);
+#else
+    modpk pk= modpk (p, k);
+    ZZX NTLFi=convertFacCF2NTLZZX (pk (Fi*pk.inverse (lc(Fi))));
+    setCharacteristic (p);
+
+    if (fac_NTL_char != p)
+    {
+      fac_NTL_char= p;
+      zz_p::init (p);
+    }
+    zz_pX NTLFpi, NTLGpi;
+    if (i == 2)
+    {
+      NTLFpi= convertFacCF2NTLzzpX (smallestFactorEvalx/lc (smallestFactorEvalx));
+      NTLGpi= convertFacCF2NTLzzpX (Gpx/lc (Gpx));
+    }
+    else
+    {
+      NTLFpi= convertFacCF2NTLzzpX (smallestFactorEvaly/lc (smallestFactorEvaly));
+      NTLGpi= convertFacCF2NTLzzpX (Gpy/lc (Gpy));
+    }
+    vec_zz_pX modFactors;
+    modFactors.SetLength(2);
+    modFactors[0]= NTLFpi;
+    modFactors[1]= NTLGpi;
+    vec_ZZX liftedFactors;
+    MultiLift (liftedFactors, modFactors, NTLFi, (long) k);
+    setCharacteristic(0);
+    CanonicalForm liftedSmallestFactor=
+                  convertNTLZZX2CF (liftedFactors[0],Variable (1));
+
+    CanonicalForm otherFactor=
+                  convertNTLZZX2CF (liftedFactors[1], Variable (1));
+#endif
 
     Off (SW_SYMMETRIC_FF);
@@ -317 +350 @@
     mipoFactors.removeFirst();
 
+#ifdef HAVE_FLINT
     fmpz_poly_clear (v[0]);
     fmpz_poly_clear (v[1]);
@@ -325 +359 @@
     delete [] link;
     fmpz_poly_factor_clear (liftedFactors);
+#endif
 
     if (mipoFactors.length() > 1 ||
@@ -537 +572 @@
 
 #endif
-#endif
-
-
+
+

factory/facAbsFact.h

@@ -87 +87 @@
 /*BEGINPUBLIC*/
 
+#ifdef HAVE_NTL
 CFAFList absFactorize (const CanonicalForm& G);
+#endif
 
 /*ENDPUBLIC*/