Changeset 0a7d0ca in git for factory/facFqBivar.cc

Timestamp:

Apr 4, 2012, 1:31:44 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4ec288be9af6f58af102d533957618aaf274e928

Parents:

050d1b7b5c8c0001dacf87ddbd94dabe39e9517d

git-author:

Martin Lee <martinlee84@web.de>2012-04-04 13:31:44+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 15:02:22+02:00

Message:

fix: assert violations related to minpoly handling

File:

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

factory/facFqBivar.cc

@@ -152 +152 @@
   if (GF)
   {
-    Variable beta= rootOf (gf_mipo);
     int k= getGFDegree();
     char cGFName= gf_name;
+    CanonicalForm mipo= gf_mipo;
     setCharacteristic (getCharacteristic());
+    Variable beta= rootOf (mipo.mapinto());
     CanonicalForm buf= GF2FalphaRep (A, beta);
     if (getCharacteristic() > 2)
     {
-      ZZ_pX NTLMipo= convertFacCF2NTLZZpX (gf_mipo);
+      ZZ_pX NTLMipo= convertFacCF2NTLZZpX (mipo.mapinto());
       ZZ_pE::init (NTLMipo);
       ZZ_pEX NTLA= convertFacCF2NTLZZ_pEX (buf, NTLMipo);
@@ -170 +171 @@
     else
     {
-      GF2X NTLMipo= convertFacCF2NTLGF2X (gf_mipo);
+      GF2X NTLMipo= convertFacCF2NTLGF2X (mipo.mapinto());
       GF2E::init (NTLMipo);
       GF2EX NTLA= convertFacCF2NTLGF2EX (buf, NTLMipo);
@@ -6185 +6186 @@
       factors= biFactorize (A, info2);
 
-      Variable vBuf= rootOf (gf_mipo);
+      CanonicalForm mipo= gf_mipo;
       setCharacteristic (getCharacteristic());
+      Variable vBuf= rootOf (mipo.mapinto());
       for (CFListIterator j= factors; j.hasItem(); j++)
         j.getItem()= GF2FalphaRep (j.getItem(), vBuf);
@@ -6265 +6267 @@
       // pass to GF(p^k+1)
       {
+        CanonicalForm mipo= gf_mipo;
         setCharacteristic (p);
-        Variable vBuf= rootOf (gf_mipo);
+        Variable vBuf= rootOf (mipo.mapinto());
         A= GF2FalphaRep (A, vBuf);
         setCharacteristic (p, extensionDeg, 'Z');
@@ -6274 +6277 @@
       else // not able to pass to another GF, pass to F_p(\alpha)
       {
+        CanonicalForm mipo= gf_mipo;
         setCharacteristic (p);
-        Variable vBuf= rootOf (gf_mipo);
+        Variable vBuf= rootOf (mipo.mapinto());
         A= GF2FalphaRep (A, vBuf);
         Variable v= chooseExtension (vBuf, beta, k);
@@ -6294 +6298 @@
       else // not able to pass to GF (p^2k), pass to F_p (\alpha)
       {
+        CanonicalForm mipo= gf_mipo;
         setCharacteristic (p);
-        Variable v1= rootOf (gf_mipo);
+        Variable v1= rootOf (mipo.mapinto());
         A= GF2FalphaRep (A, v1);
         Variable v2= chooseExtension (v1, v1, k);