[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit 1871dff190efd21c2df9478dbc3b12aaa21ea480
Author: Martin Lee <martinlee84 at web.de>
Date:   Mon Jan 23 23:04:22 2012 +0100

    chg: lowered bound for early success in earlyFactorDetection

diff --git a/factory/facFqBivar.cc b/factory/facFqBivar.cc
index c636f86..024a1cd 100644
--- a/factory/facFqBivar.cc
+++ b/factory/facFqBivar.cc
@@ -634,7 +634,7 @@ earlyFactorDetection (CanonicalForm& F, CFList& factors,int& adaptedLiftBound,
   CanonicalForm g, quot;
   CanonicalForm M= power (F.mvar(), deg);
   adaptedLiftBound= 0;
-  int d= degree (F) + degree (LCBuf);
+  int d= degree (F);
   for (CFListIterator i= factors; i.hasItem(); i++)
   {
     if (!bufDegs1.find (degree (i.getItem(), 1)))
@@ -652,7 +652,7 @@ earlyFactorDetection (CanonicalForm& F, CFList& factors,int& adaptedLiftBound,
         {
           result.append (g);
           buf= quot;
-          d -= degree (g) + degree (LC (g, x));
+          d -= degree (g);
           LCBuf= LC (buf, x);
           T= Difference (T, CFList (i.getItem()));
 
@@ -670,7 +670,7 @@ earlyFactorDetection (CanonicalForm& F, CFList& factors,int& adaptedLiftBound,
     }
   }
   adaptedLiftBound= d + 1;
-  if (d < deg)
+  if (adaptedLiftBound < deg)
   {
     factors= T;
     degs= bufDegs1;
@@ -702,7 +702,7 @@ extEarlyFactorDetection (CanonicalForm& F, CFList& factors,
   CanonicalForm M= power (y, deg);
   adaptedLiftBound= 0;
   bool trueFactor= false;
-  int d= degree (F) + degree (LCBuf);
+  int d= degree (F);
   CFList source, dest;
   int degMipoBeta= 1;
   if (!k && beta.level() != 1)
@@ -732,7 +732,7 @@ extEarlyFactorDetection (CanonicalForm& F, CFList& factors,
             {
               appendTestMapDown (result, buf2, info, source, dest);
               buf= quot;
-              d -= degree (g) + degree (LC (g, x));
+              d -= degree (g);
               LCBuf= LC (buf, x);
               trueFactor= true;
             }
@@ -743,7 +743,7 @@ extEarlyFactorDetection (CanonicalForm& F, CFList& factors,
             {
               appendTestMapDown (result, buf2, info, source, dest);
               buf= quot;
-              d -= degree (g) + degree (LC (g, x));
+              d -= degree (g);
               LCBuf= LC (buf, x);
               trueFactor= true;
             }

-- 
an open source computer algebra system