summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
31fef4a)
While at it add some .hold() to returns which cannot be processed further.
Signed-off-by: Vladimir V. Kisil <kisilv@maths.leeds.ac.uk>
static ex abs_conjugate(const ex & arg)
{
static ex abs_conjugate(const ex & arg)
{
+ return abs(arg).hold();
}
static ex abs_real_part(const ex & arg)
}
static ex abs_real_part(const ex & arg)
static ex abs_power(const ex & arg, const ex & exp)
{
static ex abs_power(const ex & arg, const ex & exp)
{
- if (arg.is_equal(arg.conjugate()) && is_a<numeric>(exp) && ex_to<numeric>(exp).is_even())
+ if (arg.is_equal(arg.conjugate()) && ((is_a<numeric>(exp) && ex_to<numeric>(exp).is_even())
+ || exp.info(info_flags::even)))
return power(arg, exp);
else
return power(abs(arg), exp).hold();
return power(arg, exp);
else
return power(abs(arg), exp).hold();
{
if (is_a<numeric>(exp) && exp.info(info_flags::positive) && ex_to<numeric>(exp).is_integer()) {
if (ex_to<numeric>(exp).is_odd())
{
if (is_a<numeric>(exp) && exp.info(info_flags::positive) && ex_to<numeric>(exp).is_integer()) {
if (ex_to<numeric>(exp).is_odd())
+ return csgn(arg).hold();
else
return power(csgn(arg), _ex2).hold();
} else
else
return power(csgn(arg), _ex2).hold();
} else
static ex eta_conjugate(const ex & x, const ex & y)
{
static ex eta_conjugate(const ex & x, const ex & y)
{
+ return -eta(x, y).hold();
}
static ex eta_real_part(const ex & x, const ex & y)
}
static ex eta_real_part(const ex & x, const ex & y)
// conjugate(Li2(x))==Li2(conjugate(x)) unless on the branch cuts which
// run along the positive real axis beginning at 1.
if (x.info(info_flags::negative)) {
// conjugate(Li2(x))==Li2(conjugate(x)) unless on the branch cuts which
// run along the positive real axis beginning at 1.
if (x.info(info_flags::negative)) {
}
if (is_exactly_a<numeric>(x) &&
(!x.imag_part().is_zero() || x < *_num1_p)) {
}
if (is_exactly_a<numeric>(x) &&
(!x.imag_part().is_zero() || x < *_num1_p)) {
if (n.info(info_flags::numeric)) {
// zetaderiv(0,x) -> zeta(x)
if (n.is_zero())
if (n.info(info_flags::numeric)) {
// zetaderiv(0,x) -> zeta(x)
if (n.is_zero())
}
return zetaderiv(n, x).hold();
}
return zetaderiv(n, x).hold();