Changeset 2537fa0 in git for factory/facFqBivar.cc

Timestamp:

Mar 19, 2013, 2:31:03 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

2d35fe77fb45655052d739f5e90e572b52fe709f

Parents:

5e4636810908842f714d87ac378a9aa9c48ec33f

git-author:

Martin Lee <martinlee84@web.de>2013-03-19 14:31:03+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-22 15:53:08+01:00

Message:

chg: shift evaluation point during factor reconstruction

File:

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

factory/facFqBivar.cc

@@ -481 +481 @@
 CFList
 factorRecombination (CFList& factors, CanonicalForm& F,
-                     const CanonicalForm& N, DegreePattern& degs, int s,
-                     int thres, const modpk& b, const CanonicalForm& den
+                     const CanonicalForm& N, DegreePattern& degs, const
+                     CanonicalForm& eval, int s, int thres, const modpk& b,
+                     const CanonicalForm& den
                     )
 {
@@ -492 +493 @@
   if (F.inCoeffDomain())
     return CFList();
+  Variable y= Variable (2);
   if (degs.getLength() <= 1 || factors.length() == 1)
   {
-    CFList result= CFList (F);
+    CFList result= CFList (F(y-eval,y));
     F= 1;
     return result;
@@ -513 +515 @@
   T= factors;
   CFList result;
-  Variable y= Variable (2);
   Variable x= Variable (1);
   CanonicalForm denom= den, denQuot;
@@ -550 +551 @@
             g= b(g);
           T.removeFirst();
-          result.append (g/content (g, x));
+          g /= content (g,x);
+          result.append (g(y-eval,y));
           F= 1;
           return result;
@@ -556 +558 @@
         else
         {
-          result= CFList (F);
+          result= CFList (F(y-eval,y));
           F= 1;
           return result;
@@ -610 +612 @@
             denom *= abs (lc (g));
             recombination= true;
-            result.append (g);
+            result.append (g (y-eval,y));
             if (b.getp() != 0)
             {
@@ -638 +640 @@
               if (recombination)
               {
-                result.append (buf);
+                result.append (buf (y-eval,y));
                 F= 1;
                 return result;
@@ -644 +646 @@
               else
               {
-                result= CFList (F);
+                result= CFList (F (y-eval,y));
                 F= 1;
                 return result;
@@ -664 +666 @@
       if (recombination)
       {
-        result.append (buf);
+        result.append (buf(y-eval,y));
         F= 1;
         return result;
@@ -670 +672 @@
       else
       {
-        result= CFList (F);
+        result= CFList (F(y-eval,y));
         F= 1;
         return result;
@@ -682 +684 @@
   if (T.length() < 2*s)
   {
-    result.append (F);
+    result.append (F(y-eval,y));
     F= 1;
     return result;
@@ -735 +737 @@
 earlyFactorDetection (CFList& reconstructedFactors, CanonicalForm& F, CFList&
                       factors, int& adaptedLiftBound, int*& factorsFoundIndex,
-                      DegreePattern& degs, bool& success, int deg,
-                      const modpk& b, CanonicalForm& den)
+                      DegreePattern& degs, bool& success, int deg, const 
+                      CanonicalForm& eval, const modpk& b, CanonicalForm& den)
 {
   DegreePattern bufDegs1= degs;
@@ -743 +745 @@
   CanonicalForm buf= F;
   Variable x= Variable (1);
+  Variable y= Variable (2);
   CanonicalForm g, quot;
   CanonicalForm M= power (F.mvar(), deg);
@@ -798 +801 @@
           {
             den *= abs (lc (g));
-            reconstructedFactors.append (g);
+            reconstructedFactors.append (g (y-eval,y));
             factorsFoundIndex[l]= 1;
             if (b.getp() != 0)
@@ -827 +830 @@
               if (!buf.inCoeffDomain())
               {
-                reconstructedFactors.append (buf);
+                reconstructedFactors.append (buf (y-eval,y));
                 F= 1;
               }
@@ -852 +855 @@
 earlyFactorDetection (CFList& reconstructedFactors, CanonicalForm& F, CFList&
                       factors, int& adaptedLiftBound, int*& factorsFoundIndex,
-                      DegreePattern& degs, bool& success, int deg,
-                      const modpk& b)
+                      DegreePattern& degs, bool& success, int deg, const
+                      CanonicalForm& eval, const modpk& b)
 {
   CanonicalForm den= 1;
-  earlyFactorDetection (reconstructedFactors, F, factors, adaptedLiftBound, factorsFoundIndex, degs, success, deg,b, den);
+  earlyFactorDetection (reconstructedFactors, F, factors, adaptedLiftBound,
+                        factorsFoundIndex, degs, success, deg, eval, b, den);
 }
 
@@ -1127 +1131 @@
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                               factorsFoundIndex, degs, earlySuccess,
-                              smallFactorDeg, b, den);
+                              smallFactorDeg, eval, b, den);
       else
         earlyFactorDetection(earlyFactors, bufA, bufBufUniFactors, newLiftBound,
                              factorsFoundIndex, degs, earlySuccess,
-                             smallFactorDeg, b, den);
+                             smallFactorDeg, eval, b, den);
     }
     else
@@ -1156 +1160 @@
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1, b, den);
+                                liftPre[sizeOfLiftPre-1] + 1, eval, b, den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1, b, den);
+                                liftPre[sizeOfLiftPre-1] + 1, eval, b, den);
         }
         else
@@ -1190 +1194 @@
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1, b, den);
+                                liftPre[i-1] + 1, eval, b, den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1, b, den);
+                                liftPre[i-1] + 1, eval, b, den);
         }
         else
@@ -1233 +1237 @@
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg, b, den);
+                            smallFactorDeg, eval, b, den);
       else
       earlyFactorDetection (earlyFactors, bufA, bufBufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg, b, den);
+                            smallFactorDeg, eval, b, den);
     }
     else
@@ -1262 +1266 @@
         if (v==alpha)
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy, b,
-                              den);
+                              factorsFoundIndex, degs, earlySuccess, dummy,eval,
+                              b, den);
         else
         earlyFactorDetection (earlyFactors, bufA,bufBufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy, b,
-                              den);
+                              factorsFoundIndex, degs, earlySuccess, dummy,eval,
+                              b, den);
       }
       else
@@ -1292 +1296 @@
           if (v==alpha)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy,b,
-                                den);
+                                factorsFoundIndex, degs, earlySuccess, dummy,
+                                eval, b, den);
           else
           earlyFactorDetection (earlyFactors,bufA,bufBufUniFactors,newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy,b,
-                                den);
+                                factorsFoundIndex, degs, earlySuccess, dummy,
+                                eval, b, den);
         }
         else
@@ -1471 +1475 @@
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
                    factors, const int liftBound, int& factorsFound, int*&
-                   factorsFoundIndex, mat_zz_pE& N, bool beenInThres
+                   factorsFoundIndex, mat_zz_pE& N, const CanonicalForm& eval,
+                   bool beenInThres
                   )
 {
@@ -1477 +1482 @@
   Variable x= Variable (1);
   CanonicalForm yToL= power (y, liftBound);
+  CanonicalForm bufF= F (y-eval, y);
   if (factors.length() == 2)
   {
@@ -1484 +1490 @@
     tmp1= mulMod2 (tmp1, LC (F,x), yToL);
     tmp1 /= content (tmp1, x);
+    tmp1= tmp1 (y-eval, y);
     tmp2= mulMod2 (tmp2, LC (F,x), yToL);
     tmp2 /= content (tmp2, x);
+    tmp2= tmp2 (y-eval, y);
     tmp3 = tmp1*tmp2;
-    if (tmp3/Lc (tmp3) == F/Lc (F))
+    if (tmp3/Lc (tmp3) == bufF/Lc (bufF))
     {
       factorsFound++;
@@ -1524 +1532 @@
     buf= mulMod2 (buf, LC (F,x), yToL);
     buf /= content (buf, x);
-    if (fdivides (buf, F, quot))
+    buf= buf (y-eval,y);
+    if (fdivides (buf, bufF, quot))
     {
       factorsFoundIndex[i - 1]= 1;
       factorsFound++;
-      F= quot;
-      F /= Lc (F);
+      bufF= quot;
+      bufF /= Lc (bufF);
       reconstructedFactors.append (buf);
     }
-    if (degree (F) <= 0)
+    if (degree (bufF) <= 0)
       return;
     if (factorsFound + 1 == N.NumCols())
     {
-      reconstructedFactors.append (F);
+      reconstructedFactors.append (bufF);
+      F= 1;
       return;
     }
   }
+  if (reconstructedFactors.length() != 0)
+    F= bufF (y+eval,y);
 }
 
@@ -1545 +1557 @@
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
                    factors, const int liftBound, int& factorsFound, int*&
-                   factorsFoundIndex, mat_zz_p& N, bool beenInThres
+                   factorsFoundIndex, mat_zz_p& N, const CanonicalForm& eval,
+                   bool beenInThres
                   )
 {
@@ -1551 +1564 @@
   Variable x= Variable (1);
   CanonicalForm yToL= power (y, liftBound);
+  CanonicalForm bufF= F (y-eval, y);
   if (factors.length() == 2)
   {
@@ -1558 +1572 @@
     tmp1= mulMod2 (tmp1, LC (F,x), yToL);
     tmp1 /= content (tmp1, x);
+    tmp1= tmp1 (y-eval, y);
     tmp2= mulMod2 (tmp2, LC (F,x), yToL);
     tmp2 /= content (tmp2, x);
+    tmp2= tmp2 (y-eval,y);
     tmp3 = tmp1*tmp2;
-    if (tmp3/Lc (tmp3) == F/Lc (F))
+    if (tmp3/Lc (tmp3) == bufF/Lc (bufF))
     {
       factorsFound++;
@@ -1598 +1614 @@
     buf= mulMod2 (buf, LC (F,x), yToL);
     buf /= content (buf, x);
-    if (fdivides (buf, F, quot))
+    buf= buf (y-eval,y);
+    if (fdivides (buf, bufF, quot))
     {
       factorsFoundIndex[i - 1]= 1;
       factorsFound++;
-      F= quot;
-      F /= Lc (F);
+      bufF= quot;
+      bufF /= Lc (bufF);
       reconstructedFactors.append (buf);
     }
-    if (degree (F) <= 0)
+    if (degree (bufF) <= 0)
       return;
     if (factorsFound + 1 == N.NumCols())
     {
-      reconstructedFactors.append (F);
+      reconstructedFactors.append (bufF);
+      F=1;
       return;
     }
   }
+  if (reconstructedFactors.length() != 0)
+    F= bufF (y+eval,y);
 }
 
@@ -1620 +1640 @@
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
                    factors, const int liftBound, int& factorsFound, int*&
-                   factorsFoundIndex, nmod_mat_t N, bool beenInThres
+                   factorsFoundIndex, nmod_mat_t N, const CanonicalForm& eval,
+                   bool beenInThres
                   )
 {
@@ -1626 +1647 @@
   Variable x= Variable (1);
   CanonicalForm yToL= power (y, liftBound);
+  CanonicalForm bufF= F (y-eval, y);
   if (factors.length() == 2)
   {
@@ -1633 +1655 @@
     tmp1= mulMod2 (tmp1, LC (F,x), yToL);
     tmp1 /= content (tmp1, x);
+    tmp1= tmp1 (y-eval, y);
     tmp2= mulMod2 (tmp2, LC (F,x), yToL);
     tmp2 /= content (tmp2, x);
+    tmp2= tmp2 (y-eval, y);
     tmp3 = tmp1*tmp2;
-    if (tmp3/Lc (tmp3) == F/Lc (F))
+    if (tmp3/Lc (tmp3) == bufF/Lc (bufF))
     {
       factorsFound++;
@@ -1673 +1697 @@
     buf= mulMod2 (buf, LC (F,x), yToL);
     buf /= content (buf, x);
-    if (fdivides (buf, F, quot))
+    buf= buf (y-eval,y);
+    if (fdivides (buf, bufF, quot))
     {
       factorsFoundIndex[i]= 1;
       factorsFound++;
-      F= quot;
-      F /= Lc (F);
+      bufF= quot;
+      bufF /= Lc (bufF);
       reconstructedFactors.append (buf);
     }
@@ -1685 +1710 @@
     if (factorsFound + 1 == nmod_mat_ncols (N))
     {
-      reconstructedFactors.append (F);
+      F= 1;
+      reconstructedFactors.append (bufF);
       return;
     }
   }
+  if (reconstructedFactors.length() != 0)
+    F= bufF (y+eval,y);
 }
 #endif
@@ -1694 +1722 @@
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
-                precision, const mat_zz_pE& N
+                precision, const mat_zz_pE& N, const CanonicalForm& eval
                )
 {
@@ -1726 +1754 @@
       F= quot;
       F /= Lc (F);
-      result.append (buf);
+      result.append (buf (y-eval,y));
       bufFactors= Difference (bufFactors, factorsConsidered);
     }
@@ -1954 +1982 @@
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
-                int precision, const mat_zz_p& N)
+                int precision, const mat_zz_p& N, const CanonicalForm& eval)
 {
   Variable y= Variable (2);
@@ -1986 +2014 @@
       F= quot;
       F /= Lc (F);
-      result.append (buf);
+      result.append (buf (y-eval,y));
       bufFactors= Difference (bufFactors, factorsConsidered);
     }
@@ -2004 +2032 @@
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
-                int precision, const nmod_mat_t N)
+                int precision, const nmod_mat_t N, const CanonicalForm& eval)
 {
   Variable y= Variable (2);
@@ -2036 +2064 @@
       F= quot;
       F /= Lc (F);
-      result.append (buf);
+      result.append (buf (y-eval,y));
       bufFactors= Difference (bufFactors, factorsConsidered);
     }
@@ -3255 +3283 @@
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int factorsFound,
-                   int oldNumCols, int oldL, int precision
+                   int oldNumCols, int oldL, int precision,
+                   const CanonicalForm& eval
                   )
 {
@@ -3261 +3290 @@
   bool isIrreducible= false;
   int* bounds= computeBounds (F, d, isIrreducible);
+  Variable y= F.mvar();
   if (isIrreducible)
   {
@@ -3266 +3296 @@
     CanonicalForm G= F;
     F= 1;
-    return CFList (G);
+    return CFList (G (y-eval, y));
   }
   CFArray * A= new CFArray [factors.length()];
@@ -3299 +3329 @@
   mat_zz_p* NTLC, NTLK;
 #endif
-  Variable y= F.mvar();
   CanonicalForm truncF;
   while (l <= precision)
@@ -3372 +3401 @@
           CanonicalForm G= F;
           F= 1;
-          return CFList (G);
+          return CFList (G (y-eval,y));
         }
       }
@@ -3398 +3427 @@
 #ifdef HAVE_FLINT
         reconstructionTry (result, bufF, factors, degree (F) + 1, factorsFound2,
-                           factorsFoundIndex, FLINTN, false
+                           factorsFoundIndex, FLINTN, eval, false
                           );
         if (result.length() == nmod_mat_ncols (FLINTN))
@@ -3405 +3434 @@
 #else
         reconstructionTry (result, bufF, factors, degree (F) + 1, factorsFound2,
-                           factorsFoundIndex, NTLN, false
+                           factorsFoundIndex, NTLN, eval, false
                           );
         if (result.length() == NTLN.NumCols())
@@ -3423 +3452 @@
 #ifdef HAVE_FLINT
         int * zeroOne= extractZeroOneVecs (FLINTN);
-        CFList result= reconstruction (bufF,factors,zeroOne,precision,FLINTN);
+        CFList result= reconstruction (bufF,factors,zeroOne,precision,FLINTN, eval);
         nmod_mat_clear (FLINTN);
 #else
         int * zeroOne= extractZeroOneVecs (NTLN);
-        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN);
+        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN, eval);
 #endif
         F= bufF;
@@ -3461 +3490 @@
 increasePrecision (CanonicalForm& F, CFList& factors, int factorsFound,
                    int oldNumCols, int oldL, const Variable&,
-                   int precision
+                   int precision, const CanonicalForm& eval
                   )
 {
   int d;
   bool isIrreducible= false;
+  Variable y= F.mvar();
   int* bounds= computeBounds (F, d, isIrreducible);
   if (isIrreducible)
@@ -3472 +3502 @@
     CanonicalForm G= F;
     F= 1;
-    return CFList (G);
+    return CFList (G (y-eval,y));
   }
   CFArray * A= new CFArray [factors.length()];
@@ -3493 +3523 @@
   mat_zz_pE* NTLC, NTLK;
   CFArray buf;
-  Variable y= F.mvar();
   CanonicalForm truncF;
   while (l <= precision)
@@ -3538 +3567 @@
           CanonicalForm G= F;
           F= 1;
-          return CFList (G);
+          return CFList (G (y-eval,y));
         }
       }
@@ -3554 +3583 @@
         CanonicalForm bufF= F;
         reconstructionTry (result, bufF, factors, degree (F) + 1, factorsFound2,
-                           factorsFoundIndex, NTLN, false);
+                           factorsFoundIndex, NTLN, eval, false);
         if (result.length() == NTLN.NumCols())
         {
@@ -3569 +3598 @@
         CanonicalForm bufF= F;
         int * zeroOne= extractZeroOneVecs (NTLN);
-        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN);
+        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN, eval);
         F= bufF;
         delete [] zeroOne;
@@ -3937 +3966 @@
 increasePrecisionFq2Fp (CanonicalForm& F, CFList& factors, int factorsFound,
                         int oldNumCols, int oldL, const Variable& alpha,
-                        int precision
+                        int precision, const CanonicalForm& eval
                        )
 {
   int d;
   bool isIrreducible= false;
+  Variable y= F.mvar();
   int* bounds= computeBounds (F, d, isIrreducible);
   if (isIrreducible)
@@ -3948 +3978 @@
     CanonicalForm G= F;
     F= 1;
-    return CFList (G);
+    return CFList (G (y-eval,y));
   }
   int extensionDeg= degree (getMipo (alpha));
@@ -3982 +4012 @@
 #endif
   CFArray buf;
-  Variable y= F.mvar();
   CanonicalForm truncF;
   while (l <= precision)
@@ -4055 +4084 @@
           CanonicalForm G= F;
           F= 1;
-          return CFList (G);
+          return CFList (G (y-eval,y));
         }
       }
@@ -4081 +4110 @@
 #ifdef HAVE_FLINT
         reconstructionTry (result, bufF, factors, degree (F) + 1, factorsFound2,
-                           factorsFoundIndex, FLINTN, false
+                           factorsFoundIndex, FLINTN, eval, false
                           );
         if (result.length() == nmod_mat_ncols (FLINTN))
@@ -4088 +4117 @@
 #else
         reconstructionTry (result, bufF, factors, degree (F) + 1, factorsFound2,
-                           factorsFoundIndex, NTLN, false
+                           factorsFoundIndex, NTLN, eval, false
                           );
         if (result.length() == NTLN.NumCols())
@@ -4106 +4135 @@
 #ifdef HAVE_FLINT
         int * zeroOne= extractZeroOneVecs (FLINTN);
-        CFList result= reconstruction (bufF,factors,zeroOne,precision,FLINTN);
+        CFList result= reconstruction (bufF,factors,zeroOne,precision,FLINTN, eval);
         nmod_mat_clear (FLINTN);
 #else
         int * zeroOne= extractZeroOneVecs (NTLN);
-        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN);
+        CFList result= reconstruction (bufF, factors, zeroOne, precision, NTLN, eval);
 #endif
         F= bufF;
@@ -4144 +4173 @@
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int oldL, int
-                   l, int d, int* bounds, CFArray& bufQ, nmod_mat_t FLINTN
+                   l, int d, int* bounds, CFArray& bufQ, nmod_mat_t FLINTN,
+                   const CanonicalForm& eval
                   )
 #else
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int oldL, int
-                   l, int d, int* bounds, CFArray& bufQ, mat_zz_p& NTLN
+                   l, int d, int* bounds, CFArray& bufQ, mat_zz_p& NTLN,
+                   const CanonicalForm& eval
                   )
 #endif
@@ -4253 +4284 @@
         {
           delete [] A;
-          return CFList (F);
+          return CFList (F (y-eval,y));
         }
       }
@@ -4264 +4295 @@
     {
       delete [] A;
-      return CFList (F);
+      return CFList (F (y-eval,y));
     }
     int * zeroOneVecs;
@@ -4275 +4306 @@
     bufUniFactors= factors;
 #ifdef HAVE_FLINT
-    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, FLINTN);
-#else
-    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN);
+    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, FLINTN, eval);
+#else
+    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN, eval);
 #endif
     delete [] zeroOneVecs;
@@ -4308 +4339 @@
 CFList
 increasePrecision (CanonicalForm& F, CFList& factors, int oldL, int
-                   l, int d, int* bounds, CFArray& bufQ, mat_zz_pE& NTLN
+                   l, int d, int* bounds, CFArray& bufQ, mat_zz_pE& NTLN,
+                   const CanonicalForm& eval
                   )
 {
@@ -4366 +4398 @@
         {
           delete [] A;
-          return CFList (F);
+          return CFList (F (y-eval,y));
         }
       }
@@ -4373 +4405 @@
     {
       delete [] A;
-      return CFList (F);
+      return CFList (F (y-eval,y));
     }
 
@@ -4380 +4412 @@
     bufF= F;
     bufUniFactors= factors;
-    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN);
+    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN, eval);
     delete [] zeroOneVecs;
     if (degree (bufF) + 1 + degree (LC (bufF, 1)) < l && result.length() > 0)
@@ -4583 +4615 @@
 increasePrecisionFq2Fp (CanonicalForm& F, CFList& factors, int oldL, int l,
                         int d, int* bounds, CFArray& bufQ, nmod_mat_t FLINTN,
-                        const Variable& alpha
+                        const Variable& alpha, const CanonicalForm& eval
                        )
 #else
@@ -4589 +4621 @@
 increasePrecisionFq2Fp (CanonicalForm& F, CFList& factors, int oldL, int l,
                         int d, int* bounds, CFArray& bufQ, mat_zz_p& NTLN,
-                        const Variable& alpha
+                        const Variable& alpha, const CanonicalForm& eval
                        )
 #endif
@@ -4690 +4722 @@
         {
           delete [] A;
-          return CFList (F);
+          return CFList (F(y-eval,y));
         }
       }
@@ -4705 +4737 @@
     bufUniFactors= factors;
 #ifdef HAVE_FLINT
-    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, FLINTN);
-#else
-    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN);
+    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, FLINTN, eval);
+#else
+    result= reconstruction (bufF, bufUniFactors, zeroOneVecs, oldL, NTLN, eval);
 #endif
     delete [] zeroOneVecs;
@@ -4741 +4773 @@
                                     factors, int l, int liftBound, int d, int*
                                     bounds, nmod_mat_t FLINTN, CFList& diophant,
-                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ
+                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ,
+                                    const CanonicalForm& eval
                                    )
 #else
@@ -4748 +4781 @@
                                     factors, int l, int liftBound, int d, int*
                                     bounds, mat_zz_p& NTLN, CFList& diophant,
-                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ
+                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ,
+                                    const CanonicalForm& eval
                                    )
 #endif
@@ -4875 +4909 @@
     bufF= F;
 #ifdef HAVE_FLINT
-    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, FLINTN);
-#else
-    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN);
+    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, FLINTN, eval);
+#else
+    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN, eval);
 #endif
     delete [] zeroOneVecs;
@@ -4907 +4941 @@
       if (l < liftBound)
         reconstructionTry (result, bufF, bufFactors, l, factorsFound,
-                           factorsFoundIndex, FLINTN, false
+                           factorsFoundIndex, FLINTN, eval, false
                           );
       else
         reconstructionTry (result, bufF, bufFactors, degree (bufF) + 1 +
                            degree (LCF), factorsFound, factorsFoundIndex,
-                           FLINTN, false
+                           FLINTN, eval, false
                           );
 
@@ -4919 +4953 @@
       if (l < liftBound)
         reconstructionTry (result, bufF, bufFactors, l, factorsFound,
-                           factorsFoundIndex, NTLN, false
+                           factorsFoundIndex, NTLN, eval, false
                           );
       else
         reconstructionTry (result, bufF, bufFactors, degree (bufF) + 1 +
                            degree (LCF), factorsFound, factorsFoundIndex,
-                           NTLN, false
+                           NTLN, eval, false
                           );
 
@@ -4954 +4988 @@
   {
     delete [] A;
-    return CFList (F);
+    return CFList (F (y-eval,y));
   }
   delete [] A;
@@ -4966 +5000 @@
                                     factors, int l, int liftBound, int d, int*
                                     bounds, mat_zz_pE& NTLN, CFList& diophant,
-                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ
+                                    CFMatrix& M, CFArray& Pi, CFArray& bufQ,
+                                    const CanonicalForm& eval
                                    )
 {
@@ -5038 +5073 @@
     int * zeroOneVecs= extractZeroOneVecs (NTLN);
     bufF= F;
-    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN);
+    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN, eval);
     delete [] zeroOneVecs;
     if (result.length() > 0 && degree (bufF) + 1 + degree (LC (bufF, 1)) <= l)
@@ -5057 +5092 @@
       if (l < liftBound)
         reconstructionTry (result, bufF, bufFactors, l, factorsFound,
-                           factorsFoundIndex, NTLN, false
+                           factorsFoundIndex, NTLN, eval, false
                           );
       else
         reconstructionTry (result, bufF, bufFactors, degree (bufF) + 1 +
                            degree (LCF), factorsFound, factorsFoundIndex,
-                           NTLN, false
+                           NTLN, eval, false
                           );
       if (NTLN.NumCols() == result.length())
@@ -5090 +5125 @@
   {
     delete [] A;
-    return CFList (F);
+    return CFList (F (y-eval,y));
   }
   delete [] A;
@@ -5306 +5341 @@
                                          nmod_mat_t FLINTN, CFList& diophant,
                                          CFMatrix& M, CFArray& Pi, CFArray& bufQ,
-                                         const Variable& alpha
+                                         const Variable& alpha,
+                                         const CanonicalForm& eval
                                         )
 #else
@@ -5314 +5350 @@
                                          mat_zz_p& NTLN, CFList& diophant,
                                          CFMatrix& M, CFArray& Pi, CFArray& bufQ,
-                                         const Variable& alpha
+                                         const Variable& alpha,
+                                         const CanonicalForm& eval
                                         )
 #endif
@@ -5439 +5476 @@
     CanonicalForm bufF= F;
 #ifdef HAVE_FLINT
-    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, FLINTN);
-#else
-    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN);
+    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, FLINTN, eval);
+#else
+    result= reconstruction (bufF, bufFactors, zeroOneVecs, l, NTLN,  eval);
 #endif
     delete [] zeroOneVecs;
@@ -5471 +5508 @@
       if (l < degree (bufF) + 1 + degree (LCF))
         reconstructionTry (result, bufF, bufFactors, l, factorsFound,
-                           factorsFoundIndex, FLINTN, false
+                           factorsFoundIndex, FLINTN, eval, false
                           );
       else
         reconstructionTry (result, bufF, bufFactors, degree (bufF) + 1 +
                            degree (LCF), factorsFound, factorsFoundIndex,
-                           FLINTN, false
+                           FLINTN, eval, false
                           );
       if (nmod_mat_ncols (FLINTN) == result.length())
@@ -5482 +5519 @@
       if (l < degree (bufF) + 1 + degree (LCF))
         reconstructionTry (result, bufF, bufFactors, l, factorsFound,
-                           factorsFoundIndex, NTLN, false
+                           factorsFoundIndex, NTLN, eval, false
                           );
       else
         reconstructionTry (result, bufF, bufFactors, degree (bufF) + 1 +
                            degree (LCF), factorsFound, factorsFoundIndex,
-                           NTLN, false
+                           NTLN, eval, false
                           );
       if (NTLN.NumCols() == result.length())
@@ -5516 +5553 @@
   {
     delete [] A;
-    return CFList (F);
+    return CFList (F (y-eval,y));
   }
   delete [] A;
@@ -5663 +5700 @@
 #ifdef HAVE_FLINT
     reconstructionTry (result, bufF, factors, smallFactorDeg, factorsFound,
-                       factorsFoundIndex, FLINTN, beenInThres
+                       factorsFoundIndex, FLINTN, evaluation, beenInThres
                       );
     if (result.length() == nmod_mat_ncols (FLINTN))
@@ -5670 +5707 @@
 #else
     reconstructionTry (result, bufF, factors, smallFactorDeg, factorsFound,
-                       factorsFoundIndex, NTLN, beenInThres
+                       factorsFoundIndex, NTLN, evaluation, beenInThres
                       );
     if (result.length() == NTLN.NumCols())
@@ -5701 +5738 @@
 #ifdef HAVE_FLINT
       reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, FLINTN, beenInThres
+                         factorsFoundIndex, FLINTN, evaluation, beenInThres
                         );
       if (result.length() == nmod_mat_ncols (FLINTN))
@@ -5708 +5745 @@
 #else
       reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, NTLN, beenInThres
+                         factorsFoundIndex, NTLN, evaluation, beenInThres
                         );
       if (result.length() == NTLN.NumCols())
@@ -5728 +5765 @@
     {
       dummy= tmin (degree (F,y)+1, ((degree (F,y)/4)+1)*i+4);
+      if (l < dummy)
+      {
+        factors.insert (LCF);
+        henselLiftResume12 (F, factors, l, dummy, Pi, diophant, M);
+        l= dummy;
+        if (i == 1 && degree (F)%4==0 && symmetric && factors.length() == 2 &&
+            LC (F,1).inCoeffDomain() &&
+           (degree (factors.getFirst(), 1) == degree (factors.getLast(),1)))
+        {
+          Variable x= Variable (1);
+          CanonicalForm g, h, gg, hh, multiplier1, multiplier2, check1, check2;
+          int m= degree (F)/4+1;
+          g= factors.getFirst();
+          h= factors.getLast();
+          g= mod (g, power (y,m));
+          h= mod (h, power (y,m));
+          g= g (y-evaluation, y);
+          h= h (y-evaluation, y);
+          gg= mod (swapvar (g,x,y),power (x,m));
+          gg= gg (y + evaluation, y);
+          multiplier1= factors.getLast()[m-1][0]/gg[m-1][0];
+          gg= div (gg, power (y,m));
+          gg= gg*power (y,m);
+          hh= mod (swapvar (h,x,y),power (x,m));
+          hh= hh (y + evaluation, y);
+          multiplier2= factors.getFirst()[m-1][0]/hh[m-1][0];
+          hh= div (hh, power (y,m));
+          hh= hh*power (y,m);
+          gg= multiplier1*gg+mod (factors.getLast(), power (y,m));
+          hh= multiplier2*hh+mod (factors.getFirst(), power (y,m));
+          check1= gg (y-evaluation,y);
+          check2= hh (y-evaluation,y);
+          CanonicalForm oldcheck1= check1;
+          check1= swapvar (check1, x, y);
+          if (check1/Lc (check1) == check2/Lc (check2))
+          {
+#ifdef HAVE_FLINT
+            nmod_mat_clear (FLINTN);
+#endif
+            result.append (oldcheck1);
+            result.append (check2);
+            delete [] liftPre;
+            delete [] factorsFoundIndex;
+            return result;
+          }
+        }
+      }
+      else
+      {
+        i++;
+        if (i < 5)
+          continue;
+      }
+#ifdef HAVE_FLINT
+      reconstructionTry (result, bufF, factors, l, factorsFound,
+                         factorsFoundIndex, FLINTN, evaluation, beenInThres
+                        );
+      if (result.length() == nmod_mat_ncols (FLINTN))
+      {
+        nmod_mat_clear (FLINTN);
+#else
+      reconstructionTry (result, bufF, factors, l, factorsFound,
+                         factorsFoundIndex, NTLN, evaluation, beenInThres
+                        );
+      if (result.length() == NTLN.NumCols())
+      {
+#endif
+        delete [] liftPre;
+        delete [] factorsFoundIndex;
+        return result;
+      }
+      i++;
+    }
+  }
+
+#ifdef HAVE_FLINT
+  nmod_mat_clear (FLINTN);
+#endif
+  delete [] liftPre;
+  delete [] factorsFoundIndex;
+  return result;
+}
+
+CFList
+earlyReconstructionAndLifting (const CanonicalForm& F, const mat_zz_pE& N,
+                               CanonicalForm& bufF, CFList& factors, int& l,
+                               int& factorsFound, bool beenInThres, CFMatrix& M,
+                               CFArray& Pi, CFList& diophant, bool symmetric,
+                               const CanonicalForm& evaluation
+                              )
+{
+  int sizeOfLiftPre;
+  int * liftPre= getLiftPrecisions (F, sizeOfLiftPre, degree (LC (F, 1), 2));
+  Variable y= F.mvar();
+  factorsFound= 0;
+  CanonicalForm LCF= LC (F, 1);
+  CFList result;
+  int smallFactorDeg= 11;
+  mat_zz_pE NTLN= N;
+  int * factorsFoundIndex= new int [NTLN.NumCols()];
+  for (long i= 0; i < NTLN.NumCols(); i++)
+    factorsFoundIndex [i]= 0;
+
+  if (degree (F) + 1 > smallFactorDeg)
+  {
+    if (l < smallFactorDeg)
+    {
+      factors.insert (LCF);
+      henselLiftResume12 (F, factors, l, smallFactorDeg, Pi, diophant, M);
+      l= smallFactorDeg;
+    }
+    reconstructionTry (result, bufF, factors, smallFactorDeg, factorsFound,
+                       factorsFoundIndex, NTLN, evaluation, beenInThres
+                      );
+    if (result.length() == NTLN.NumCols())
+    {
+      delete [] liftPre;
+      delete [] factorsFoundIndex;
+      return result;
+    }
+  }
+
+  int i= sizeOfLiftPre - 1;
+  int dummy= 1;
+  if (sizeOfLiftPre > 1 && sizeOfLiftPre < 30)
+  {
+    while (i > 0)
+    {
+      if (l < liftPre[i-1] + 1)
+      {
+        factors.insert (LCF);
+        henselLiftResume12 (F, factors, l, liftPre[i-1] + 1, Pi, diophant, M);
+        l= liftPre[i-1] + 1;
+      }
+      else
+      {
+        i--;
+        if (i != 0)
+          continue;
+      }
+      reconstructionTry (result, bufF, factors, l, factorsFound,
+                         factorsFoundIndex, NTLN, evaluation, beenInThres
+                        );
+      if (result.length() == NTLN.NumCols())
+      {
+        delete [] liftPre;
+        delete [] factorsFoundIndex;
+        return result;
+      }
+      i--;
+    }
+  }
+  else
+  {
+    i= 1;
+    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
+      i++;
+    while (i < 5)
+    {
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
       if (l < dummy)
       {
@@ -5763 +5960 @@
           if (check1/Lc (check1) == check2/Lc (check2))
           {
-#ifdef HAVE_FLINT
-            nmod_mat_clear (FLINTN);
-#endif
-            result.append (gg);
-            result.append (hh);
+            result.append (check1);
+            result.append (check2);
             delete [] liftPre;
             delete [] factorsFoundIndex;
@@ -5780 +5974 @@
           continue;
       }
-#ifdef HAVE_FLINT
       reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, FLINTN, beenInThres
-                        );
-      if (result.length() == nmod_mat_ncols (FLINTN))
-      {
-        nmod_mat_clear (FLINTN);
-#else
-      reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, NTLN, beenInThres
-                        );
-      if (result.length() == NTLN.NumCols())
-      {
-#endif
-        delete [] liftPre;
-        delete [] factorsFoundIndex;
-        return result;
-      }
-      i++;
-    }
-  }
-
-#ifdef HAVE_FLINT
-  nmod_mat_clear (FLINTN);
-#endif
-  delete [] liftPre;
-  delete [] factorsFoundIndex;
-  return result;
-}
-
-CFList
-earlyReconstructionAndLifting (const CanonicalForm& F, const mat_zz_pE& N,
-                               CanonicalForm& bufF, CFList& factors, int& l,
-                               int& factorsFound, bool beenInThres, CFMatrix& M,
-                               CFArray& Pi, CFList& diophant, bool symmetric,
-                               const CanonicalForm& evaluation
-                              )
-{
-  int sizeOfLiftPre;
-  int * liftPre= getLiftPrecisions (F, sizeOfLiftPre, degree (LC (F, 1), 2));
-  Variable y= F.mvar();
-  factorsFound= 0;
-  CanonicalForm LCF= LC (F, 1);
-  CFList result;
-  int smallFactorDeg= 11;
-  mat_zz_pE NTLN= N;
-  int * factorsFoundIndex= new int [NTLN.NumCols()];
-  for (long i= 0; i < NTLN.NumCols(); i++)
-    factorsFoundIndex [i]= 0;
-
-  if (degree (F) + 1 > smallFactorDeg)
-  {
-    if (l < smallFactorDeg)
-    {
-      factors.insert (LCF);
-      henselLiftResume12 (F, factors, l, smallFactorDeg, Pi, diophant, M);
-      l= smallFactorDeg;
-    }
-    reconstructionTry (result, bufF, factors, smallFactorDeg, factorsFound,
-                       factorsFoundIndex, NTLN, beenInThres
-                      );
-    if (result.length() == NTLN.NumCols())
-    {
-      delete [] liftPre;
-      delete [] factorsFoundIndex;
-      return result;
-    }
-  }
-
-  int i= sizeOfLiftPre - 1;
-  int dummy= 1;
-  if (sizeOfLiftPre > 1 && sizeOfLiftPre < 30)
-  {
-    while (i > 0)
-    {
-      if (l < liftPre[i-1] + 1)
-      {
-        factors.insert (LCF);
-        henselLiftResume12 (F, factors, l, liftPre[i-1] + 1, Pi, diophant, M);
-        l= liftPre[i-1] + 1;
-      }
-      else
-      {
-        i--;
-        if (i != 0)
-          continue;
-      }
-      reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, NTLN, beenInThres
-                        );
-      if (result.length() == NTLN.NumCols())
-      {
-        delete [] liftPre;
-        delete [] factorsFoundIndex;
-        return result;
-      }
-      i--;
-    }
-  }
-  else
-  {
-    i= 1;
-    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
-      i++;
-    while (i < 5)
-    {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
-      if (l < dummy)
-      {
-        factors.insert (LCF);
-        henselLiftResume12 (F, factors, l, dummy, Pi, diophant, M);
-        l= dummy;
-        if (i == 1 && degree (F)%4==0 && symmetric && factors.length() == 2 &&
-            LC (F,1).inCoeffDomain() &&
-           (degree (factors.getFirst(), 1) == degree (factors.getLast(),1)))
-        {
-          Variable x= Variable (1);
-          CanonicalForm g, h, gg, hh, multiplier1, multiplier2, check1, check2;
-          int m= degree (F)/4+1;
-          g= factors.getFirst();
-          h= factors.getLast();
-          g= mod (g, power (y,m));
-          h= mod (h, power (y,m));
-          g= g (y-evaluation, y);
-          h= h (y-evaluation, y);
-          gg= mod (swapvar (g,x,y),power (x,m));
-          gg= gg (y + evaluation, y);
-          multiplier1= factors.getLast()[m-1][0]/gg[m-1][0];
-          gg= div (gg, power (y,m));
-          gg= gg*power (y,m);
-          hh= mod (swapvar (h,x,y),power (x,m));
-          hh= hh (y + evaluation, y);
-          multiplier2= factors.getFirst()[m-1][0]/hh[m-1][0];
-          hh= div (hh, power (y,m));
-          hh= hh*power (y,m);
-          gg= multiplier1*gg+mod (factors.getLast(), power (y,m));
-          hh= multiplier2*hh+mod (factors.getFirst(), power (y,m));
-          check1= gg (y-evaluation,y);
-          check2= hh (y-evaluation,y);
-          check1= swapvar (check1, x, y);
-          if (check1/Lc (check1) == check2/Lc (check2))
-          {
-            result.append (gg);
-            result.append (hh);
-            delete [] liftPre;
-            delete [] factorsFoundIndex;
-            return result;
-          }
-        }
-      }
-      else
-      {
-        i++;
-        if (i < 5)
-          continue;
-      }
-      reconstructionTry (result, bufF, factors, l, factorsFound,
-                         factorsFoundIndex, NTLN, beenInThres
+                         factorsFoundIndex, NTLN, evaluation, beenInThres
                         );
       if (result.length() == NTLN.NumCols())
@@ -6069 +6107 @@
 sieveSmallFactors (const CanonicalForm& G, CFList& uniFactors, DegreePattern&
                    degPat, CanonicalForm& H, CFList& diophant, CFArray& Pi,
-                   CFMatrix& M, bool& success, int d
+                   CFMatrix& M, bool& success, int d, const CanonicalForm& eval
                   )
 {
@@ -6085 +6123 @@
   CFList earlyFactors;
   earlyFactorDetection (earlyFactors, F, bufUniFactors, adaptedLiftBound,
-                        factorsFoundIndex, degs, success, smallFactorDeg);
+                        factorsFoundIndex, degs, success, smallFactorDeg, eval);
   delete [] factorsFoundIndex;
   if (degs.getLength() == 1)
@@ -6162 +6200 @@
 henselLiftAndLatticeRecombi (const CanonicalForm& G, const CFList& uniFactors,
                              const Variable& alpha, const DegreePattern& degPat,
-                             bool symmetric, const CanonicalForm& evaluation
+                             bool symmetric, const CanonicalForm& eval
                             )
 {
@@ -6195 +6233 @@
   bool success= false;
   smallFactors= sieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi, M,
-                                   success, minBound + 1
+                                   success, minBound + 1, eval
                                   );
 
@@ -6205 +6243 @@
       {
         delete [] bounds;
-        return CFList (G);
+        return CFList (G (y-eval,y));
       }
     }
@@ -6220 +6258 @@
   {
     index= 1;
-    tmp1= mod (i.getItem(),y);
+    tmp1= mod (i.getItem(),y-eval);
     tmp1 /= Lc (tmp1);
     for (CFListIterator j= bufUniFactors; j.hasItem(); j++, index++)
@@ -6248 +6286 @@
     if (isIrreducible)
     {
-      smallFactors.append (F);
+      smallFactors.append (F (y-eval,y));
       delete [] bounds;
       return smallFactors;
@@ -6269 +6307 @@
     if (degs.getLength() <= 1)
     {
-      smallFactors.append (F);
+      smallFactors.append (F (y-eval,y));
       delete [] bounds;
       return smallFactors;
@@ -6400 +6438 @@
                   factorRecombination (bufUniFactors, F,
                                        power (y, degree (F) + 1),
-                                       degs, 1, bufUniFactors.length()/2
+                                       degs, eval, 1, bufUniFactors.length()/2
                                       )
                  );
@@ -6413 +6451 @@
 #endif
     delete [] bounds;
-    return Union (CFList (F), smallFactors);
+    return Union (CFList (F(y-eval,y)), smallFactors);
   }
 
@@ -6444 +6482 @@
       reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
 #ifdef HAVE_FLINT
-                         factorsFound, factorsFoundIndex, FLINTN, false
-#else
-                         factorsFound, factorsFoundIndex, NTLN, false
+                         factorsFound, factorsFoundIndex, FLINTN, eval, false
+#else
+                         factorsFound, factorsFoundIndex, NTLN, eval, false
 #endif
                         );
     else
         reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
-                           factorsFound, factorsFoundIndex, NTLNe, false
+                           factorsFound, factorsFoundIndex, NTLNe, eval, false
                           );
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
@@ -6505 +6543 @@
       reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
 #ifdef HAVE_FLINT
-                         factorsFound, factorsFoundIndex, FLINTN, false
-#else
-                         factorsFound, factorsFoundIndex, NTLN, false
+                         factorsFound, factorsFoundIndex, FLINTN, eval, false
+#else
+                         factorsFound, factorsFoundIndex, NTLN, eval, false
 #endif
                         );
     else
       reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
-                         factorsFound, factorsFoundIndex, NTLNe, false
+                         factorsFound, factorsFoundIndex, NTLNe, eval, false
                         );
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
@@ -6584 +6622 @@
 #endif
                                            factorsFound, beenInThres, M, Pi,
-                                           diophant, symmetric, evaluation
+                                           diophant, symmetric, eval
                                           );
 
@@ -6603 +6641 @@
     result= earlyReconstructionAndLifting (F, NTLNe, bufF, bufUniFactors, l,
                                            factorsFound, beenInThres, M, Pi,
-                                           diophant, symmetric, evaluation
+                                           diophant, symmetric, eval
                                           );
 
@@ -6621 +6659 @@
       {
         index= 1;
-        tmp1= mod (i.getItem(), y);
+        tmp1= mod (i.getItem(), y-eval);
         tmp1 /= Lc (tmp1);
         for (CFListIterator j= bufUniFactors; j.hasItem(); j++, index++)
@@ -6696 +6734 @@
         for (iter2= result; iter2.hasItem(); iter2++)
         {
-          tmp= mod (iter2.getItem(), y);
+          tmp= mod (iter2.getItem(), y-eval);
           tmp /= Lc (tmp);
           if (tmp == buf)
@@ -6721 +6759 @@
 #endif
       resultBufF= increasePrecision (bufF, bufUniFactors, factorsFound,
-                                     oldNumCols, oldL, l
+                                     oldNumCols, oldL, l, eval
                                     );
     }
@@ -6735 +6773 @@
 
         resultBufF= increasePrecisionFq2Fp (bufF, bufUniFactors, factorsFound,
-                                            oldNumCols, oldL, alpha, l
+                                            oldNumCols, oldL, alpha, l, eval
                                            );
       }
@@ -6743 +6781 @@
 
         resultBufF= increasePrecision (bufF, bufUniFactors, factorsFound,
-                                       oldNumCols, oldL,  alpha, l
+                                       oldNumCols, oldL, alpha, l, eval
                                       );
       }
@@ -6774 +6812 @@
         nmod_mat_clear (FLINTN);
 #endif
-      result.append (bufF);
+      result.append (bufF (y-eval,y));
       return result;
     }
@@ -6783 +6821 @@
     return Union (result, henselLiftAndLatticeRecombi (bufF, bufUniFactors,
                                                        alpha, degs, symmetric,
-                                                       evaluation
+                                                       eval
                                                       )
                  );
@@ -6794 +6832 @@
         result=increasePrecision (F, bufUniFactors, oldL, l, d, bounds, bufQ,
 #ifdef HAVE_FLINT
-                                  FLINTN
-#else
-                                  NTLN
+                                  FLINTN, eval
+#else
+                                  NTLN, eval
 #endif
                                  );
@@ -6806 +6844 @@
           result=increasePrecisionFq2Fp (F, bufUniFactors, oldL, l, d, bounds,
 #ifdef HAVE_FLINT
-                                         bufQ, FLINTN, alpha
-#else
-                                         bufQ, NTLN, alpha
+                                         bufQ, FLINTN, alpha, eval
+#else
+                                         bufQ, NTLN, alpha, eval
 #endif
                                         );
@@ -6815 +6853 @@
       {
           result=increasePrecision (F, bufUniFactors, oldL, l, d, bounds, bufQ,
-                                    NTLNe
+                                    NTLNe, eval
                                    );
       }
@@ -6853 +6891 @@
                                                     liftBound, d, bounds, NTLN,
 #endif
-                                                    diophant, M, Pi, bufQ
+                                                    diophant, M, Pi, bufQ, eval
                                                    );
       else
@@ -6865 +6903 @@
                                                            NTLN, diophant, M,
 #endif
-                                                           Pi, bufQ, alpha
+                                                           Pi, bufQ, alpha, eval
                                                           );
         else
@@ -6871 +6909 @@
                                                       liftBound, d, bounds,
                                                       NTLNe, diophant, M,
-                                                      Pi, bufQ
+                                                      Pi, bufQ, eval
                                                      );
       }
@@ -6918 +6956 @@
     delete [] bounds;
     result= Union (result, smallFactors);
-    result.append (F);
+    result.append (F (y-eval,y));
     return result;
   }
@@ -6933 +6971 @@
     CanonicalForm MODl= power (y, degree (F) + 1);
     delete [] bounds;
-    return Union (result, factorRecombination (bufUniFactors, F, MODl, degs, 1,
-                                               bufUniFactors.length()/2
+    return Union (result, factorRecombination (bufUniFactors, F, MODl, degs,
+                                               eval, 1, bufUniFactors.length()/2
                                               )
                  );
@@ -6945 +6983 @@
     delete [] bounds;
     return Union (result, henselLiftAndLatticeRecombi (F, bufUniFactors, alpha,
-                                                       degs,symmetric, evaluation
+                                                       degs,symmetric, eval
                                                       )
                  );
@@ -7906 +7944 @@
                                        evaluation, 1, uniFactors.length()/2);
     else
-      factors= factorRecombination (uniFactors, A, MODl, degs, 1,
+      factors= factorRecombination (uniFactors, A, MODl, degs, evaluation, 1,
                                     uniFactors.length()/2);
     TIMING_END_AND_PRINT (fac_fq_bi_factor_recombination,
@@ -7958 +7996 @@
     {
       TIMING_START (fac_fq_bi_factor_recombination);
-      factors= factorRecombination (uniFactors, A, MODl, degs, 1, 3);
+      factors= factorRecombination (uniFactors, A, MODl, degs, evaluation, 1, 3);
       TIMING_END_AND_PRINT (fac_fq_bi_factor_recombination,
                             "time for small subset naive recombi over Fq: ");
@@ -7969 +8007 @@
         if (alpha.level() == 1)
           tmp= increasePrecision (A, uniFactors, 0, uniFactors.length(), 1,
-                                  liftBound
+                                  liftBound, evaluation
                                  );
         else
@@ -7975 +8013 @@
           if (degree (A) > getCharacteristic())
             tmp= increasePrecisionFq2Fp (A, uniFactors, 0, uniFactors.length(),
-                                         1, alpha, liftBound
+                                         1, alpha, liftBound, evaluation
                                         );
           else
             tmp= increasePrecision (A, uniFactors, 0, uniFactors.length(), 1,
-                                    alpha, liftBound
+                                    alpha, liftBound, evaluation
                                    );
         }
@@ -7993 +8031 @@
           degs.refine ();
           factors= Union (factors, factorRecombination (uniFactors, A, MODl,
-                                                        degs, 4,
+                                                        degs, evaluation, 4,
                                                         uniFactors.length()/2
                                                        )
@@ -8072 +8110 @@
     delete [] bounds2;
   delete [] bounds;
-  if (!extension)
-  {
-    for (CFListIterator i= factors; i.hasItem(); i++)
-      i.getItem()= i.getItem() (y - evaluation, y);
-  }
 
   appendSwapDecompress (factors, contentAxFactors, contentAyFactors,