Daily bugfix in the polynomial factorization (code didn't catch polynomial "x"

and cln::sqrt conversion was buggy).

diff --git a/check/exam_factor.cpp b/check/exam_factor.cpp
index bf1751a572c02e7bf1cb13e0cad5d12514bbb78c..7e156487bc10f16e1dad4a3fdef4572ad2786907 100644 (file)
--- a/check/exam_factor.cpp
+++ b/check/exam_factor.cpp
@@ -83,12 +83,17 @@ static unsigned exam_factor1()
        result += check_factor(e);
 
        e = ex("x*(2+x^2)*(1+x+x^3+x^2+x^6+x^5+x^4)*(1+x)^2*(1-x+x^2)^2*(-1+x)", syms);
        result += check_factor(e);
 
        e = ex("x*(2+x^2)*(1+x+x^3+x^2+x^6+x^5+x^4)*(1+x)^2*(1-x+x^2)^2*(-1+x)", syms);

-

        result += check_factor(e);
 
        e = ex("(x+4+x^2-x^3+43*x^4)*(x+1-x^2-3*x^3+4*x^4)", syms);
        result += check_factor(e);
 
        result += check_factor(e);
 
        e = ex("(x+4+x^2-x^3+43*x^4)*(x+1-x^2-3*x^3+4*x^4)", syms);
        result += check_factor(e);
 

+       e = ex("-x^2*(x-1)*(1+x^2)", syms);
+       result += check_factor(e);
+
+       e = x;
+       result += check_factor(e);
+

        return result;
 }
 
        return result;
 }
 

diff --git a/ginac/factor.cpp b/ginac/factor.cpp
index 5489b4ceb79eb87a99ba36ef9e17e5dac96b3005..9b06e6e1ce99f08649dbaf612b35a3bd000557fe 100644 (file)
--- a/ginac/factor.cpp
+++ b/ginac/factor.cpp
@@ -888,7 +888,7 @@ static ex hensel_univar(const ex& a_, const ex& x, unsigned int p, const UniPoly
        for ( int i=a.degree(x); i>=a.ldegree(x); --i ) {
                maxcoeff += pow(abs(a.coeff(x, i)),2);
        }
        for ( int i=a.degree(x); i>=a.ldegree(x); --i ) {
                maxcoeff += pow(abs(a.coeff(x, i)),2);
        }

-       cl_I normmc = ceiling1(the<cl_F>(cln::sqrt(ex_to<numeric>(maxcoeff).to_cl_N())));
+       cl_I normmc = ceiling1(the<cl_R>(cln::sqrt(ex_to<numeric>(maxcoeff).to_cl_N())));

        unsigned int maxdegree = (u1_.degree() > w1_.degree()) ? u1_.degree() : w1_.degree();
        unsigned int B = cl_I_to_uint(normmc * expt_pos(cl_I(2), maxdegree));
 
        unsigned int maxdegree = (u1_.degree() > w1_.degree()) ? u1_.degree() : w1_.degree();
        unsigned int B = cl_I_to_uint(normmc * expt_pos(cl_I(2), maxdegree));
 


@@ -1233,6 +1233,9 @@ ex factor(const ex& poly)
                }
                return res;
        }
                }
                return res;
        }

+       if ( is_a<symbol>(sfpoly) ) {
+               return poly;
+       }

        // case: (polynomial)
        ex f = factor_sqrfree(sfpoly);
        return f;
        // case: (polynomial)
        ex f = factor_sqrfree(sfpoly);
        return f;