[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 8ff2ae1752df53e67c8d3c503fc5c7ff6836dd35
Author: Martin Lee <martinlee84 at web.de>
Date:   Tue Jan 24 17:46:06 2012 +0100

    chg: choose "shortest" univariate factorization no matter what the evaluation point is

diff --git a/factory/facFqBivar.cc b/factory/facFqBivar.cc
index 400d4af..47d62c5 100644
--- a/factory/facFqBivar.cc
+++ b/factory/facFqBivar.cc
@@ -5430,12 +5430,9 @@ biFactorize (const CanonicalForm& F, const ExtensionInfo& info)
       }
       if (bufUniFactors.length() < uniFactors.length())
       {
-        if (!evaluation.isZero())
-        {
-          uniFactors= bufUniFactors;
-          Aeval= bufAeval;
-          evaluation= bufEvaluation;
-        }
+        uniFactors= bufUniFactors;
+        Aeval= bufAeval;
+        evaluation= bufEvaluation;
       }
     }
     list.append (bufEvaluation);
@@ -5445,9 +5442,9 @@ biFactorize (const CanonicalForm& F, const ExtensionInfo& info)
 
   if (!derivXZero && !fail2)
   {
-    if (!evaluation.isZero() && (uniFactors.length() > uniFactors2.length() ||
+    if (uniFactors.length() > uniFactors2.length() ||
         (uniFactors.length() == uniFactors2.length()
-         && degs.getLength() > degs2.getLength())))
+         && degs.getLength() > degs2.getLength()))
     {
       degs= degs2;
       uniFactors= uniFactors2;

-- 
an open source computer algebra system