Changeset 4ec288 in git for factory/facFqBivar.cc

Timestamp:

Apr 11, 2012, 3:11:20 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

98adcdd62df51a4c6090574f59ad2b9a5d432d39

Parents:

4bafa67969ab030397c6410e512aadf5574be0dc0a7d0ca68a61f160eb5b83774592a019ed99f025

Message:

Merge pull request #94 from mmklee/swSingularFlint

first support of flint in singular:SW

TODO: improve the configure tests 
TODO: should flint be prefered over NTL by default?
TODO: suppress linking to different versions of libgmp.so in the same time due to flint

File:

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

factory/facFqBivar.cc

@@ -30 +30 @@
 #include "cf_random.h"
 #include "facHensel.h"
+#include "facMul.h"
 #include "cf_map.h"
 #include "cf_gcd_smallp.h"
@@ -35 +36 @@
 #include "facFqBivar.h"
 #include "cfNewtonPolygon.h"
+#include "algext.h"
 
 #ifdef HAVE_NTL
@@ -42 +44 @@
 TIMING_DEFINE_PRINT(fac_hensel_lift12)
 
-CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M)
+CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M, const modpk& b)
 {
   if (L.isEmpty())
@@ -49 +51 @@
     return mod (L.getFirst()(0, 1) , M);
   else if (L.length() == 2)
-    return mod (mulNTL (L.getFirst()(0, 1),L.getLast()(0, 1)), M);
+    return mod (mulNTL (L.getFirst()(0, 1),L.getLast()(0, 1), b), M);
   else
   {
@@ -59 +61 @@
       tmp1.append (i.getItem());
     tmp2= Difference (L, tmp1);
-    buf1= prodMod0 (tmp1, M);
-    buf2= prodMod0 (tmp2, M);
-    return mod (mulNTL (buf1,buf2), M);
+    buf1= prodMod0 (tmp1, M, b);
+    buf2= prodMod0 (tmp2, M, b);
+    return mod (mulNTL (buf1,buf2, b), M);
   }
 }
@@ -143 +145 @@
 {
   Variable x= A.mvar();
-  ASSERT (A.isUnivariate(), "univariate polynomial expected");
+  ASSERT (A.isUnivariate() || A.inCoeffDomain(), 
+          "univariate polynomial expected or constant expected");
   CFFList factorsA;
   ZZ p= to_ZZ (getCharacteristic());
@@ -149 +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);
@@ -167 +171 @@
     else
     {
-      GF2X NTLMipo= convertFacCF2NTLGF2X (gf_mipo);
+      GF2X NTLMipo= convertFacCF2NTLGF2X (mipo.mapinto());
       GF2E::init (NTLMipo);
       GF2EX NTLA= convertFacCF2NTLGF2EX (buf, NTLMipo);
@@ -268 +272 @@
 
   DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, M) == F " <<
-            (LC (F, 1)*prodMod (factors, M) == F));
+            (mod (LC (F, 1)*prodMod (factors, M), M)/Lc (mod (LC (F, 1)*prodMod (factors, M), M)) == F/Lc (F)));
   int degMipoBeta= 1;
   if (!k && beta.level() != 1)
@@ -449 +453 @@
 factorRecombination (CFList& factors, CanonicalForm& F,
                      const CanonicalForm& N, DegreePattern& degs, int s,
-                     int thres
+                     int thres, const modpk& b
                     )
 {
@@ -463 +467 @@
     return result;
   }
-  DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, N) == F " <<
-            (LC (F, 1)*prodMod (factors, N) == F));
+#ifdef DEBUGOUTPUT
+  if (b.getp() == 0)
+    DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, N) == F " <<
+              (mod (LC (F, 1)*prodMod (factors, N),N)/Lc (mod (LC (F, 1)*prodMod (factors, N),N)) == F/Lc(F)));
+  else
+    DEBOUTLN (cerr, "LC (F, 1)*prodMod (factors, N) == F " <<
+              (mod (b(LC (F, 1)*prodMod (factors, N)),N)/Lc (mod (b(LC (F, 1)*prodMod (factors, N)),N)) == F/Lc(F)));
+#endif
   CFList T, S;
 
@@ -486 +496 @@
   bool recombination= false;
   CanonicalForm test;
-  CanonicalForm buf0= buf (0, x)*LCBuf;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  if (!isRat)
+    On (SW_RATIONAL);
+  CanonicalForm buf0= mulNTL (buf (0, x), LCBuf);
+  if (!isRat)
+    Off (SW_RATIONAL);
+  buf0= buf(0,x)*LCBuf;
   while (T.length() >= 2*s && s <= thres)
   {
@@ -498 +514 @@
           T.insert (LCBuf);
           g= prodMod (T, M);
+          if (b.getp() != 0)
+            g= b(g);
           T.removeFirst();
           result.append (g/content (g, x));
@@ -518 +536 @@
       else
       {
+        if (!isRat)
+          On (SW_RATIONAL);
         test= prodMod0 (S, M);
-        test *= LCBuf;
-        test = mod (test, M);
-        if (fdivides (test, buf0))
-        {
+        if (!isRat)
+        {
+          test *= bCommonDen (test);
+          Off (SW_RATIONAL);
+        }
+        test= mulNTL (test, LCBuf, b);
+        test= mod (test, M);
+        if (uniFdivides (test, buf0))
+        {
+          if (!isRat)
+            On (SW_RATIONAL);
           S.insert (LCBuf);
           g= prodMod (S, M);
           S.removeFirst();
+          if (!isRat)
+          {
+            g *= bCommonDen(g);
+            Off (SW_RATIONAL);
+          }
+          if (b.getp() != 0)
+            g= b(g);
+          if (!isRat)
+            On (SW_RATIONAL);
           g /= content (g, x);
           if (fdivides (g, buf, quot))
@@ -536 +572 @@
             l -= degree (g);
             M= power (y, l);
-            buf0= buf (0, x)*LCBuf;
+            buf0= mulNTL (buf (0, x), LCBuf);
+            if (!isRat)
+              Off (SW_RATIONAL);
             // compute new possible degree pattern
             bufDegs2= DegreePattern (T);
@@ -562 +600 @@
             if (nosubset) break;
           }
+          if (!isRat)
+            Off (SW_RATIONAL);
         }
       }
@@ -638 +678 @@
 earlyFactorDetection (CFList& reconstructedFactors, CanonicalForm& F, CFList&
                       factors, int& adaptedLiftBound, int*& factorsFoundIndex,
-                      DegreePattern& degs, bool& success, int deg)
+                      DegreePattern& degs, bool& success, int deg,
+                      const modpk& b)
 {
   DegreePattern bufDegs1= degs;
@@ -650 +691 @@
   adaptedLiftBound= 0;
   int d= degree (F), l= 0;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  if (!isRat)
+    On (SW_RATIONAL);
+  CanonicalForm buf0= mulNTL (buf (0,x), LCBuf);
+  CanonicalForm buf1= mulNTL (buf (1,x), LCBuf);
+  if (!isRat)
+    Off (SW_RATIONAL);
+  CanonicalForm test0, test1;
+
   for (CFListIterator i= factors; i.hasItem(); i++, l++)
   {
@@ -656 +706 @@
     else
     {
-      g= mulMod2 (i.getItem(), LCBuf, M);
-      g /= content (g, x);
-      if (fdivides (g, buf, quot))
-      {
-        reconstructedFactors.append (g);
-        factorsFoundIndex[l]= 1;
-        buf= quot;
-        d -= degree (g);
-        LCBuf= LC (buf, x);
-        T= Difference (T, CFList (i.getItem()));
-        F= buf;
-
-        // compute new possible degree pattern
-        bufDegs2= DegreePattern (T);
-        bufDegs1.intersect (bufDegs2);
-        bufDegs1.refine ();
-        if (bufDegs1.getLength() <= 1)
-        {
-          reconstructedFactors.append (buf);
-          break;
+      test1= mod (mulNTL (i.getItem() (1,x), LCBuf, b), M);
+      if (uniFdivides (test1, buf1))
+      {
+        test0= mod (mulNTL (i.getItem() (0,x), LCBuf, b), M);
+        if (uniFdivides (test0, buf0))
+        {
+          if (!isRat)
+            On (SW_RATIONAL);
+          g= mulMod2 (i.getItem(), LCBuf, M);
+          if (!isRat)
+          {
+            g *= bCommonDen(g);
+            Off (SW_RATIONAL);
+          }
+          if (b.getp() != 0)
+            g= b(g);
+          if (!isRat)
+            On (SW_RATIONAL);
+          g /= content (g, x);
+          if (fdivides (g, buf, quot))
+          {
+            reconstructedFactors.append (g);
+            factorsFoundIndex[l]= 1;
+            buf= quot;
+            d -= degree (g);
+            LCBuf= LC (buf, x);
+            buf0= mulNTL (buf (0,x), LCBuf);
+            buf1= mulNTL (buf (1,x), LCBuf);
+            if (!isRat)
+              Off (SW_RATIONAL);
+            T= Difference (T, CFList (i.getItem()));
+            F= buf;
+
+            // compute new possible degree pattern
+            bufDegs2= DegreePattern (T);
+            bufDegs1.intersect (bufDegs2);
+            bufDegs1.refine ();
+            if (bufDegs1.getLength() <= 1)
+            {
+              reconstructedFactors.append (buf);
+              break;
+            }
+          }
+          if (!isRat)
+            Off (SW_RATIONAL);
         }
       }
@@ -859 +934 @@
                     earlyFactors, DegreePattern& degs, int& liftBound,
                     const CFList& uniFactors, const ExtensionInfo& info,
-                    const CanonicalForm& eval)
+                    const CanonicalForm& eval, modpk& b)
 {
   Variable alpha= info.getAlpha();
@@ -875 +950 @@
   CFList diophant;
   CFList bufUniFactors= uniFactors;
+  CanonicalForm bufA= A;
+  CanonicalForm lcA0= 0;
+  bool mipoHasDen= false;
+  if (getCharacteristic() == 0 && b.getp() != 0)
+  {
+    if (alpha.level() == 1)
+    {
+      lcA0= lc (A (0, 2));
+      A *= b.inverse (lcA0);
+      A= b (A);
+      for (CFListIterator i= bufUniFactors; i.hasItem(); i++)
+        i.getItem()= b (i.getItem()*b.inverse (lc (i.getItem())));
+    }
+    else
+    {
+      lcA0= Lc (A (0,2));
+      On (SW_RATIONAL);
+      mipoHasDen= !bCommonDen(getMipo(alpha)).isOne();
+      Off (SW_RATIONAL);
+      CanonicalForm lcA0inverse= b.inverse (lcA0);
+      A *= lcA0inverse;
+      A= b (A);
+      // Lc of bufUniFactors is in Z
+      for (CFListIterator i= bufUniFactors; i.hasItem(); i++)
+        i.getItem()= b (i.getItem()*b.inverse (lc (i.getItem())));
+    }
+  }
   bufUniFactors.insert (LC (A, x));
   CFMatrix M= CFMatrix (liftBound, bufUniFactors.length() - 1);
@@ -885 +987 @@
   for (int i= 0; i < uniFactors.length(); i++)
     factorsFoundIndex [i]= 0;
-  CanonicalForm bufA= A;
-
+
+  CFList bufBufUniFactors;
+  Variable v= alpha;
   if (smallFactorDeg >= liftBound || degree (A,y) <= 4)
-    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M, b, true);
   else if (sizeOfLiftPre > 1 && sizeOfLiftPre < 30)
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, b, true);
+    if (mipoHasDen)
+    {
+      for (CFListIterator iter= bufUniFactors; iter.hasItem(); iter++)
+        if (hasFirstAlgVar (iter.getItem(), v))
+          break;
+      if (v != alpha)
+      {
+        bufBufUniFactors= bufUniFactors;
+        for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+          iter.getItem()= replacevar (iter.getItem(), v, alpha);
+        A= replacevar (A, alpha, v);
+      }
+    }
+
     if (!extension)
-      earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                            factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg);
+    {
+      if (v==alpha)
+        earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
+                              factorsFoundIndex, degs, earlySuccess,
+                              smallFactorDeg, b);
+      else
+        earlyFactorDetection(earlyFactors, bufA, bufBufUniFactors, newLiftBound,
+                             factorsFoundIndex, degs, earlySuccess,
+                             smallFactorDeg, b);
+    }
     else
       extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -907 +1031 @@
         bufUniFactors.insert (LC (A, x));
         henselLiftResume12 (A, bufUniFactors, smallFactorDeg,
-                            liftPre[sizeOfLiftPre-1] + 1, Pi, diophant, M);
+                            liftPre[sizeOfLiftPre-1] + 1, Pi, diophant, M, b);
+        if (v!=alpha)
+        {
+          bufBufUniFactors= bufUniFactors;
+          for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+            iter.getItem()= replacevar (iter.getItem(), v, alpha);
+        }
         if (!extension)
+        {
+          if (v==alpha)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1);
+                                liftPre[sizeOfLiftPre-1] + 1, b);
+          else
+          earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
+                                factorsFoundIndex, degs, earlySuccess,
+                                liftPre[sizeOfLiftPre-1] + 1, b);
+        }
         else
-          extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
+          extEarlyFactorDetection (earlyFactors,bufA,bufUniFactors,newLiftBound,
                                    factorsFoundIndex, degs, earlySuccess, info,
                                    eval, liftPre[sizeOfLiftPre-1] + 1);
@@ -928 +1065 @@
         bufUniFactors.insert (LC (A, x));
         henselLiftResume12 (A, bufUniFactors, liftPre[i] + 1,
-                            liftPre[i-1] + 1, Pi, diophant, M);
+                            liftPre[i-1] + 1, Pi, diophant, M, b);
+        if (v!=alpha)
+        {
+          bufBufUniFactors= bufUniFactors;
+          for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+            iter.getItem()= replacevar (iter.getItem(), v, alpha);
+        }
         if (!extension)
+        {
+          if (v==alpha)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1);
+                                liftPre[i-1] + 1, b);
+          else
+          earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
+                                factorsFoundIndex, degs, earlySuccess,
+                                liftPre[i-1] + 1, b);
+        }
         else
-          extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
+          extEarlyFactorDetection (earlyFactors,bufA,bufUniFactors,newLiftBound,
                                    factorsFoundIndex, degs, earlySuccess, info,
                                    eval, liftPre[i-1] + 1);
@@ -951 +1101 @@
   else
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, b, true);
+    if (mipoHasDen)
+    {
+      for (CFListIterator iter= bufUniFactors; iter.hasItem(); iter++)
+        if (hasFirstAlgVar (iter.getItem(), v))
+          break;
+      if (v != alpha)
+      {
+        bufBufUniFactors= bufUniFactors;
+        for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+          iter.getItem()= replacevar (iter.getItem(), v, alpha);
+        A= replacevar (A, alpha, v);
+      }
+    }
     if (!extension)
+    {
+      if (v==alpha)
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg);
+                            smallFactorDeg, b);
+      else
+      earlyFactorDetection (earlyFactors, bufA, bufBufUniFactors, newLiftBound,
+                            factorsFoundIndex, degs, earlySuccess,
+                            smallFactorDeg, b);
+    }
     else
       extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -968 +1138 @@
       bufUniFactors.insert (LC (A, x));
       henselLiftResume12 (A, bufUniFactors, smallFactorDeg,
-                          dummy, Pi, diophant, M);
+                          dummy, Pi, diophant, M, b);
+      if (v!=alpha)
+      {
+        bufBufUniFactors= bufUniFactors;
+        for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+          iter.getItem()= replacevar (iter.getItem(), v, alpha);
+      }
       if (!extension)
+      {
+        if (v==alpha)
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy);
+                              factorsFoundIndex, degs, earlySuccess, dummy, b);
+        else
+        earlyFactorDetection (earlyFactors, bufA,bufBufUniFactors, newLiftBound,
+                              factorsFoundIndex, degs, earlySuccess, dummy, b);
+      }
       else
-        extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
+        extEarlyFactorDetection (earlyFactors, bufA,bufUniFactors, newLiftBound,
                                  factorsFoundIndex, degs, earlySuccess, info,
                                  eval, dummy);
@@ -984 +1166 @@
         dummy= tmin (degree (A,y)+1, (degree (A,y)/4)*(i+1)+4);
         henselLiftResume12 (A, bufUniFactors, (degree (A,y)/4)*i + 4,
-                            dummy, Pi, diophant, M);
+                            dummy, Pi, diophant, M, b);
+        if (v!=alpha)
+        {
+          bufBufUniFactors= bufUniFactors;
+          for (CFListIterator iter= bufBufUniFactors; iter.hasItem(); iter++)
+            iter.getItem()= replacevar (iter.getItem(), v, alpha);
+        }
         if (!extension)
+        {
+          if (v==alpha)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy);
+                                factorsFoundIndex, degs, earlySuccess, dummy,b);
+          else
+          earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
+                                factorsFoundIndex, degs, earlySuccess, dummy,b);
+        }
         else
-          extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
+          extEarlyFactorDetection (earlyFactors,bufA,bufUniFactors,newLiftBound,
                                    factorsFoundIndex, degs, earlySuccess, info,
                                    eval, dummy);
@@ -1016 +1210 @@
 
   return bufUniFactors;
+}
+
+CFList
+henselLiftAndEarly (CanonicalForm& A, bool& earlySuccess, CFList&
+                    earlyFactors, DegreePattern& degs, int& liftBound,
+                    const CFList& uniFactors, const ExtensionInfo& info,
+                    const CanonicalForm& eval)
+{
+  modpk dummy= modpk();
+  return henselLiftAndEarly (A, earlySuccess, earlyFactors, degs, liftBound,
+                             uniFactors, info, eval, dummy);
 }
 
@@ -1592 +1797 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -1760 +1967 @@
               buf= getCoeffs (A[ii] [i], k, l, degMipo, gamma, 0, *NTLMat);
             }
+            writeInMatrix (C, buf, ii + 1, 0);
           }
-          writeInMatrix (C, buf, ii + 1, 0);
           if (GF)
             setCharacteristic (getCharacteristic(), degMipo, info.getGFName());
@@ -1884 +2091 @@
 
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
 
@@ -2000 +2209 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k, alpha);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
 
@@ -2104 +2315 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -2235 +2448 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_pE(C);
@@ -2414 +2629 @@
               buf= getCoeffs (A[ii] [i], k, l, degMipo, gamma, 0, *NTLMat);
             }
+            writeInMatrix (C, buf, ii + 1, 0);
           }
-          writeInMatrix (C, buf, ii + 1, 0);
           if (GF)
             setCharacteristic (getCharacteristic(), degMipo, info.getGFName());
@@ -2558 +2773 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_pE(C);
@@ -2678 +2895 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k, alpha);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -2801 +3020 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -2903 +3124 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_pE(C);
@@ -3058 +3281 @@
               buf= getCoeffs (A[ii] [i], k, oldL, degMipo, gamma, 0, *NTLMat);
             }
+            writeInMatrix (C, buf, ii + 1, 0);
           }
-          writeInMatrix (C, buf, ii + 1, 0);
           if (GF)
             setCharacteristic (getCharacteristic(), degMipo, info.getGFName());
@@ -3182 +3405 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k, alpha);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -3286 +3511 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -3422 +3649 @@
         {
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_pE(C);
@@ -3611 +3840 @@
               buf= getCoeffs (A[ii] [i], k, l, degMipo, gamma, 0, *NTLMat);
             }
+            writeInMatrix (C, buf, ii + 1, 0);
           }
-          writeInMatrix (C, buf, ii + 1, 0);
           if (GF)
             setCharacteristic (getCharacteristic(), degMipo, info.getGFName());
@@ -3761 +3990 @@
           CFArray buf;
           if (A[ii].size() - 1 >= i)
+          {
             buf= getCoeffs (A[ii] [i], k, alpha);
-          writeInMatrix (C, buf, ii + 1, 0);
+            writeInMatrix (C, buf, ii + 1, 0);
+          }
         }
         NTLC= convertFacCFMatrix2NTLmat_zz_p(C);
@@ -4353 +4584 @@
   bool success;
   smallFactors= sieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi, M,
-                                   success, 2*(minBound + 1)
+                                   success, minBound + 1
                                   );
 
@@ -4478 +4709 @@
   {
     if (alpha.level() == 1)
-      oldL= liftAndComputeLattice (F, bounds, d, 2*(minBound + 1), liftBound,
+      oldL= liftAndComputeLattice (F, bounds, d, minBound + 1, liftBound,
                                    minBound, bufUniFactors, NTLN, diophant, M,
                                    Pi, bufQ, irreducible
@@ -4485 +4716 @@
     {
       if (reduceFq2Fp)
-        oldL= liftAndComputeLatticeFq2Fp (F, bounds, d, 2*(minBound + 1),
+        oldL= liftAndComputeLatticeFq2Fp (F, bounds, d, minBound + 1,
                                           liftBound, minBound, bufUniFactors,
                                           NTLN, diophant, M, Pi, bufQ,
@@ -4491 +4722 @@
                                          );
       else
-        oldL= liftAndComputeLattice (F, bounds, d, 2*(minBound + 1), liftBound,
+        oldL= liftAndComputeLattice (F, bounds, d, minBound + 1, liftBound,
                                      minBound, bufUniFactors, NTLNe, diophant,
                                      M, Pi, bufQ, irreducible
@@ -5595 +5826 @@
       TIMING_END_AND_PRINT (fac_uni_factorizer,
                             "time for univariate factorization in y: ");
-      DEBOUTLN (cerr, "Lc (Aeval2)*prod (uniFactors2)== Aeval2 " <<
+      DEBOUTLN (cerr, "Lc (bufAeval2)*prod (bufUniFactors2)== bufAeval2 " <<
                 (prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2));
     }
@@ -5955 +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);
@@ -6035 +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');
@@ -6044 +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);
@@ -6064 +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);