Changeset 3ed6758 in git for factory/facFqBivar.cc

Timestamp:

May 13, 2012, 1:53:57 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ec664a2ce7842d3b8f5d7a9af2a8b2ff7944ec43

Parents:

d1553c4ccee2126aacc2a8a2ac1923da9be0c131

git-author:

Martin Lee <martinlee84@web.de>2012-05-13 13:53:57+02:00

git-committer:

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

Message:

chg: smarter check if factorization is reconstructed if there are only two factors

File:

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

factory/facFqBivar.cc

@@ -1331 +1331 @@
   Variable x= Variable (1);
   CanonicalForm yToL= power (y, liftBound);
+  if (factors.length() == 2)
+  {
+    CanonicalForm tmp1, tmp2;
+    tmp1= factors.getFirst();
+    tmp2= factors.getLast();
+    tmp1 *= LC (F, x);
+    tmp1= mod (tmp1, yToL);
+    tmp1 /= content (tmp1, x);
+    tmp2 *= LC (F, x);
+    tmp2= mod (tmp2, yToL);
+    tmp2 /= content (tmp2, x);
+    if (degree (tmp1) + degree (tmp2) == degree (F))
+    {
+      factorsFound++;
+      F= 1;
+      reconstructedFactors.append (tmp1);
+      reconstructedFactors.append (tmp2);
+      return;
+    }
+  }
   CanonicalForm quot, buf;
   CFListIterator iter;
@@ -1386 +1406 @@
   Variable y= Variable (2);
   Variable x= Variable (1);
+  CanonicalForm yToL= power (y, liftBound);
+  if (factors.length() == 2)
+  {
+    CanonicalForm tmp1, tmp2;
+    tmp1= factors.getFirst();
+    tmp2= factors.getLast();
+    tmp1 *= LC (F, x);
+    tmp1= mod (tmp1, yToL);
+    tmp1 /= content (tmp1, x);
+    tmp2 *= LC (F, x);
+    tmp2= mod (tmp2, yToL);
+    tmp2 /= content (tmp2, x);
+    if (degree (tmp1) + degree (tmp2) == degree (F))
+    {
+      factorsFound++;
+      F= 1;
+      reconstructedFactors.append (tmp1);
+      reconstructedFactors.append (tmp2);
+      return;
+    }
+  }
   CanonicalForm quot, buf;
-  CanonicalForm yToL= power (y, liftBound);
   CFListIterator iter;
   for (long i= 1; i <= N.NumCols(); i++)
@@ -1680 +1720 @@
   CanonicalForm delta= info.getDelta();
   CanonicalForm yToL= power (y, liftBound);
+  CFList source, dest;
+  if (factors.length() == 2)
+  {
+    CanonicalForm tmp1, tmp2;
+    tmp1= factors.getFirst();
+    tmp2= factors.getLast();
+    tmp1 *= LC (F, x);
+    tmp1= mod (tmp1, yToL);
+    tmp1 /= content (tmp1, x);
+    tmp2 *= LC (F, x);
+    tmp2= mod (tmp2, yToL);
+    tmp2 /= content (tmp2, x);
+    if (degree (tmp1) + degree (tmp2) == degree (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;
+    }
+  }
   CanonicalForm quot, buf, buf2;
-  CFList source, dest;
   CFListIterator iter;
   for (long i= 1; i <= N.NumCols(); i++)