Changeset 241a04 in git

Timestamp:

Nov 16, 2012, 12:54:35 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

428b38e6b8d35b1145d188a0e2eae3a73aa08e44

Parents:

70c40f240ce667ca18d03028aae0c90552755245

git-author:

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

git-committer:

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

Message:

chg: use NTL in tryDiophantine

File:

• factory/facHensel.cc (modified) (3 diffs)

factory/facHensel.cc

@@ -30 +30 @@
 #include "cf_primes.h"
 #include "facBivar.h"
+#include "facNTLzzpEXGCD.h"
 
 #ifdef HAVE_NTL
@@ -100 +101 @@
   buf1= bufFactors.getFirst();
   buf2= i.getItem();
+#ifdef HAVE_NTL
+  Variable x= Variable (1);
+  zz_p::init (getCharacteristic());
+  zz_pX NTLMipo= convertFacCF2NTLzzpX (M);
+  zz_pE::init (NTLMipo);
+  zz_pEX NTLbuf1, NTLbuf2, NTLbuf3, NTLS, NTLT;
+  NTLbuf1= convertFacCF2NTLzz_pEX (buf1, NTLMipo);
+  NTLbuf2= convertFacCF2NTLzz_pEX (buf2, NTLMipo);
+  tryNTLXGCD (NTLbuf3, NTLS, NTLT, NTLbuf1, NTLbuf2, fail);
+  if (fail)
+    return;
+  S= convertNTLzz_pEX2CF (NTLS, x, M.mvar());
+  T= convertNTLzz_pEX2CF (NTLT, x, M.mvar());
+#else
   tryExtgcd (buf1, buf2, M, buf3, S, T, fail);
   if (fail)
     return;
+#endif
   result.append (S);
   result.append (T);
@@ -109 +125 @@
   for (; i.hasItem(); i++)
   {
+#ifdef HAVE_NTL
+    NTLbuf1= convertFacCF2NTLzz_pEX (i.getItem(), NTLMipo);
+    tryNTLXGCD (NTLbuf3, NTLS, NTLT, NTLbuf3, NTLbuf1, fail);
+    if (fail)
+      return;
+    S= convertNTLzz_pEX2CF (NTLS, x, M.mvar());
+    T= convertNTLzz_pEX2CF (NTLT, x, M.mvar());
+#else
     buf1= i.getItem();
     tryExtgcd (buf3, buf1, M, buf3, S, T, fail);
     if (fail)
       return;
+#endif
     CFListIterator k= factors;
     for (CFListIterator j= result; j.hasItem(); j++, k++)