Changeset 894604 in git for factory/facFqBivar.cc

Timestamp:

Nov 28, 2012, 12:58:24 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c49e6ff67dcc4fd9d834166f973fd81fbc6cec2b

Parents:

308a766afffc51141b50332c5e1b2d3849433dce

git-author:

Martin Lee <martinlee84@web.de>2012-11-28 12:58:24+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-30 17:24:27+01:00

Message:

fix: wrong lifting precision in corner cases

File:

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

factory/facFqBivar.cc

@@ -6459 +6459 @@
     int factorsFound= 0;
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
-      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-#ifdef HAVE_FLINT
-                         (LCF), factorsFound, factorsFoundIndex, FLINTN, false
-#else
-                         (LCF), factorsFound, factorsFoundIndex, NTLN, false
+      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+#ifdef HAVE_FLINT
+                         factorsFound, factorsFoundIndex, FLINTN, false
+#else
+                         factorsFound, factorsFoundIndex, NTLN, false
 #endif
                         );
     else
-      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-                         (LCF), factorsFound, factorsFoundIndex, NTLNe, false
+      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+                         factorsFound, factorsFoundIndex, NTLNe, false
                         );
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
@@ -6895 +6895 @@
   {
     result= Union (result, smallFactors);
-    CanonicalForm MODl= power (y, degree (F) + 1 + degree (LC (F, 1)));
+    CanonicalForm MODl= power (y, degree (F) + 1);
     delete [] bounds;
     return Union (result, factorRecombination (bufUniFactors, F, MODl, degs, 1,
@@ -7148 +7148 @@
     return Union (smallFactors, extFactorRecombination
                                 (bufUniFactors, F,
-                                 power (y, degree (F) + 1 + degree (LCF)),info,
+                                 power (y, degree (F) + 1),info,
                                  degs, evaluation, 1, bufUniFactors.length()/2
                                 )
@@ -7201 +7201 @@
     int factorsFound= 0;
 
-    extReconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-                          (LCF), factorsFound, factorsFoundIndex, NTLN, false,
+    extReconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+                          factorsFound, factorsFoundIndex, NTLN, false,
                           info, evaluation
                          );
@@ -7397 +7397 @@
   {
     result= Union (result, smallFactors);
-    CanonicalForm MODl= power (y, degree (F) + 1 + degree (LC (F, 1)));
+    CanonicalForm MODl= power (y, degree (F) + 1);
     delete [] bounds;
     return Union (result, extFactorRecombination (bufUniFactors, F, MODl, info,