Changeset 514ade in git for factory/facFqBivar.cc

Timestamp:

Dec 17, 2013, 12:13:13 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

7ed4f6c34d2b1133b547efc14dffe495b47b317e

Parents:

84ac5994873dbb564fbbae08f3f16a378f8abfa0

git-author:

Martin Lee <martinlee84@web.de>2013-12-17 12:13:13+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:03+01:00

Message:

bug fix due to unset NTL characteristic

File:

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

factory/facFqBivar.cc

@@ -163 +163 @@
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
-#ifndef HAVE_FLINT
-  if (fac_NTL_char != getCharacteristic())
-  {
-    fac_NTL_char= getCharacteristic();
-    zz_p::init (getCharacteristic());
-  }
-#endif
   if (GF)
   {
@@ -207 +200 @@
       fq_nmod_ctx_clear (fq_con);
 #else
+      if (fac_NTL_char != getCharacteristic())
+      {
+        fac_NTL_char= getCharacteristic();
+        zz_p::init (getCharacteristic());
+      }
       zz_pX NTLMipo= convertFacCF2NTLzzpX (mipo.mapinto());
       zz_pE::init (NTLMipo);
@@ -267 +265 @@
       fq_nmod_ctx_clear (fq_con);
 #else
+      if (fac_NTL_char != getCharacteristic())
+      {
+        fac_NTL_char= getCharacteristic();
+        zz_p::init (getCharacteristic());
+      }
       zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
       zz_pE::init (NTLMipo);
@@ -309 +312 @@
     if (getCharacteristic() > 2)
     {
+      if (fac_NTL_char != getCharacteristic())
+      {
+        fac_NTL_char= getCharacteristic();
+        zz_p::init (getCharacteristic());
+      }
       zz_pX NTLA= convertFacCF2NTLzzpX (A);
       MakeMonic (NTLA);