Changeset 773d28 in git

Timestamp:

Jun 6, 2012, 3:41:23 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

617dbcd561feba2c98f750ce8bd841e28e8da4d4

Parents:

ec664a2ce7842d3b8f5d7a9af2a8b2ff7944ec43

git-author:

Martin Lee <martinlee84@web.de>2012-06-06 15:41:23+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-07-31 11:48:23+02:00

Message:

fix: bug in factor recombination if extension is needed

File:

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

factory/facFqBivar.cc

@@ -1333 +1333 @@
   if (factors.length() == 2)
   {
-    CanonicalForm tmp1, tmp2;
+    CanonicalForm tmp1, tmp2, tmp3;
     tmp1= factors.getFirst();
     tmp2= factors.getLast();
@@ -1342 +1342 @@
     tmp2= mod (tmp2, yToL);
     tmp2 /= content (tmp2, x);
-    if (degree (tmp1) + degree (tmp2) == degree (F))
+    tmp3 = tmp1*tmp2;
+    if (tmp3/Lc (tmp3) == F/Lc (F))
     {
       factorsFound++;
@@ -1409 +1410 @@
   if (factors.length() == 2)
   {
-    CanonicalForm tmp1, tmp2;
+    CanonicalForm tmp1, tmp2, tmp3;
     tmp1= factors.getFirst();
     tmp2= factors.getLast();
@@ -1418 +1419 @@
     tmp2= mod (tmp2, yToL);
     tmp2 /= content (tmp2, x);
-    if (degree (tmp1) + degree (tmp2) == degree (F))
+    tmp3 = tmp1*tmp2;
+    if (tmp3/Lc (tmp3) == F/Lc (F))
     {
       factorsFound++;
@@ -1723 +1725 @@
   if (factors.length() == 2)
   {
-    CanonicalForm tmp1, tmp2;
+    CanonicalForm tmp1, tmp2, tmp3;
     tmp1= factors.getFirst();
     tmp2= factors.getLast();
@@ -1732 +1734 @@
     tmp2= mod (tmp2, yToL);
     tmp2 /= content (tmp2, x);
-    if (degree (tmp1) + degree (tmp2) == degree (F))
+    tmp3 = tmp1*tmp2;
+    if (tmp3/Lc (tmp3) == F/Lc (F))
     {
       tmp1= tmp1 (y - evaluation, y);
       tmp2= tmp2 (y - evaluation, y);
-      factorsFound++;
-      F= 1;
-      tmp1= mapDown (tmp1, info, source, dest);
-      tmp2= mapDown (tmp2, info, source, dest);
-      reconstructedFactors.append (tmp1);
-      reconstructedFactors.append (tmp2);
-      return;
+      if (!k && beta == x && degree (tmp2, alpha) < 1 &&
+          degree (tmp1, alpha) < 1)
+      {
+        factorsFound++;
+        F= 1;
+        tmp1= mapDown (tmp1, info, source, dest);
+        tmp2= mapDown (tmp2, info, source, dest);
+        reconstructedFactors.append (tmp1);
+        reconstructedFactors.append (tmp2);
+        return;
+      }
+      else if (!isInExtension (tmp2, gamma, k, delta, source, dest) &&
+               !isInExtension (tmp1, gamma, k, delta, source, dest))
+      {
+        factorsFound++;
+        F= 1;
+        tmp1= mapDown (tmp1, info, source, dest);
+        tmp2= mapDown (tmp2, info, source, dest);
+        reconstructedFactors.append (tmp1);
+        reconstructedFactors.append (tmp2);
+        return;
+      }
     }
   }
@@ -4641 +4659 @@
   }
   Variable y= F.mvar();
-  CanonicalForm shiftedF= G (y - evaluation, y);
-  int sizeOldF= size (shiftedF);
+  int sizeOldF= size (G);
   if (size (F) < sizeOldF)
   {
-    H= F (y + evaluation, y); //shift back to zero
+    H= F;
     success= true;
     return earlyFactors;
@@ -4689 +4706 @@
   CFList smallFactors;
   CanonicalForm H;
-  bool success;
+  bool success= false;
   smallFactors= sieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi, M,
                                    success, minBound + 1
@@ -5343 +5360 @@
   {
     delete [] bounds;
-    return CFList (F);
+    CFList source, dest;
+    CanonicalForm tmp= G (y - evaluation, y);
+    tmp= mapDown (tmp, info, source, dest);
+    return CFList (tmp);
   }
   int minBound= bounds[0];
@@ -5361 +5381 @@
   CFList smallFactors;
   CanonicalForm H;
-  bool success;
+  bool success= false;
   smallFactors= extSieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi,
                                       M, success, minBound + 1, evaluation, info