Changeset 428b38 in git for factory/algext.cc

Timestamp:

Nov 16, 2012, 12:56:34 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

f3bd4cf51acbd4ce841f52698b25e2b56e561b5d

Parents:

241a04727aaaf99b8ac0d6d44f9fddd8bc4d8221

git-author:

Martin Lee <martinlee84@web.de>2012-11-16 12:56:34+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-16 13:39:10+01:00

Message:

chg: use NTL in tryBrownGCD

File:

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

factory/algext.cc

@@ -27 +27 @@
 #include "cf_generator.h"
 #include "facMul.h"
+#include "facNTLzzpEXGCD.h"
 
 #ifdef HAVE_NTL
@@ -463 +464 @@
     mv = g.level();
   // here: mv is level of the largest variable in f, g
+  Variable v1= Variable (1);
+#ifdef HAVE_NTL
+  Variable v= M.mvar();
+  zz_p::init (getCharacteristic());
+  zz_pX NTLMipo= convertFacCF2NTLzzpX (M);
+  zz_pE::init (NTLMipo);
+  zz_pEX NTLResult;
+  zz_pEX NTLF;
+  zz_pEX NTLG;
+#endif
   if(mv == 1) // f,g univariate
   {
     TIMING_START (alg_euclid_p)
+#ifdef HAVE_NTL
+    NTLF= convertFacCF2NTLzz_pEX (f, NTLMipo);
+    NTLG= convertFacCF2NTLzz_pEX (g, NTLMipo);
+    tryNTLGCD (NTLResult, NTLF, NTLG, fail);
+    if (fail)
+      return;
+    result= convertNTLzz_pEX2CF (NTLResult, f.mvar(), v);
+#else
     tryEuclid(f,g,M,result,fail);
+    if(fail)
+      return;
+#endif
     TIMING_END_AND_PRINT (alg_euclid_p, "time for euclidean alg mod p: ")
-    if(fail)
-      return;
     result= NN (reduce (result, M)); // do not forget to map back
     return;
@@ -482 +502 @@
     return;
   CanonicalForm c;
+#ifdef HAVE_NTL
+  NTLF= convertFacCF2NTLzz_pEX (cf, NTLMipo);
+  NTLG= convertFacCF2NTLzz_pEX (cg, NTLMipo);
+  tryNTLGCD (NTLResult, NTLF, NTLG, fail);
+  if (fail)
+    return;
+  c= convertNTLzz_pEX2CF (NTLResult, v1, v);
+#else
   tryEuclid(cf,cg,M,c,fail);
   if(fail)
     return;
+#endif
   // f /= cf
   f.tryDiv (cf, M, fail);
@@ -518 +547 @@
   CanonicalForm gamma;
   TIMING_START (alg_euclid_p)
+#ifdef HAVE_NTL
+  NTLF= convertFacCF2NTLzz_pEX (firstLC (f), NTLMipo);
+  NTLG= convertFacCF2NTLzz_pEX (firstLC (g), NTLMipo);
+  tryNTLGCD (NTLResult, NTLF, NTLG, fail);
+  if (fail)
+    return;
+  gamma= convertNTLzz_pEX2CF (NTLResult, v1, v);
+#else
   tryEuclid( firstLC(f), firstLC(g), M, gamma, fail );
+  if(fail)
+    return;
+#endif
   TIMING_END_AND_PRINT (alg_euclid_p, "time for gcd of lcs in alg mod p: ")
-  if(fail)
-    return;
   for(int i=2; i<=mv; i++) // entries at i=0,1 not visited
     if(N[i] < L[i])