[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 e4302cfe1183b3d86d825457856be26a8b1829ff
Author: Martin Lee <martinlee84 at web.de>
Date:   Thu Feb 9 13:33:24 2012 +0100

    chg: use henselLiftAndEarly from facFqBivar again in facBivar

diff --git a/factory/facBivar.cc b/factory/facBivar.cc
index f1d3d6b..eedf9c7 100644
--- a/factory/facBivar.cc
+++ b/factory/facBivar.cc
@@ -534,13 +534,16 @@ CFList biFactorize (const CanonicalForm& F, const Variable& v)
 
   int liftBound= degree (A, y) + 1;
 
+  ExtensionInfo dummy= ExtensionInfo (false);
   bool earlySuccess= false;
   CFList earlyFactors;
   TIMING_START (fac_hensel_lift);
   //out_cf ("A before= ",A, "\n");
-  uniFactors= henselLiftAndEarly0
-             (A, earlySuccess, earlyFactors, degs, liftBound,
-              uniFactors, evaluation);
+  printf ("degree (LC (A,1))= %d\n", degree (LC (A,1)));
+  //maybe one should use a multiple of LC (A,1) and try a nonmonic lifting here?
+  uniFactors= henselLiftAndEarly
+              (A, earlySuccess, earlyFactors, degs, liftBound,
+               uniFactors, dummy, evaluation);
   TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
   DEBOUTLN (cerr, "lifted factors= " << uniFactors);
 
@@ -549,9 +552,9 @@ CFList biFactorize (const CanonicalForm& F, const Variable& v)
   //printf ("earlySuccess= %d\n", earlySuccess);
   CanonicalForm MODl= power (y, liftBound);
 
-  CanonicalForm test= prod (uniFactors);
+  /*CanonicalForm test= prod (uniFactors);
   test *= LC (A,1);
-  test= mod (test, MODl);
+  test= mod (test, MODl);*/
   //printf ("test == A %d\n", test == A);
   //out_cf ("test= ", test, "\n");
   //out_cf ("A= ", A, "\n");

-- 
an open source computer algebra system