poly.unitcontprim(x, unit, cont, prim_ex);
upoly prim;
upoly_from_ex(prim, prim_ex, x);
+ if (prim_ex.is_equal(1)) {
+ return poly;
+ }
// determine proper prime and minimize number of modular factors
prime = 3;
*/
static ex factor_multivariate(const ex& poly, const exset& syms)
{
- exset::const_iterator s;
const ex& x = *syms.begin();
// make polynomial primitive
ex unit, cont, pp;
poly.unitcontprim(x, unit, cont, pp);
if ( !is_a<numeric>(cont) ) {
- return factor_sqrfree(cont) * factor_sqrfree(pp);
+ return unit * factor_sqrfree(cont) * factor_sqrfree(pp);
}
// factor leading coefficient
vector<numeric> ftilde(vnlst.nops()-1);
for ( size_t i=0; i<ftilde.size(); ++i ) {
ex ft = vnlst.op(i+1);
- s = syms.begin();
+ auto s = syms.begin();
++s;
for ( size_t j=0; j<a.size(); ++j ) {
ft = ft.subs(*s == a[j]);
// set up evaluation points
EvalPoint ep;
vector<EvalPoint> epv;
- s = syms.begin();
+ auto s = syms.begin();
++s;
for ( size_t i=0; i<a.size(); ++i ) {
ep.x = *s++;
if ( findsymbols.syms.size() == 1 ) {
// univariate case
const ex& x = *(findsymbols.syms.begin());
- if ( poly.ldegree(x) > 0 ) {
+ int ld = poly.ldegree(x);
+ if ( ld > 0 ) {
// pull out direct factors
- int ld = poly.ldegree(x);
ex res = factor_univariate(expand(poly/pow(x, ld)), x);
return res * pow(x,ld);
} else {