From 8e57fa64c59a382338860cd9209755924f90fd0d Mon Sep 17 00:00:00 2001 From: "Vladimir V. Kisil" Date: Tue, 30 Jul 2013 16:40:38 +0100 Subject: [PATCH 3/9] Housekeeping work in inifcns.cpp 1) Make abs_power aware on even powers, even if they are not numeric. 2) Add several hold() to returns which cannot be processed further. Signed-off-by: Vladimir V. Kisil --- ginac/inifcns.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp index 9219039..8103cd8 100644 --- a/ginac/inifcns.cpp +++ b/ginac/inifcns.cpp @@ -212,7 +212,7 @@ static void abs_print_csrc_float(const ex & arg, const print_context & c) static ex abs_conjugate(const ex & arg) { - return abs(arg); + return abs(arg).hold(); } static ex abs_real_part(const ex & arg) @@ -227,7 +227,8 @@ static ex abs_imag_part(const ex& arg) static ex abs_power(const ex & arg, const ex & exp) { - if (arg.is_equal(arg.conjugate()) && is_a(exp) && ex_to(exp).is_even()) + if (arg.is_equal(arg.conjugate()) && ((is_a(exp) && ex_to(exp).is_even()) + || exp.info(info_flags::even))) return power(arg, exp); else return power(abs(arg), exp).hold(); @@ -398,7 +399,7 @@ static ex csgn_power(const ex & arg, const ex & exp) { if (is_a(exp) && exp.info(info_flags::positive) && ex_to(exp).is_integer()) { if (ex_to(exp).is_odd()) - return csgn(arg); + return csgn(arg).hold(); else return power(csgn(arg), _ex2).hold(); } else @@ -489,7 +490,7 @@ static ex eta_series(const ex & x, const ex & y, static ex eta_conjugate(const ex & x, const ex & y) { - return -eta(x, y); + return -eta(x, y).hold(); } static ex eta_real_part(const ex & x, const ex & y) @@ -648,7 +649,7 @@ static ex Li2_conjugate(const ex & x) // 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)) { - return Li2(x); + return Li2(x).hold(); } if (is_exactly_a(x) && (!x.imag_part().is_zero() || x < *_num1_p)) { @@ -687,7 +688,7 @@ static ex zetaderiv_eval(const ex & n, const ex & x) if (n.info(info_flags::numeric)) { // zetaderiv(0,x) -> zeta(x) if (n.is_zero()) - return zeta(x); + return zeta(x).hold(); } return zetaderiv(n, x).hold(); -- 1.8.4.rc3