X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=e8aacab81d3004973a81444df19552a08f3d621b;hp=9219039a5581df93d58d0c744507ddc4d911a893;hb=2c886a86f1d020e927d64ab2c79b20437a6bd561;hpb=286b0d93528e35957a50c51343e0b4a9bc623bce;ds=sidebyside

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 9219039a..e8aacab8 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -197,6 +197,22 @@ static ex abs_eval(const ex & arg)
 	if (is_ex_the_function(arg, abs))
 		return arg;
 
+	if (is_ex_the_function(arg, exp))
+		return exp(arg.op(0).real_part());
+
+	if (is_exactly_a<power>(arg)) {
+		const ex& base = arg.op(0);
+		const ex& exponent = arg.op(1);
+		if (base.info(info_flags::positive) || exponent.info(info_flags::real))
+			return pow(abs(base), exponent.real_part());
+	}
+
+	if (is_ex_the_function(arg, conjugate_function))
+		return abs(arg.op(0));
+
+	if (is_ex_the_function(arg, step))
+		return arg;
+
 	return abs(arg).hold();
 }
 
@@ -212,7 +228,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 +243,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<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();
@@ -398,7 +415,7 @@ static ex csgn_power(const ex & arg, const ex & exp)
 {
 	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);
+			return csgn(arg).hold();
 		else
 			return power(csgn(arg), _ex2).hold();
 	} else
@@ -489,7 +506,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 +665,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<numeric>(x) &&
 	    (!x.imag_part().is_zero() || x < *_num1_p)) {
@@ -687,7 +704,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();