* Implementation of GiNaC's symbolic exponentiation (basis^exponent). */
/*
- * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2004 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
case info_flags::cinteger_polynomial:
case info_flags::rational_polynomial:
case info_flags::crational_polynomial:
- return exponent.info(info_flags::nonnegint);
+ return exponent.info(info_flags::nonnegint) &&
+ basis.info(inf);
case info_flags::rational_function:
- return exponent.info(info_flags::integer);
+ return exponent.info(info_flags::integer) &&
+ basis.info(inf);
case info_flags::algebraic:
- return (!exponent.info(info_flags::integer) ||
- basis.info(inf));
+ return !exponent.info(info_flags::integer) ||
+ basis.info(inf);
}
return inherited::info(inf);
}
ex power::map(map_function & f) const
{
- return (new power(f(basis), f(exponent)))->setflag(status_flags::dynallocated);
+ const ex &mapped_basis = f(basis);
+ const ex &mapped_exponent = f(exponent);
+
+ if (!are_ex_trivially_equal(basis, mapped_basis)
+ || !are_ex_trivially_equal(exponent, mapped_exponent))
+ return (new power(mapped_basis, mapped_exponent))->setflag(status_flags::dynallocated);
+ else
+ return *this;
}
int power::degree(const ex & s) const
// ^(*(x,y,z),c1) -> *(x^c1,y^c1,z^c1) (c1 integer)
if (num_exponent->is_integer() && is_exactly_a<mul>(ebasis)) {
- return expand_mul(ex_to<mul>(ebasis), *num_exponent);
+ return expand_mul(ex_to<mul>(ebasis), *num_exponent, 0);
}
// ^(*(...,x;c1),c2) -> *(^(*(...,x;1),c2),c1^c2) (c1, c2 numeric(), c1>0)
return inherited::eval_ncmul(v);
}
+ex power::conjugate() const
+{
+ ex newbasis = basis.conjugate();
+ ex newexponent = exponent.conjugate();
+ if (are_ex_trivially_equal(basis, newbasis) && are_ex_trivially_equal(exponent, newexponent)) {
+ return *this;
+ }
+ return (new power(newbasis, newexponent))->setflag(status_flags::dynallocated);
+}
+
// protected
/** Implementation of ex::diff() for a power.
const numeric &num_exponent = ex_to<numeric>(a.overall_coeff);
int int_exponent = num_exponent.to_int();
if (int_exponent > 0 && is_exactly_a<add>(expanded_basis))
- distrseq.push_back(expand_add(ex_to<add>(expanded_basis), int_exponent));
+ distrseq.push_back(expand_add(ex_to<add>(expanded_basis), int_exponent, options));
else
distrseq.push_back(power(expanded_basis, a.overall_coeff));
} else
// Make sure that e.g. (x+y)^(1+a) -> x*(x+y)^a + y*(x+y)^a
ex r = (new mul(distrseq))->setflag(status_flags::dynallocated);
- return r.expand();
+ return r.expand(options);
}
if (!is_exactly_a<numeric>(expanded_exponent) ||
// (x+y)^n, n>0
if (int_exponent > 0 && is_exactly_a<add>(expanded_basis))
- return expand_add(ex_to<add>(expanded_basis), int_exponent);
+ return expand_add(ex_to<add>(expanded_basis), int_exponent, options);
// (x*y)^n -> x^n * y^n
if (is_exactly_a<mul>(expanded_basis))
- return expand_mul(ex_to<mul>(expanded_basis), num_exponent);
+ return expand_mul(ex_to<mul>(expanded_basis), num_exponent, options, true);
// cannot expand further
if (are_ex_trivially_equal(basis,expanded_basis) && are_ex_trivially_equal(exponent,expanded_exponent))
/** expand a^n where a is an add and n is a positive integer.
* @see power::expand */
-ex power::expand_add(const add & a, int n) const
+ex power::expand_add(const add & a, int n, unsigned options) const
{
if (n==2)
- return expand_add_2(a);
+ return expand_add_2(a, options);
const size_t m = a.nops();
exvector result;
!is_exactly_a<mul>(ex_to<power>(b).basis) ||
!is_exactly_a<power>(ex_to<power>(b).basis));
if (is_exactly_a<mul>(b))
- term.push_back(expand_mul(ex_to<mul>(b),numeric(k[l])));
+ term.push_back(expand_mul(ex_to<mul>(b), numeric(k[l]), options, true));
else
term.push_back(power(b,k[l]));
}
!is_exactly_a<mul>(ex_to<power>(b).basis) ||
!is_exactly_a<power>(ex_to<power>(b).basis));
if (is_exactly_a<mul>(b))
- term.push_back(expand_mul(ex_to<mul>(b),numeric(n-k_cum[m-2])));
+ term.push_back(expand_mul(ex_to<mul>(b), numeric(n-k_cum[m-2]), options, true));
else
term.push_back(power(b,n-k_cum[m-2]));
term.push_back(f);
- result.push_back((new mul(term))->setflag(status_flags::dynallocated));
+ result.push_back(ex((new mul(term))->setflag(status_flags::dynallocated)).expand(options));
// increment k[]
l = m-2;
/** Special case of power::expand_add. Expands a^2 where a is an add.
* @see power::expand_add */
-ex power::expand_add_2(const add & a) const
+ex power::expand_add_2(const add & a, unsigned options) const
{
epvector sum;
size_t a_nops = a.nops();
if (c.is_equal(_ex1)) {
if (is_exactly_a<mul>(r)) {
- sum.push_back(expair(expand_mul(ex_to<mul>(r),_num2),
+ sum.push_back(expair(expand_mul(ex_to<mul>(r), _num2, options, true),
_ex1));
} else {
sum.push_back(expair((new power(r,_ex2))->setflag(status_flags::dynallocated),
}
} else {
if (is_exactly_a<mul>(r)) {
- sum.push_back(a.combine_ex_with_coeff_to_pair(expand_mul(ex_to<mul>(r),_num2),
+ sum.push_back(a.combine_ex_with_coeff_to_pair(expand_mul(ex_to<mul>(r), _num2, options, true),
ex_to<numeric>(c).power_dyn(_num2)));
} else {
sum.push_back(a.combine_ex_with_coeff_to_pair((new power(r,_ex2))->setflag(status_flags::dynallocated),
/** Expand factors of m in m^n where m is a mul and n is and integer.
* @see power::expand */
-ex power::expand_mul(const mul & m, const numeric & n) const
+ex power::expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand) const
{
GINAC_ASSERT(n.is_integer());
epvector distrseq;
distrseq.reserve(m.seq.size());
+ bool need_reexpand = false;
+
epvector::const_iterator last = m.seq.end();
epvector::const_iterator cit = m.seq.begin();
while (cit!=last) {
} else {
// it is safe not to call mul::combine_pair_with_coeff_to_pair()
// since n is an integer
- distrseq.push_back(expair(cit->rest, ex_to<numeric>(cit->coeff).mul(n)));
+ numeric new_coeff = ex_to<numeric>(cit->coeff).mul(n);
+ if (from_expand && is_exactly_a<add>(cit->rest) && new_coeff.is_pos_integer()) {
+ // this happens when e.g. (a+b)^(1/2) gets squared and
+ // the resulting product needs to be reexpanded
+ need_reexpand = true;
+ }
+ distrseq.push_back(expair(cit->rest, new_coeff));
}
++cit;
}
- return (new mul(distrseq, ex_to<numeric>(m.overall_coeff).power_dyn(n)))->setflag(status_flags::dynallocated);
+
+ const mul & result = static_cast<const mul &>((new mul(distrseq, ex_to<numeric>(m.overall_coeff).power_dyn(n)))->setflag(status_flags::dynallocated));
+ if (need_reexpand)
+ return ex(result).expand(options);
+ if (from_expand)
+ return result.setflag(status_flags::expanded);
+ return result;
}
} // namespace GiNaC