X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnormal.cpp;h=2603086a743b495b84033855ef59c822aca7af97;hp=7a52c71d2914d331a0be314dd100a9e46dc155e6;hb=0f7b8280ad89fa88a0cbaab7785a4b7cb06e6a63;hpb=1566be23d91ed1311bee2071bdae9ef93d0b7cf6 diff --git a/ginac/normal.cpp b/ginac/normal.cpp index 7a52c71d..2603086a 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -6,7 +6,7 @@ * computation, square-free factorization and rational function normalization. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,6 +39,7 @@ #include "numeric.h" #include "power.h" #include "relational.h" +#include "operators.h" #include "matrix.h" #include "pseries.h" #include "symbol.h" @@ -74,10 +75,10 @@ static int heur_gcd_failed = 0; static struct _stat_print { _stat_print() {} ~_stat_print() { - cout << "gcd() called " << gcd_called << " times\n"; - cout << "sr_gcd() called " << sr_gcd_called << " times\n"; - cout << "heur_gcd() called " << heur_gcd_called << " times\n"; - cout << "heur_gcd() failed " << heur_gcd_failed << " times\n"; + std::cout << "gcd() called " << gcd_called << " times\n"; + std::cout << "sr_gcd() called " << sr_gcd_called << " times\n"; + std::cout << "heur_gcd() called " << heur_gcd_called << " times\n"; + std::cout << "heur_gcd() failed " << heur_gcd_failed << " times\n"; } } stat_print; #endif @@ -92,14 +93,14 @@ static struct _stat_print { * @return "false" if no symbol was found, "true" otherwise */ static bool get_first_symbol(const ex &e, const symbol *&x) { - if (is_ex_exactly_of_type(e, symbol)) { - x = static_cast(e.bp); + if (is_a(e)) { + x = &ex_to(e); return true; - } else if (is_ex_exactly_of_type(e, add) || is_ex_exactly_of_type(e, mul)) { - for (unsigned i=0; i(e) || is_exactly_a(e)) { + for (size_t i=0; i(e)) { if (get_first_symbol(e.op(0), x)) return true; } @@ -137,7 +138,7 @@ struct sym_desc { int max_deg; /** Maximum number of terms of leading coefficient of symbol in both polynomials */ - int max_lcnops; + size_t max_lcnops; /** Commparison operator for sorting */ bool operator<(const sym_desc &x) const @@ -169,12 +170,12 @@ static void add_symbol(const symbol *s, sym_desc_vec &v) // Collect all symbols of an expression (used internally by get_symbol_stats()) static void collect_symbols(const ex &e, sym_desc_vec &v) { - if (is_ex_exactly_of_type(e, symbol)) { - add_symbol(static_cast(e.bp), v); - } else if (is_ex_exactly_of_type(e, add) || is_ex_exactly_of_type(e, mul)) { - for (unsigned i=0; i(e)) { + add_symbol(&ex_to(e), v); + } else if (is_exactly_a(e) || is_exactly_a(e)) { + for (size_t i=0; i(e)) { collect_symbols(e.op(0), v); } } @@ -208,6 +209,7 @@ static void get_symbol_stats(const ex &a, const ex &b, sym_desc_vec &v) ++it; } std::sort(v.begin(), v.end()); + #if 0 std::clog << "Symbols:\n"; it = v.begin(); itend = v.end(); @@ -230,18 +232,18 @@ static numeric lcmcoeff(const ex &e, const numeric &l) { if (e.info(info_flags::rational)) return lcm(ex_to(e).denom(), l); - else if (is_ex_exactly_of_type(e, add)) { - numeric c = _num1(); - for (unsigned i=0; i(e)) { + numeric c = _num1; + for (size_t i=0; i(e)) { + numeric c = _num1; + for (size_t i=0; i(e)) { + if (is_a(e.op(0))) return l; else return pow(lcmcoeff(e.op(0), l), ex_to(e.op(1))); @@ -258,7 +260,7 @@ static numeric lcmcoeff(const ex &e, const numeric &l) * @return LCM of denominators of coefficients */ static numeric lcm_of_coefficients_denominators(const ex &e) { - return lcmcoeff(e, _num1()); + return lcmcoeff(e, _num1); } /** Bring polynomial from Q[X] to Z[X] by multiplying in the previously @@ -268,25 +270,25 @@ static numeric lcm_of_coefficients_denominators(const ex &e) * @param lcm LCM to multiply in */ static ex multiply_lcm(const ex &e, const numeric &lcm) { - if (is_ex_exactly_of_type(e, mul)) { - unsigned num = e.nops(); + if (is_exactly_a(e)) { + size_t num = e.nops(); exvector v; v.reserve(num + 1); - numeric lcm_accum = _num1(); - for (unsigned i=0; isetflag(status_flags::dynallocated); - } else if (is_ex_exactly_of_type(e, add)) { - unsigned num = e.nops(); + } else if (is_exactly_a(e)) { + size_t num = e.nops(); exvector v; v.reserve(num); - for (unsigned i=0; isetflag(status_flags::dynallocated); - } else if (is_ex_exactly_of_type(e, power)) { - if (is_ex_exactly_of_type(e.op(0), symbol)) + } else if (is_exactly_a(e)) { + if (is_a(e.op(0))) return e * lcm; else return pow(multiply_lcm(e.op(0), lcm.power(ex_to(e.op(1)).inverse())), e.op(1)); @@ -300,49 +302,48 @@ static ex multiply_lcm(const ex &e, const numeric &lcm) * * @param e expanded polynomial * @return integer content */ -numeric ex::integer_content(void) const +numeric ex::integer_content() const { - GINAC_ASSERT(bp!=0); return bp->integer_content(); } -numeric basic::integer_content(void) const +numeric basic::integer_content() const { - return _num1(); + return _num1; } -numeric numeric::integer_content(void) const +numeric numeric::integer_content() const { return abs(*this); } -numeric add::integer_content(void) const +numeric add::integer_content() const { epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); - numeric c = _num0(); + numeric c = _num0; while (it != itend) { - GINAC_ASSERT(!is_ex_exactly_of_type(it->rest,numeric)); - GINAC_ASSERT(is_ex_exactly_of_type(it->coeff,numeric)); + GINAC_ASSERT(!is_exactly_a(it->rest)); + GINAC_ASSERT(is_exactly_a(it->coeff)); c = gcd(ex_to(it->coeff), c); it++; } - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); c = gcd(ex_to(overall_coeff),c); return c; } -numeric mul::integer_content(void) const +numeric mul::integer_content() const { #ifdef DO_GINAC_ASSERT epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); while (it != itend) { - GINAC_ASSERT(!is_ex_exactly_of_type(recombine_pair_to_ex(*it),numeric)); + GINAC_ASSERT(!is_exactly_a(recombine_pair_to_ex(*it))); ++it; } #endif // def DO_GINAC_ASSERT - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); return abs(ex_to(overall_coeff)); } @@ -364,11 +365,11 @@ ex quo(const ex &a, const ex &b, const symbol &x, bool check_args) { if (b.is_zero()) throw(std::overflow_error("quo: division by zero")); - if (is_ex_exactly_of_type(a, numeric) && is_ex_exactly_of_type(b, numeric)) + if (is_exactly_a(a) && is_exactly_a(b)) return a / b; #if FAST_COMPARE if (a.is_equal(b)) - return _ex1(); + return _ex1; #endif if (check_args && (!a.info(info_flags::rational_polynomial) || !b.info(info_flags::rational_polynomial))) throw(std::invalid_argument("quo: arguments must be polynomials over the rationals")); @@ -380,8 +381,8 @@ ex quo(const ex &a, const ex &b, const symbol &x, bool check_args) int bdeg = b.degree(x); int rdeg = r.degree(x); ex blcoeff = b.expand().coeff(x, bdeg); - bool blcoeff_is_numeric = is_ex_exactly_of_type(blcoeff, numeric); - exvector v; v.reserve(rdeg - bdeg + 1); + bool blcoeff_is_numeric = is_exactly_a(blcoeff); + exvector v; v.reserve(std::max(rdeg - bdeg + 1, 0)); while (rdeg >= bdeg) { ex term, rcoeff = r.coeff(x, rdeg); if (blcoeff_is_numeric) @@ -414,15 +415,15 @@ ex rem(const ex &a, const ex &b, const symbol &x, bool check_args) { if (b.is_zero()) throw(std::overflow_error("rem: division by zero")); - if (is_ex_exactly_of_type(a, numeric)) { - if (is_ex_exactly_of_type(b, numeric)) - return _ex0(); + if (is_exactly_a(a)) { + if (is_exactly_a(b)) + return _ex0; else return a; } #if FAST_COMPARE if (a.is_equal(b)) - return _ex0(); + return _ex0; #endif if (check_args && (!a.info(info_flags::rational_polynomial) || !b.info(info_flags::rational_polynomial))) throw(std::invalid_argument("rem: arguments must be polynomials over the rationals")); @@ -434,7 +435,7 @@ ex rem(const ex &a, const ex &b, const symbol &x, bool check_args) int bdeg = b.degree(x); int rdeg = r.degree(x); ex blcoeff = b.expand().coeff(x, bdeg); - bool blcoeff_is_numeric = is_ex_exactly_of_type(blcoeff, numeric); + bool blcoeff_is_numeric = is_exactly_a(blcoeff); while (rdeg >= bdeg) { ex term, rcoeff = r.coeff(x, rdeg); if (blcoeff_is_numeric) @@ -464,28 +465,28 @@ ex decomp_rational(const ex &a, const symbol &x) ex nd = numer_denom(a); ex numer = nd.op(0), denom = nd.op(1); ex q = quo(numer, denom, x); - if (is_ex_exactly_of_type(q, fail)) + if (is_exactly_a(q)) return a; else return q + rem(numer, denom, x) / denom; } -/** Pseudo-remainder of polynomials a(x) and b(x) in Z[x]. +/** Pseudo-remainder of polynomials a(x) and b(x) in Q[x]. * * @param a first polynomial in x (dividend) * @param b second polynomial in x (divisor) * @param x a and b are polynomials in x * @param check_args check whether a and b are polynomials with rational * coefficients (defaults to "true") - * @return pseudo-remainder of a(x) and b(x) in Z[x] */ + * @return pseudo-remainder of a(x) and b(x) in Q[x] */ ex prem(const ex &a, const ex &b, const symbol &x, bool check_args) { if (b.is_zero()) throw(std::overflow_error("prem: division by zero")); - if (is_ex_exactly_of_type(a, numeric)) { - if (is_ex_exactly_of_type(b, numeric)) - return _ex0(); + if (is_exactly_a(a)) { + if (is_exactly_a(b)) + return _ex0; else return b; } @@ -501,18 +502,18 @@ ex prem(const ex &a, const ex &b, const symbol &x, bool check_args) if (bdeg <= rdeg) { blcoeff = eb.coeff(x, bdeg); if (bdeg == 0) - eb = _ex0(); + eb = _ex0; else eb -= blcoeff * power(x, bdeg); } else - blcoeff = _ex1(); + blcoeff = _ex1; int delta = rdeg - bdeg + 1, i = 0; while (rdeg >= bdeg && !r.is_zero()) { ex rlcoeff = r.coeff(x, rdeg); ex term = (power(x, rdeg - bdeg) * eb * rlcoeff).expand(); if (rdeg == 0) - r = _ex0(); + r = _ex0; else r -= rlcoeff * power(x, rdeg); r = (blcoeff * r).expand() - term; @@ -523,21 +524,21 @@ ex prem(const ex &a, const ex &b, const symbol &x, bool check_args) } -/** Sparse pseudo-remainder of polynomials a(x) and b(x) in Z[x]. +/** Sparse pseudo-remainder of polynomials a(x) and b(x) in Q[x]. * * @param a first polynomial in x (dividend) * @param b second polynomial in x (divisor) * @param x a and b are polynomials in x * @param check_args check whether a and b are polynomials with rational * coefficients (defaults to "true") - * @return sparse pseudo-remainder of a(x) and b(x) in Z[x] */ + * @return sparse pseudo-remainder of a(x) and b(x) in Q[x] */ ex sprem(const ex &a, const ex &b, const symbol &x, bool check_args) { if (b.is_zero()) throw(std::overflow_error("prem: division by zero")); - if (is_ex_exactly_of_type(a, numeric)) { - if (is_ex_exactly_of_type(b, numeric)) - return _ex0(); + if (is_exactly_a(a)) { + if (is_exactly_a(b)) + return _ex0; else return b; } @@ -553,17 +554,17 @@ ex sprem(const ex &a, const ex &b, const symbol &x, bool check_args) if (bdeg <= rdeg) { blcoeff = eb.coeff(x, bdeg); if (bdeg == 0) - eb = _ex0(); + eb = _ex0; else eb -= blcoeff * power(x, bdeg); } else - blcoeff = _ex1(); + blcoeff = _ex1; while (rdeg >= bdeg && !r.is_zero()) { ex rlcoeff = r.coeff(x, rdeg); ex term = (power(x, rdeg - bdeg) * eb * rlcoeff).expand(); if (rdeg == 0) - r = _ex0(); + r = _ex0; else r -= rlcoeff * power(x, rdeg); r = (blcoeff * r).expand() - term; @@ -581,22 +582,23 @@ ex sprem(const ex &a, const ex &b, const symbol &x, bool check_args) * @param check_args check whether a and b are polynomials with rational * coefficients (defaults to "true") * @return "true" when exact division succeeds (quotient returned in q), - * "false" otherwise */ + * "false" otherwise (q left untouched) */ bool divide(const ex &a, const ex &b, ex &q, bool check_args) { - q = _ex0(); if (b.is_zero()) throw(std::overflow_error("divide: division by zero")); - if (a.is_zero()) + if (a.is_zero()) { + q = _ex0; return true; - if (is_ex_exactly_of_type(b, numeric)) { + } + if (is_exactly_a(b)) { q = a / b; return true; - } else if (is_ex_exactly_of_type(a, numeric)) + } else if (is_exactly_a(a)) return false; #if FAST_COMPARE if (a.is_equal(b)) { - q = _ex1(); + q = _ex1; return true; } #endif @@ -611,13 +613,15 @@ bool divide(const ex &a, const ex &b, ex &q, bool check_args) // Polynomial long division (recursive) ex r = a.expand(); - if (r.is_zero()) + if (r.is_zero()) { + q = _ex0; return true; + } int bdeg = b.degree(*x); int rdeg = r.degree(*x); ex blcoeff = b.expand().coeff(*x, bdeg); - bool blcoeff_is_numeric = is_ex_exactly_of_type(blcoeff, numeric); - exvector v; v.reserve(rdeg - bdeg + 1); + bool blcoeff_is_numeric = is_exactly_a(blcoeff); + exvector v; v.reserve(std::max(rdeg - bdeg + 1, 0)); while (rdeg >= bdeg) { ex term, rcoeff = r.coeff(*x, rdeg); if (blcoeff_is_numeric) @@ -676,15 +680,15 @@ typedef std::map ex2_exbool_remember; * @see get_symbol_stats, heur_gcd */ static bool divide_in_z(const ex &a, const ex &b, ex &q, sym_desc_vec::const_iterator var) { - q = _ex0(); + q = _ex0; if (b.is_zero()) throw(std::overflow_error("divide_in_z: division by zero")); - if (b.is_equal(_ex1())) { + if (b.is_equal(_ex1)) { q = a; return true; } - if (is_ex_exactly_of_type(a, numeric)) { - if (is_ex_exactly_of_type(b, numeric)) { + if (is_exactly_a(a)) { + if (is_exactly_a(b)) { q = a / b; return q.info(info_flags::integer); } else @@ -692,7 +696,7 @@ static bool divide_in_z(const ex &a, const ex &b, ex &q, sym_desc_vec::const_ite } #if FAST_COMPARE if (a.is_equal(b)) { - q = _ex1(); + q = _ex1; return true; } #endif @@ -723,24 +727,24 @@ static bool divide_in_z(const ex &a, const ex &b, ex &q, sym_desc_vec::const_ite // Compute values at evaluation points 0..adeg vector alpha; alpha.reserve(adeg + 1); exvector u; u.reserve(adeg + 1); - numeric point = _num0(); + numeric point = _num0; ex c; for (i=0; i<=adeg; i++) { - ex bs = b.subs(*x == point); + ex bs = b.subs(*x == point, subs_options::no_pattern); while (bs.is_zero()) { - point += _num1(); - bs = b.subs(*x == point); + point += _num1; + bs = b.subs(*x == point, subs_options::no_pattern); } - if (!divide_in_z(a.subs(*x == point), bs, c, var+1)) + if (!divide_in_z(a.subs(*x == point, subs_options::no_pattern), bs, c, var+1)) return false; alpha.push_back(point); u.push_back(c); - point += _num1(); + point += _num1; } // Compute inverses vector rcp; rcp.reserve(adeg + 1); - rcp.push_back(_num0()); + rcp.push_back(_num0); for (k=1; k<=adeg; k++) { numeric product = alpha[k] - alpha[0]; for (i=1; i= bdeg) { ex term, rcoeff = r.coeff(*x, rdeg); if (!divide_in_z(rcoeff, blcoeff, term, var+1)) @@ -818,8 +822,8 @@ static bool divide_in_z(const ex &a, const ex &b, ex &q, sym_desc_vec::const_ite ex ex::unit(const symbol &x) const { ex c = expand().lcoeff(x); - if (is_ex_exactly_of_type(c, numeric)) - return c < _ex0() ? _ex_1() : _ex1(); + if (is_exactly_a(c)) + return c < _ex0 ? _ex_1 : _ex1; else { const symbol *y; if (get_first_symbol(c, y)) @@ -840,12 +844,12 @@ ex ex::unit(const symbol &x) const ex ex::content(const symbol &x) const { if (is_zero()) - return _ex0(); - if (is_ex_exactly_of_type(*this, numeric)) + return _ex0; + if (is_exactly_a(*this)) return info(info_flags::negative) ? -*this : *this; ex e = expand(); if (e.is_zero()) - return _ex0(); + return _ex0; // First, try the integer content ex c = e.integer_content(); @@ -859,7 +863,7 @@ ex ex::content(const symbol &x) const int ldeg = e.ldegree(x); if (deg == ldeg) return e.lcoeff(x) / e.unit(x); - c = _ex0(); + c = _ex0; for (int i=ldeg; i<=deg; i++) c = gcd(e.coeff(x, i), c, NULL, NULL, false); return c; @@ -876,15 +880,15 @@ ex ex::content(const symbol &x) const ex ex::primpart(const symbol &x) const { if (is_zero()) - return _ex0(); - if (is_ex_exactly_of_type(*this, numeric)) - return _ex1(); + return _ex0; + if (is_exactly_a(*this)) + return _ex1; ex c = content(x); if (c.is_zero()) - return _ex0(); + return _ex0; ex u = unit(x); - if (is_ex_exactly_of_type(c, numeric)) + if (is_exactly_a(c)) return *this / (c * u); else return quo(*this, c * u, x, false); @@ -901,14 +905,14 @@ ex ex::primpart(const symbol &x) const ex ex::primpart(const symbol &x, const ex &c) const { if (is_zero()) - return _ex0(); + return _ex0; if (c.is_zero()) - return _ex0(); - if (is_ex_exactly_of_type(*this, numeric)) - return _ex1(); + return _ex0; + if (is_exactly_a(*this)) + return _ex1; ex u = unit(x); - if (is_ex_exactly_of_type(c, numeric)) + if (is_exactly_a(c)) return *this / (c * u); else return quo(*this, c * u, x, false); @@ -919,206 +923,6 @@ ex ex::primpart(const symbol &x, const ex &c) const * GCD of multivariate polynomials */ -/** Compute GCD of polynomials in Q[X] using the Euclidean algorithm (not - * really suited for multivariate GCDs). This function is only provided for - * testing purposes. - * - * @param a first multivariate polynomial - * @param b second multivariate polynomial - * @param x pointer to symbol (main variable) in which to compute the GCD in - * @return the GCD as a new expression - * @see gcd */ - -static ex eu_gcd(const ex &a, const ex &b, const symbol *x) -{ -//std::clog << "eu_gcd(" << a << "," << b << ")\n"; - - // Sort c and d so that c has higher degree - ex c, d; - int adeg = a.degree(*x), bdeg = b.degree(*x); - if (adeg >= bdeg) { - c = a; - d = b; - } else { - c = b; - d = a; - } - - // Normalize in Q[x] - c = c / c.lcoeff(*x); - d = d / d.lcoeff(*x); - - // Euclidean algorithm - ex r; - for (;;) { -//std::clog << " d = " << d << endl; - r = rem(c, d, *x, false); - if (r.is_zero()) - return d / d.lcoeff(*x); - c = d; - d = r; - } -} - - -/** Compute GCD of multivariate polynomials using the Euclidean PRS algorithm - * with pseudo-remainders ("World's Worst GCD Algorithm", staying in Z[X]). - * This function is only provided for testing purposes. - * - * @param a first multivariate polynomial - * @param b second multivariate polynomial - * @param x pointer to symbol (main variable) in which to compute the GCD in - * @return the GCD as a new expression - * @see gcd */ - -static ex euprem_gcd(const ex &a, const ex &b, const symbol *x) -{ -//std::clog << "euprem_gcd(" << a << "," << b << ")\n"; - - // Sort c and d so that c has higher degree - ex c, d; - int adeg = a.degree(*x), bdeg = b.degree(*x); - if (adeg >= bdeg) { - c = a; - d = b; - } else { - c = b; - d = a; - } - - // Calculate GCD of contents - ex gamma = gcd(c.content(*x), d.content(*x), NULL, NULL, false); - - // Euclidean algorithm with pseudo-remainders - ex r; - for (;;) { -//std::clog << " d = " << d << endl; - r = prem(c, d, *x, false); - if (r.is_zero()) - return d.primpart(*x) * gamma; - c = d; - d = r; - } -} - - -/** Compute GCD of multivariate polynomials using the primitive Euclidean - * PRS algorithm (complete content removal at each step). This function is - * only provided for testing purposes. - * - * @param a first multivariate polynomial - * @param b second multivariate polynomial - * @param x pointer to symbol (main variable) in which to compute the GCD in - * @return the GCD as a new expression - * @see gcd */ - -static ex peu_gcd(const ex &a, const ex &b, const symbol *x) -{ -//std::clog << "peu_gcd(" << a << "," << b << ")\n"; - - // Sort c and d so that c has higher degree - ex c, d; - int adeg = a.degree(*x), bdeg = b.degree(*x); - int ddeg; - if (adeg >= bdeg) { - c = a; - d = b; - ddeg = bdeg; - } else { - c = b; - d = a; - ddeg = adeg; - } - - // Remove content from c and d, to be attached to GCD later - ex cont_c = c.content(*x); - ex cont_d = d.content(*x); - ex gamma = gcd(cont_c, cont_d, NULL, NULL, false); - if (ddeg == 0) - return gamma; - c = c.primpart(*x, cont_c); - d = d.primpart(*x, cont_d); - - // Euclidean algorithm with content removal - ex r; - for (;;) { -//std::clog << " d = " << d << endl; - r = prem(c, d, *x, false); - if (r.is_zero()) - return gamma * d; - c = d; - d = r.primpart(*x); - } -} - - -/** Compute GCD of multivariate polynomials using the reduced PRS algorithm. - * This function is only provided for testing purposes. - * - * @param a first multivariate polynomial - * @param b second multivariate polynomial - * @param x pointer to symbol (main variable) in which to compute the GCD in - * @return the GCD as a new expression - * @see gcd */ - -static ex red_gcd(const ex &a, const ex &b, const symbol *x) -{ -//std::clog << "red_gcd(" << a << "," << b << ")\n"; - - // Sort c and d so that c has higher degree - ex c, d; - int adeg = a.degree(*x), bdeg = b.degree(*x); - int cdeg, ddeg; - if (adeg >= bdeg) { - c = a; - d = b; - cdeg = adeg; - ddeg = bdeg; - } else { - c = b; - d = a; - cdeg = bdeg; - ddeg = adeg; - } - - // Remove content from c and d, to be attached to GCD later - ex cont_c = c.content(*x); - ex cont_d = d.content(*x); - ex gamma = gcd(cont_c, cont_d, NULL, NULL, false); - if (ddeg == 0) - return gamma; - c = c.primpart(*x, cont_c); - d = d.primpart(*x, cont_d); - - // First element of divisor sequence - ex r, ri = _ex1(); - int delta = cdeg - ddeg; - - for (;;) { - // Calculate polynomial pseudo-remainder -//std::clog << " d = " << d << endl; - r = prem(c, d, *x, false); - if (r.is_zero()) - return gamma * d.primpart(*x); - c = d; - cdeg = ddeg; - - if (!divide(r, pow(ri, delta), d, false)) - throw(std::runtime_error("invalid expression in red_gcd(), division failed")); - ddeg = d.degree(*x); - if (ddeg == 0) { - if (is_ex_exactly_of_type(r, numeric)) - return gamma; - else - return gamma * r.primpart(*x); - } - - ri = c.expand().lcoeff(*x); - delta = cdeg - ddeg; - } -} - - /** Compute GCD of multivariate polynomials using the subresultant PRS * algorithm. This function is used internally by gcd(). * @@ -1130,7 +934,6 @@ static ex red_gcd(const ex &a, const ex &b, const symbol *x) static ex sr_gcd(const ex &a, const ex &b, sym_desc_vec::const_iterator var) { -//std::clog << "sr_gcd(" << a << "," << b << ")\n"; #if STATISTICS sr_gcd_called++; #endif @@ -1162,34 +965,31 @@ static ex sr_gcd(const ex &a, const ex &b, sym_desc_vec::const_iterator var) return gamma; c = c.primpart(x, cont_c); d = d.primpart(x, cont_d); -//std::clog << " content " << gamma << " removed, continuing with sr_gcd(" << c << "," << d << ")\n"; // First element of subresultant sequence - ex r = _ex0(), ri = _ex1(), psi = _ex1(); + ex r = _ex0, ri = _ex1, psi = _ex1; int delta = cdeg - ddeg; for (;;) { + // Calculate polynomial pseudo-remainder -//std::clog << " start of loop, psi = " << psi << ", calculating pseudo-remainder...\n"; -//std::clog << " d = " << d << endl; r = prem(c, d, x, false); if (r.is_zero()) return gamma * d.primpart(x); + c = d; cdeg = ddeg; -//std::clog << " dividing...\n"; if (!divide_in_z(r, ri * pow(psi, delta), d, var)) throw(std::runtime_error("invalid expression in sr_gcd(), division failed")); ddeg = d.degree(x); if (ddeg == 0) { - if (is_ex_exactly_of_type(r, numeric)) + if (is_exactly_a(r)) return gamma; else return gamma * r.primpart(x); } // Next element of subresultant sequence -//std::clog << " calculating next subresultant...\n"; ri = c.expand().lcoeff(x); if (delta == 1) psi = ri; @@ -1206,33 +1006,32 @@ static ex sr_gcd(const ex &a, const ex &b, sym_desc_vec::const_iterator var) * @param e expanded multivariate polynomial * @return maximum coefficient * @see heur_gcd */ -numeric ex::max_coefficient(void) const +numeric ex::max_coefficient() const { - GINAC_ASSERT(bp!=0); return bp->max_coefficient(); } /** Implementation ex::max_coefficient(). * @see heur_gcd */ -numeric basic::max_coefficient(void) const +numeric basic::max_coefficient() const { - return _num1(); + return _num1; } -numeric numeric::max_coefficient(void) const +numeric numeric::max_coefficient() const { return abs(*this); } -numeric add::max_coefficient(void) const +numeric add::max_coefficient() const { epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); numeric cur_max = abs(ex_to(overall_coeff)); while (it != itend) { numeric a; - GINAC_ASSERT(!is_ex_exactly_of_type(it->rest,numeric)); + GINAC_ASSERT(!is_exactly_a(it->rest)); a = abs(ex_to(it->coeff)); if (a > cur_max) cur_max = a; @@ -1241,34 +1040,27 @@ numeric add::max_coefficient(void) const return cur_max; } -numeric mul::max_coefficient(void) const +numeric mul::max_coefficient() const { #ifdef DO_GINAC_ASSERT epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); while (it != itend) { - GINAC_ASSERT(!is_ex_exactly_of_type(recombine_pair_to_ex(*it),numeric)); + GINAC_ASSERT(!is_exactly_a(recombine_pair_to_ex(*it))); it++; } #endif // def DO_GINAC_ASSERT - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); return abs(ex_to(overall_coeff)); } -/** Apply symmetric modular homomorphism to a multivariate polynomial. - * This function is used internally by heur_gcd(). +/** Apply symmetric modular homomorphism to an expanded multivariate + * polynomial. This function is usually used internally by heur_gcd(). * - * @param e expanded multivariate polynomial * @param xi modulus * @return mapped polynomial * @see heur_gcd */ -ex ex::smod(const numeric &xi) const -{ - GINAC_ASSERT(bp!=0); - return bp->smod(xi); -} - ex basic::smod(const numeric &xi) const { return *this; @@ -1286,13 +1078,13 @@ ex add::smod(const numeric &xi) const epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); while (it != itend) { - GINAC_ASSERT(!is_ex_exactly_of_type(it->rest,numeric)); + GINAC_ASSERT(!is_exactly_a(it->rest)); numeric coeff = GiNaC::smod(ex_to(it->coeff), xi); if (!coeff.is_zero()) newseq.push_back(expair(it->rest, coeff)); it++; } - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); numeric coeff = GiNaC::smod(ex_to(overall_coeff), xi); return (new add(newseq,coeff))->setflag(status_flags::dynallocated); } @@ -1303,12 +1095,12 @@ ex mul::smod(const numeric &xi) const epvector::const_iterator it = seq.begin(); epvector::const_iterator itend = seq.end(); while (it != itend) { - GINAC_ASSERT(!is_ex_exactly_of_type(recombine_pair_to_ex(*it),numeric)); + GINAC_ASSERT(!is_exactly_a(recombine_pair_to_ex(*it))); it++; } #endif // def DO_GINAC_ASSERT mul * mulcopyp = new mul(*this); - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); mulcopyp->overall_coeff = GiNaC::smod(ex_to(overall_coeff),xi); mulcopyp->clearflag(status_flags::evaluated); mulcopyp->clearflag(status_flags::hash_calculated); @@ -1350,7 +1142,6 @@ class gcdheu_failed {}; * @exception gcdheu_failed() */ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const_iterator var) { -//std::clog << "heur_gcd(" << a << "," << b << ")\n"; #if STATISTICS heur_gcd_called++; #endif @@ -1360,7 +1151,7 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const return (new fail())->setflag(status_flags::dynallocated); // GCD of two numeric values -> CLN - if (is_ex_exactly_of_type(a, numeric) && is_ex_exactly_of_type(b, numeric)) { + if (is_exactly_a(a) && is_exactly_a(b)) { numeric g = gcd(ex_to(a), ex_to(b)); if (ca) *ca = ex_to(a) / g; @@ -1384,21 +1175,20 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const numeric mq = q.max_coefficient(); numeric xi; if (mp > mq) - xi = mq * _num2() + _num2(); + xi = mq * _num2 + _num2; else - xi = mp * _num2() + _num2(); + xi = mp * _num2 + _num2; // 6 tries maximum for (int t=0; t<6; t++) { if (xi.int_length() * maxdeg > 100000) { -//std::clog << "giving up heur_gcd, xi.int_length = " << xi.int_length() << ", maxdeg = " << maxdeg << std::endl; throw gcdheu_failed(); } // Apply evaluation homomorphism and calculate GCD ex cp, cq; - ex gamma = heur_gcd(p.subs(x == xi), q.subs(x == xi), &cp, &cq, var+1).expand(); - if (!is_ex_exactly_of_type(gamma, fail)) { + ex gamma = heur_gcd(p.subs(x == xi, subs_options::no_pattern), q.subs(x == xi, subs_options::no_pattern), &cp, &cq, var+1).expand(); + if (!is_exactly_a(gamma)) { // Reconstruct polynomial from GCD of mapped polynomials ex g = interpolate(gamma, xi, x, maxdeg); @@ -1411,39 +1201,11 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const if (divide_in_z(p, g, ca ? *ca : dummy, var) && divide_in_z(q, g, cb ? *cb : dummy, var)) { g *= gc; ex lc = g.lcoeff(x); - if (is_ex_exactly_of_type(lc, numeric) && ex_to(lc).is_negative()) + if (is_exactly_a(lc) && ex_to(lc).is_negative()) return -g; else return g; } -#if 0 - cp = interpolate(cp, xi, x); - if (divide_in_z(cp, p, g, var)) { - if (divide_in_z(g, q, cb ? *cb : dummy, var)) { - g *= gc; - if (ca) - *ca = cp; - ex lc = g.lcoeff(x); - if (is_ex_exactly_of_type(lc, numeric) && ex_to(lc).is_negative()) - return -g; - else - return g; - } - } - cq = interpolate(cq, xi, x); - if (divide_in_z(cq, q, g, var)) { - if (divide_in_z(g, p, ca ? *ca : dummy, var)) { - g *= gc; - if (cb) - *cb = cq; - ex lc = g.lcoeff(x); - if (is_ex_exactly_of_type(lc, numeric) && ex_to(lc).is_negative()) - return -g; - else - return g; - } - } -#endif } // Next evaluation point @@ -1463,20 +1225,19 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const * @return the GCD as a new expression */ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args) { -//std::clog << "gcd(" << a << "," << b << ")\n"; #if STATISTICS gcd_called++; #endif // GCD of numerics -> CLN - if (is_ex_exactly_of_type(a, numeric) && is_ex_exactly_of_type(b, numeric)) { + if (is_exactly_a(a) && is_exactly_a(b)) { numeric g = gcd(ex_to(a), ex_to(b)); if (ca || cb) { if (g.is_zero()) { if (ca) - *ca = _ex0(); + *ca = _ex0; if (cb) - *cb = _ex0(); + *cb = _ex0; } else { if (ca) *ca = ex_to(a) / g; @@ -1493,15 +1254,15 @@ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args) } // Partially factored cases (to avoid expanding large expressions) - if (is_ex_exactly_of_type(a, mul)) { - if (is_ex_exactly_of_type(b, mul) && b.nops() > a.nops()) + if (is_exactly_a(a)) { + if (is_exactly_a(b) && b.nops() > a.nops()) goto factored_b; factored_a: - unsigned num = a.nops(); + size_t num = a.nops(); exvector g; g.reserve(num); exvector acc_ca; acc_ca.reserve(num); ex part_b = b; - for (unsigned i=0; isetflag(status_flags::dynallocated); - } else if (is_ex_exactly_of_type(b, mul)) { - if (is_ex_exactly_of_type(a, mul) && a.nops() > b.nops()) + } else if (is_exactly_a(b)) { + if (is_exactly_a(a) && a.nops() > b.nops()) goto factored_a; factored_b: - unsigned num = b.nops(); + size_t num = b.nops(); exvector g; g.reserve(num); exvector acc_cb; acc_cb.reserve(num); ex part_a = a; - for (unsigned i=0; i(a)) { ex p = a.op(0); - if (is_ex_exactly_of_type(b, power)) { + if (is_exactly_a(b)) { if (p.is_equal(b.op(0))) { // a = p^n, b = p^m, gcd = p^min(n, m) ex exp_a = a.op(1), exp_b = b.op(1); if (exp_a < exp_b) { if (ca) - *ca = _ex1(); + *ca = _ex1; if (cb) *cb = power(p, exp_b - exp_a); return power(p, exp_a); @@ -1551,7 +1312,7 @@ factored_b: if (ca) *ca = power(p, exp_a - exp_b); if (cb) - *cb = _ex1(); + *cb = _ex1; return power(p, exp_b); } } @@ -1561,16 +1322,16 @@ factored_b: if (ca) *ca = power(p, a.op(1) - 1); if (cb) - *cb = _ex1(); + *cb = _ex1; return p; } } - } else if (is_ex_exactly_of_type(b, power)) { + } else if (is_exactly_a(b)) { ex p = b.op(0); if (p.is_equal(a)) { // a = p, b = p^n, gcd = p if (ca) - *ca = _ex1(); + *ca = _ex1; if (cb) *cb = power(p, b.op(1) - 1); return p; @@ -1582,31 +1343,31 @@ factored_b: ex aex = a.expand(), bex = b.expand(); if (aex.is_zero()) { if (ca) - *ca = _ex0(); + *ca = _ex0; if (cb) - *cb = _ex1(); + *cb = _ex1; return b; } if (bex.is_zero()) { if (ca) - *ca = _ex1(); + *ca = _ex1; if (cb) - *cb = _ex0(); + *cb = _ex0; return a; } - if (aex.is_equal(_ex1()) || bex.is_equal(_ex1())) { + if (aex.is_equal(_ex1) || bex.is_equal(_ex1)) { if (ca) *ca = a; if (cb) *cb = b; - return _ex1(); + return _ex1; } #if FAST_COMPARE if (a.is_equal(b)) { if (ca) - *ca = _ex1(); + *ca = _ex1; if (cb) - *cb = _ex1(); + *cb = _ex1; return a; } #endif @@ -1625,20 +1386,17 @@ factored_b: int min_ldeg = std::min(ldeg_a,ldeg_b); if (min_ldeg > 0) { ex common = power(x, min_ldeg); -//std::clog << "trivial common factor " << common << std::endl; return gcd((aex / common).expand(), (bex / common).expand(), ca, cb, false) * common; } // Try to eliminate variables if (var->deg_a == 0) { -//std::clog << "eliminating variable " << x << " from b" << std::endl; ex c = bex.content(x); ex g = gcd(aex, c, ca, cb, false); if (cb) *cb *= bex.unit(x) * bex.primpart(x, c); return g; } else if (var->deg_b == 0) { -//std::clog << "eliminating variable " << x << " from a" << std::endl; ex c = aex.content(x); ex g = gcd(c, bex, ca, cb, false); if (ca) @@ -1646,27 +1404,19 @@ factored_b: return g; } - ex g; -#if 1 // Try heuristic algorithm first, fall back to PRS if that failed + ex g; try { g = heur_gcd(aex, bex, ca, cb, var); } catch (gcdheu_failed) { g = fail(); } - if (is_ex_exactly_of_type(g, fail)) { -//std::clog << "heuristics failed" << std::endl; + if (is_exactly_a(g)) { #if STATISTICS heur_gcd_failed++; #endif -#endif -// g = heur_gcd(aex, bex, ca, cb, var); -// g = eu_gcd(aex, bex, &x); -// g = euprem_gcd(aex, bex, &x); -// g = peu_gcd(aex, bex, &x); -// g = red_gcd(aex, bex, &x); g = sr_gcd(aex, bex, var); - if (g.is_equal(_ex1())) { + if (g.is_equal(_ex1)) { // Keep cofactors factored if possible if (ca) *ca = a; @@ -1678,9 +1428,8 @@ factored_b: if (cb) divide(bex, g, *cb, false); } -#if 1 } else { - if (g.is_equal(_ex1())) { + if (g.is_equal(_ex1)) { // Keep cofactors factored if possible if (ca) *ca = a; @@ -1688,7 +1437,7 @@ factored_b: *cb = b; } } -#endif + return g; } @@ -1702,7 +1451,7 @@ factored_b: * @return the LCM as a new expression */ ex lcm(const ex &a, const ex &b, bool check_args) { - if (is_ex_exactly_of_type(a, numeric) && is_ex_exactly_of_type(b, numeric)) + if (is_exactly_a(a) && is_exactly_a(b)) return lcm(ex_to(a), ex_to(b)); if (check_args && (!a.info(info_flags::rational_polynomial) || !b.info(info_flags::rational_polynomial))) throw(std::invalid_argument("lcm: arguments must be polynomials over the rationals")); @@ -1730,7 +1479,7 @@ static exvector sqrfree_yun(const ex &a, const symbol &x) ex w = a; ex z = w.diff(x); ex g = gcd(w, z); - if (g.is_equal(_ex1())) { + if (g.is_equal(_ex1)) { res.push_back(a); return res; } @@ -1745,15 +1494,46 @@ static exvector sqrfree_yun(const ex &a, const symbol &x) return res; } -/** Compute square-free factorization of multivariate polynomial in Q[X]. + +/** Compute a square-free factorization of a multivariate polynomial in Q[X]. * * @param a multivariate polynomial over Q[X] * @param x lst of variables to factor in, may be left empty for autodetection - * @return polynomail a in square-free factored form. */ + * @return a square-free factorization of \p a. + * + * \note + * A polynomial \f$p(X) \in C[X]\f$ is said square-free + * if, whenever any two polynomials \f$q(X)\f$ and \f$r(X)\f$ + * are such that + * \f[ + * p(X) = q(X)^2 r(X), + * \f] + * we have \f$q(X) \in C\f$. + * This means that \f$p(X)\f$ has no repeated factors, apart + * eventually from constants. + * Given a polynomial \f$p(X) \in C[X]\f$, we say that the + * decomposition + * \f[ + * p(X) = b \cdot p_1(X)^{a_1} \cdot p_2(X)^{a_2} \cdots p_r(X)^{a_r} + * \f] + * is a square-free factorization of \f$p(X)\f$ if the + * following conditions hold: + * -# \f$b \in C\f$ and \f$b \neq 0\f$; + * -# \f$a_i\f$ is a positive integer for \f$i = 1, \ldots, r\f$; + * -# the degree of the polynomial \f$p_i\f$ is strictly positive + * for \f$i = 1, \ldots, r\f$; + * -# the polynomial \f$\Pi_{i=1}^r p_i(X)\f$ is square-free. + * + * Square-free factorizations need not be unique. For example, if + * \f$a_i\f$ is even, we could change the polynomial \f$p_i(X)\f$ + * into \f$-p_i(X)\f$. + * Observe also that the factors \f$p_i(X)\f$ need not be irreducible + * polynomials. + */ ex sqrfree(const ex &a, const lst &l) { - if (is_ex_of_type(a,numeric) || // algorithm does not trap a==0 - is_ex_of_type(a,symbol)) // shortcut + if (is_exactly_a(a) || // algorithm does not trap a==0 + is_a(a)) // shortcut return a; // If no lst of variables to factorize in was specified we have to @@ -1762,7 +1542,7 @@ ex sqrfree(const ex &a, const lst &l) lst args; if (l.nops()==0) { sym_desc_vec sdv; - get_symbol_stats(a, _ex0(), sdv); + get_symbol_stats(a, _ex0, sdv); sym_desc_vec::const_iterator it = sdv.begin(), itend = sdv.end(); while (it != itend) { args.append(*it->sym); @@ -1773,13 +1553,13 @@ ex sqrfree(const ex &a, const lst &l) } // Find the symbol to factor in at this stage - if (!is_ex_of_type(args.op(0), symbol)) + if (!is_a(args.op(0))) throw (std::runtime_error("sqrfree(): invalid factorization variable")); - const symbol x = ex_to(args.op(0)); + const symbol &x = ex_to(args.op(0)); // convert the argument from something in Q[X] to something in Z[X] - numeric lcm = lcm_of_coefficients_denominators(a); - ex tmp = multiply_lcm(a,lcm); + const numeric lcm = lcm_of_coefficients_denominators(a); + const ex tmp = multiply_lcm(a,lcm); // find the factors exvector factors = sqrfree_yun(tmp,x); @@ -1788,28 +1568,35 @@ ex sqrfree(const ex &a, const lst &l) lst newargs = args; newargs.remove_first(); - // recurse down the factors in remaining vars + // recurse down the factors in remaining variables if (newargs.nops()>0) { - exvector::iterator i = factors.begin(), end = factors.end(); - while (i != end) { + exvector::iterator i = factors.begin(); + while (i != factors.end()) { *i = sqrfree(*i, newargs); ++i; } } // Done with recursion, now construct the final result - ex result = _ex1(); + ex result = _ex1; exvector::const_iterator it = factors.begin(), itend = factors.end(); for (int p = 1; it!=itend; ++it, ++p) result *= power(*it, p); - // Yun's algorithm does not account for constant factors. (For - // univariate polynomials it works only in the monic case.) We can - // correct this by inserting what has been lost back into the result: - result = result * quo(tmp, result, x); + // Yun's algorithm does not account for constant factors. (For univariate + // polynomials it works only in the monic case.) We can correct this by + // inserting what has been lost back into the result. For completeness + // we'll also have to recurse down that factor in the remaining variables. + if (newargs.nops()>0) + result *= sqrfree(quo(tmp, result, x), newargs); + else + result *= quo(tmp, result, x); + + // Put in the reational overall factor again and return return result * lcm.inverse(); } + /** Compute square-free partial fraction decomposition of rational function * a(x). * @@ -1831,15 +1618,15 @@ ex sqrfree_parfrac(const ex & a, const symbol & x) // Factorize denominator and compute cofactors exvector yun = sqrfree_yun(denom, x); //clog << "yun factors: " << exprseq(yun) << endl; - unsigned num_yun = yun.size(); + size_t num_yun = yun.size(); exvector factor; factor.reserve(num_yun); exvector cofac; cofac.reserve(num_yun); - for (unsigned i=0; isecond; // Otherwise create new symbol and add to list, taking care that the - // replacement expression doesn't contain symbols from the sym_lst + // replacement expression doesn't itself contain symbols from repl, // because subs() is not recursive - symbol s; - ex es(s); - ex e_replaced = e.subs(sym_lst, repl_lst); - sym_lst.append(es); - repl_lst.append(e_replaced); + ex es = (new symbol)->setflag(status_flags::dynallocated); + ex e_replaced = e.subs(repl, subs_options::no_pattern); + repl[es] = e_replaced; + rev_lookup[e_replaced] = es; return es; } /** Create a symbol for replacing the expression "e" (or return a previously * assigned symbol). An expression of the form "symbol == expression" is added * to repl_lst and the symbol is returned. - * @see ex::to_rational */ -static ex replace_with_symbol(const ex &e, lst &repl_lst) + * @see basic::to_rational + * @see basic::to_polynomial */ +static ex replace_with_symbol(const ex & e, lst & repl_lst) { // Expression already in repl_lst? Then return the assigned symbol - for (unsigned i=0; iop(1).is_equal(e)) + return it->op(0); // Otherwise create new symbol and add to list, taking care that the - // replacement expression doesn't contain symbols from the sym_lst + // replacement expression doesn't itself contain symbols from the repl_lst, // because subs() is not recursive - symbol s; - ex es(s); - ex e_replaced = e.subs(repl_lst); + ex es = (new symbol)->setflag(status_flags::dynallocated); + ex e_replaced = e.subs(repl_lst, subs_options::no_pattern); repl_lst.append(es == e_replaced); return es; } @@ -1947,18 +1733,18 @@ struct normal_map_function : public map_function { /** Default implementation of ex::normal(). It normalizes the children and * replaces the object with a temporary symbol. * @see ex::normal */ -ex basic::normal(lst &sym_lst, lst &repl_lst, int level) const +ex basic::normal(exmap & repl, exmap & rev_lookup, int level) const { if (nops() == 0) - return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(*this, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); else { if (level == 1) - return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(*this, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); else if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); else { normal_map_function map_normal(level - 1); - return (new lst(replace_with_symbol(map(map_normal), sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(map(map_normal), repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); } } } @@ -1966,9 +1752,9 @@ ex basic::normal(lst &sym_lst, lst &repl_lst, int level) const /** Implementation of ex::normal() for symbols. This returns the unmodified symbol. * @see ex::normal */ -ex symbol::normal(lst &sym_lst, lst &repl_lst, int level) const +ex symbol::normal(exmap & repl, exmap & rev_lookup, int level) const { - return (new lst(*this, _ex1()))->setflag(status_flags::dynallocated); + return (new lst(*this, _ex1))->setflag(status_flags::dynallocated); } @@ -1976,19 +1762,19 @@ ex symbol::normal(lst &sym_lst, lst &repl_lst, int level) const * into re+I*im and replaces I and non-rational real numbers with a temporary * symbol. * @see ex::normal */ -ex numeric::normal(lst &sym_lst, lst &repl_lst, int level) const +ex numeric::normal(exmap & repl, exmap & rev_lookup, int level) const { numeric num = numer(); ex numex = num; if (num.is_real()) { if (!num.is_integer()) - numex = replace_with_symbol(numex, sym_lst, repl_lst); + numex = replace_with_symbol(numex, repl, rev_lookup); } else { // complex numeric re = num.real(), im = num.imag(); - ex re_ex = re.is_rational() ? re : replace_with_symbol(re, sym_lst, repl_lst); - ex im_ex = im.is_rational() ? im : replace_with_symbol(im, sym_lst, repl_lst); - numex = re_ex + im_ex * replace_with_symbol(I, sym_lst, repl_lst); + ex re_ex = re.is_rational() ? re : replace_with_symbol(re, repl, rev_lookup); + ex im_ex = im.is_rational() ? im : replace_with_symbol(im, repl, rev_lookup); + numex = re_ex + im_ex * replace_with_symbol(I, repl, rev_lookup); } // Denominator is always a real integer (see numeric::denom()) @@ -2004,17 +1790,17 @@ static ex frac_cancel(const ex &n, const ex &d) { ex num = n; ex den = d; - numeric pre_factor = _num1(); + numeric pre_factor = _num1; //std::clog << "frac_cancel num = " << num << ", den = " << den << std::endl; // Handle trivial case where denominator is 1 - if (den.is_equal(_ex1())) + if (den.is_equal(_ex1)) return (new lst(num, den))->setflag(status_flags::dynallocated); // Handle special cases where numerator or denominator is 0 if (num.is_zero()) - return (new lst(num, _ex1()))->setflag(status_flags::dynallocated); + return (new lst(num, _ex1))->setflag(status_flags::dynallocated); if (den.expand().is_zero()) throw(std::overflow_error("frac_cancel: division by zero in frac_cancel")); @@ -2028,19 +1814,26 @@ static ex frac_cancel(const ex &n, const ex &d) // Cancel GCD from numerator and denominator ex cnum, cden; - if (gcd(num, den, &cnum, &cden, false) != _ex1()) { + if (gcd(num, den, &cnum, &cden, false) != _ex1) { num = cnum; den = cden; } // Make denominator unit normal (i.e. coefficient of first symbol // as defined by get_first_symbol() is made positive) - const symbol *x; - if (get_first_symbol(den, x)) { - GINAC_ASSERT(is_ex_exactly_of_type(den.unit(*x),numeric)); - if (ex_to(den.unit(*x)).is_negative()) { - num *= _ex_1(); - den *= _ex_1(); + if (is_exactly_a(den)) { + if (ex_to(den).is_negative()) { + num *= _ex_1; + den *= _ex_1; + } + } else { + const symbol *x; + if (get_first_symbol(den, x)) { + GINAC_ASSERT(is_exactly_a(den.unit(*x))); + if (ex_to(den.unit(*x)).is_negative()) { + num *= _ex_1; + den *= _ex_1; + } } } @@ -2053,10 +1846,10 @@ static ex frac_cancel(const ex &n, const ex &d) /** Implementation of ex::normal() for a sum. It expands terms and performs * fractional addition. * @see ex::normal */ -ex add::normal(lst &sym_lst, lst &repl_lst, int level) const +ex add::normal(exmap & repl, exmap & rev_lookup, int level) const { if (level == 1) - return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(*this, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); else if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); @@ -2066,12 +1859,12 @@ ex add::normal(lst &sym_lst, lst &repl_lst, int level) const dens.reserve(seq.size()+1); epvector::const_iterator it = seq.begin(), itend = seq.end(); while (it != itend) { - ex n = recombine_pair_to_ex(*it).bp->normal(sym_lst, repl_lst, level-1); + ex n = ex_to(recombine_pair_to_ex(*it)).normal(repl, rev_lookup, level-1); nums.push_back(n.op(0)); dens.push_back(n.op(1)); it++; } - ex n = overall_coeff.bp->normal(sym_lst, repl_lst, level-1); + ex n = ex_to(overall_coeff).normal(repl, rev_lookup, level-1); nums.push_back(n.op(0)); dens.push_back(n.op(1)); GINAC_ASSERT(nums.size() == dens.size()); @@ -2112,10 +1905,10 @@ ex add::normal(lst &sym_lst, lst &repl_lst, int level) const /** Implementation of ex::normal() for a product. It cancels common factors * from fractions. * @see ex::normal() */ -ex mul::normal(lst &sym_lst, lst &repl_lst, int level) const +ex mul::normal(exmap & repl, exmap & rev_lookup, int level) const { if (level == 1) - return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(*this, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); else if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); @@ -2125,12 +1918,12 @@ ex mul::normal(lst &sym_lst, lst &repl_lst, int level) const ex n; epvector::const_iterator it = seq.begin(), itend = seq.end(); while (it != itend) { - n = recombine_pair_to_ex(*it).bp->normal(sym_lst, repl_lst, level-1); + n = ex_to(recombine_pair_to_ex(*it)).normal(repl, rev_lookup, level-1); num.push_back(n.op(0)); den.push_back(n.op(1)); it++; } - n = overall_coeff.bp->normal(sym_lst, repl_lst, level-1); + n = ex_to(overall_coeff).normal(repl, rev_lookup, level-1); num.push_back(n.op(0)); den.push_back(n.op(1)); @@ -2140,20 +1933,20 @@ ex mul::normal(lst &sym_lst, lst &repl_lst, int level) const } -/** Implementation of ex::normal() for powers. It normalizes the basis, +/** Implementation of ex::normal([B) for powers. It normalizes the basis, * distributes integer exponents to numerator and denominator, and replaces * non-integer powers by temporary symbols. * @see ex::normal */ -ex power::normal(lst &sym_lst, lst &repl_lst, int level) const +ex power::normal(exmap & repl, exmap & rev_lookup, int level) const { if (level == 1) - return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(*this, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); else if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); // Normalize basis and exponent (exponent gets reassembled) - ex n_basis = basis.bp->normal(sym_lst, repl_lst, level-1); - ex n_exponent = exponent.bp->normal(sym_lst, repl_lst, level-1); + ex n_basis = ex_to(basis).normal(repl, rev_lookup, level-1); + ex n_exponent = ex_to(exponent).normal(repl, rev_lookup, level-1); n_exponent = n_exponent.op(0) / n_exponent.op(1); if (n_exponent.info(info_flags::integer)) { @@ -2174,34 +1967,32 @@ ex power::normal(lst &sym_lst, lst &repl_lst, int level) const if (n_exponent.info(info_flags::positive)) { // (a/b)^x -> {sym((a/b)^x), 1} - return (new lst(replace_with_symbol(power(n_basis.op(0) / n_basis.op(1), n_exponent), sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(power(n_basis.op(0) / n_basis.op(1), n_exponent), repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); } else if (n_exponent.info(info_flags::negative)) { - if (n_basis.op(1).is_equal(_ex1())) { + if (n_basis.op(1).is_equal(_ex1)) { // a^-x -> {1, sym(a^x)} - return (new lst(_ex1(), replace_with_symbol(power(n_basis.op(0), -n_exponent), sym_lst, repl_lst)))->setflag(status_flags::dynallocated); + return (new lst(_ex1, replace_with_symbol(power(n_basis.op(0), -n_exponent), repl, rev_lookup)))->setflag(status_flags::dynallocated); } else { // (a/b)^-x -> {sym((b/a)^x), 1} - return (new lst(replace_with_symbol(power(n_basis.op(1) / n_basis.op(0), -n_exponent), sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(power(n_basis.op(1) / n_basis.op(0), -n_exponent), repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); } - - } else { // n_exponent not numeric - - // (a/b)^x -> {sym((a/b)^x, 1} - return (new lst(replace_with_symbol(power(n_basis.op(0) / n_basis.op(1), n_exponent), sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); } } + + // (a/b)^x -> {sym((a/b)^x, 1} + return (new lst(replace_with_symbol(power(n_basis.op(0) / n_basis.op(1), n_exponent), repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); } /** Implementation of ex::normal() for pseries. It normalizes each coefficient * and replaces the series by a temporary symbol. * @see ex::normal */ -ex pseries::normal(lst &sym_lst, lst &repl_lst, int level) const +ex pseries::normal(exmap & repl, exmap & rev_lookup, int level) const { epvector newseq; epvector::const_iterator i = seq.begin(), end = seq.end(); @@ -2212,7 +2003,7 @@ ex pseries::normal(lst &sym_lst, lst &repl_lst, int level) const ++i; } ex n = pseries(relational(var,point), newseq); - return (new lst(replace_with_symbol(n, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated); + return (new lst(replace_with_symbol(n, repl, rev_lookup), _ex1))->setflag(status_flags::dynallocated); } @@ -2230,14 +2021,14 @@ ex pseries::normal(lst &sym_lst, lst &repl_lst, int level) const * @return normalized expression */ ex ex::normal(int level) const { - lst sym_lst, repl_lst; + exmap repl, rev_lookup; - ex e = bp->normal(sym_lst, repl_lst, level); - GINAC_ASSERT(is_ex_of_type(e, lst)); + ex e = bp->normal(repl, rev_lookup, level); + GINAC_ASSERT(is_a(e)); // Re-insert replaced symbols - if (sym_lst.nops() > 0) - e = e.subs(sym_lst, repl_lst); + if (!repl.empty()) + e = e.subs(repl, subs_options::no_pattern); // Convert {numerator, denominator} form back to fraction return e.op(0) / e.op(1); @@ -2249,18 +2040,18 @@ ex ex::normal(int level) const * * @see ex::normal * @return numerator */ -ex ex::numer(void) const +ex ex::numer() const { - lst sym_lst, repl_lst; + exmap repl, rev_lookup; - ex e = bp->normal(sym_lst, repl_lst, 0); - GINAC_ASSERT(is_ex_of_type(e, lst)); + ex e = bp->normal(repl, rev_lookup, 0); + GINAC_ASSERT(is_a(e)); // Re-insert replaced symbols - if (sym_lst.nops() > 0) - return e.op(0).subs(sym_lst, repl_lst); - else + if (repl.empty()) return e.op(0); + else + return e.op(0).subs(repl, subs_options::no_pattern); } /** Get denominator of an expression. If the expression is not of the normal @@ -2269,18 +2060,18 @@ ex ex::numer(void) const * * @see ex::normal * @return denominator */ -ex ex::denom(void) const +ex ex::denom() const { - lst sym_lst, repl_lst; + exmap repl, rev_lookup; - ex e = bp->normal(sym_lst, repl_lst, 0); - GINAC_ASSERT(is_ex_of_type(e, lst)); + ex e = bp->normal(repl, rev_lookup, 0); + GINAC_ASSERT(is_a(e)); // Re-insert replaced symbols - if (sym_lst.nops() > 0) - return e.op(1).subs(sym_lst, repl_lst); - else + if (repl.empty()) return e.op(1); + else + return e.op(1).subs(repl, subs_options::no_pattern); } /** Get numerator and denominator of an expression. If the expresison is not @@ -2289,43 +2080,77 @@ ex ex::denom(void) const * * @see ex::normal * @return a list [numerator, denominator] */ -ex ex::numer_denom(void) const +ex ex::numer_denom() const { - lst sym_lst, repl_lst; + exmap repl, rev_lookup; - ex e = bp->normal(sym_lst, repl_lst, 0); - GINAC_ASSERT(is_ex_of_type(e, lst)); + ex e = bp->normal(repl, rev_lookup, 0); + GINAC_ASSERT(is_a(e)); // Re-insert replaced symbols - if (sym_lst.nops() > 0) - return e.subs(sym_lst, repl_lst); - else + if (repl.empty()) return e; + else + return e.subs(repl, subs_options::no_pattern); +} + + +/** Rationalization of non-rational functions. + * This function converts a general expression to a rational function + * by replacing all non-rational subexpressions (like non-rational numbers, + * non-integer powers or functions like sin(), cos() etc.) to temporary + * symbols. This makes it possible to use functions like gcd() and divide() + * on non-rational functions by applying to_rational() on the arguments, + * calling the desired function and re-substituting the temporary symbols + * in the result. To make the last step possible, all temporary symbols and + * their associated expressions are collected in the list specified by the + * repl_lst parameter in the form {symbol == expression}, ready to be passed + * as an argument to ex::subs(). + * + * @param repl_lst collects a list of all temporary symbols and their replacements + * @return rationalized expression */ +ex ex::to_rational(lst &repl_lst) const +{ + return bp->to_rational(repl_lst); +} + +ex ex::to_polynomial(lst &repl_lst) const +{ + return bp->to_polynomial(repl_lst); } -/** Default implementation of ex::to_rational(). It replaces the object with a - * temporary symbol. - * @see ex::to_rational */ +/** Default implementation of ex::to_rational(). This replaces the object with + * a temporary symbol. */ ex basic::to_rational(lst &repl_lst) const { return replace_with_symbol(*this, repl_lst); } +ex basic::to_polynomial(lst &repl_lst) const +{ + return replace_with_symbol(*this, repl_lst); +} + /** Implementation of ex::to_rational() for symbols. This returns the - * unmodified symbol. - * @see ex::to_rational */ + * unmodified symbol. */ ex symbol::to_rational(lst &repl_lst) const { return *this; } +/** Implementation of ex::to_polynomial() for symbols. This returns the + * unmodified symbol. */ +ex symbol::to_polynomial(lst &repl_lst) const +{ + return *this; +} + /** Implementation of ex::to_rational() for a numeric. It splits complex * numbers into re+I*im and replaces I and non-rational real numbers with a - * temporary symbol. - * @see ex::to_rational */ + * temporary symbol. */ ex numeric::to_rational(lst &repl_lst) const { if (is_real()) { @@ -2341,10 +2166,27 @@ ex numeric::to_rational(lst &repl_lst) const return *this; } +/** Implementation of ex::to_polynomial() for a numeric. It splits complex + * numbers into re+I*im and replaces I and non-integer real numbers with a + * temporary symbol. */ +ex numeric::to_polynomial(lst &repl_lst) const +{ + if (is_real()) { + if (!is_integer()) + return replace_with_symbol(*this, repl_lst); + } else { // complex + numeric re = real(); + numeric im = imag(); + ex re_ex = re.is_integer() ? re : replace_with_symbol(re, repl_lst); + ex im_ex = im.is_integer() ? im : replace_with_symbol(im, repl_lst); + return re_ex + im_ex * replace_with_symbol(I, repl_lst); + } + return *this; +} + /** Implementation of ex::to_rational() for powers. It replaces non-integer - * powers by temporary symbols. - * @see ex::to_rational */ + * powers by temporary symbols. */ ex power::to_rational(lst &repl_lst) const { if (exponent.info(info_flags::integer)) @@ -2353,9 +2195,18 @@ ex power::to_rational(lst &repl_lst) const return replace_with_symbol(*this, repl_lst); } +/** Implementation of ex::to_polynomial() for powers. It replaces non-posint + * powers by temporary symbols. */ +ex power::to_polynomial(lst &repl_lst) const +{ + if (exponent.info(info_flags::posint)) + return power(basis.to_rational(repl_lst), exponent); + else + return replace_with_symbol(*this, repl_lst); +} + -/** Implementation of ex::to_rational() for expairseqs. - * @see ex::to_rational */ +/** Implementation of ex::to_rational() for expairseqs. */ ex expairseq::to_rational(lst &repl_lst) const { epvector s; @@ -2369,28 +2220,124 @@ ex expairseq::to_rational(lst &repl_lst) const if (oc.info(info_flags::numeric)) return thisexpairseq(s, overall_coeff); else - s.push_back(combine_ex_with_coeff_to_pair(oc, _ex1())); + s.push_back(combine_ex_with_coeff_to_pair(oc, _ex1)); return thisexpairseq(s, default_overall_coeff()); } +/** Implementation of ex::to_polynomial() for expairseqs. */ +ex expairseq::to_polynomial(lst &repl_lst) const +{ + epvector s; + s.reserve(seq.size()); + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + s.push_back(split_ex_to_pair(recombine_pair_to_ex(*i).to_polynomial(repl_lst))); + ++i; + } + ex oc = overall_coeff.to_polynomial(repl_lst); + if (oc.info(info_flags::numeric)) + return thisexpairseq(s, overall_coeff); + else + s.push_back(combine_ex_with_coeff_to_pair(oc, _ex1)); + return thisexpairseq(s, default_overall_coeff()); +} -/** Rationalization of non-rational functions. - * This function converts a general expression to a rational polynomial - * by replacing all non-rational subexpressions (like non-rational numbers, - * non-integer powers or functions like sin(), cos() etc.) to temporary - * symbols. This makes it possible to use functions like gcd() and divide() - * on non-rational functions by applying to_rational() on the arguments, - * calling the desired function and re-substituting the temporary symbols - * in the result. To make the last step possible, all temporary symbols and - * their associated expressions are collected in the list specified by the - * repl_lst parameter in the form {symbol == expression}, ready to be passed - * as an argument to ex::subs(). - * - * @param repl_lst collects a list of all temporary symbols and their replacements - * @return rationalized expression */ -ex ex::to_rational(lst &repl_lst) const + +/** Remove the common factor in the terms of a sum 'e' by calculating the GCD, + * and multiply it into the expression 'factor' (which needs to be initialized + * to 1, unless you're accumulating factors). */ +static ex find_common_factor(const ex & e, ex & factor, lst & repl) { - return bp->to_rational(repl_lst); + if (is_exactly_a(e)) { + + size_t num = e.nops(); + exvector terms; terms.reserve(num); + ex gc; + + // Find the common GCD + for (size_t i=0; i(x) || is_exactly_a(x)) { + ex f = 1; + x = find_common_factor(x, f, repl); + x *= f; + } + + if (i == 0) + gc = x; + else + gc = gcd(gc, x); + + terms.push_back(x); + } + + if (gc.is_equal(_ex1)) + return e; + + // The GCD is the factor we pull out + factor *= gc; + + // Now divide all terms by the GCD + for (size_t i=0; i(t)) { + for (size_t j=0; jsetflag(status_flags::dynallocated); + goto term_done; + } + } + } + + divide(t, gc, x); + t = x; +term_done: ; + } + return (new add(terms))->setflag(status_flags::dynallocated); + + } else if (is_exactly_a(e)) { + + size_t num = e.nops(); + exvector v; v.reserve(num); + + for (size_t i=0; isetflag(status_flags::dynallocated); + + } else if (is_exactly_a(e)) { + + return e.to_polynomial(repl); + + } else + return e; +} + + +/** Collect common factors in sums. This converts expressions like + * 'a*(b*x+b*y)' to 'a*b*(x+y)'. */ +ex collect_common_factors(const ex & e) +{ + if (is_exactly_a(e) || is_exactly_a(e)) { + + lst repl; + ex factor = 1; + ex r = find_common_factor(e, factor, repl); + return factor.subs(repl, subs_options::no_pattern) * r.subs(repl, subs_options::no_pattern); + + } else + return e; }