X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns_trans.cpp;h=d7fa377e269395d6b6b2c0af0591f44242c1a363;hp=56d909c6a2a40c7b48276cb98644a8da148a9b74;hb=faf8c206bdcd01eee758103d56b83a634f787e7a;hpb=98433210d31a34b55c8283eb7fb7767d6c830e14

diff --git a/ginac/inifcns_trans.cpp b/ginac/inifcns_trans.cpp
index 56d909c6..d7fa377e 100644
--- a/ginac/inifcns_trans.cpp
+++ b/ginac/inifcns_trans.cpp
@@ -4,7 +4,7 @@
  *  functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -175,11 +175,6 @@ static ex log_eval(const ex & x)
 			return t;
 	}
 
-	// log(p^a) -> a*log(p), if p>0 and a is real
-	if (is_exactly_a<power>(x) && x.op(0).info(info_flags::positive) && x.op(1).info(info_flags::real)) {
-		return x.op(1)*log(x.op(0));
-	}
-
 	return log(x).hold();
 }
 
@@ -209,6 +204,10 @@ static ex log_series(const ex &arg,
 	if (arg_pt.is_zero())
 		must_expand_arg = true;
 	
+	if (arg.diff(ex_to<symbol>(rel.lhs())).is_zero()) {
+		throw do_taylor();
+	}
+
 	if (must_expand_arg) {
 		// method:
 		// This is the branch point: Series expand the argument first, then
@@ -248,20 +247,18 @@ static ex log_series(const ex &arg,
 				epv.reserve(2);
 				epv.push_back(expair(-1, _ex0));
 				epv.push_back(expair(Order(_ex1), order));
-				ex rest = pseries(rel, epv).add_series(argser);
+				ex rest = pseries(rel, std::move(epv)).add_series(argser);
 				for (int i = order-1; i>0; --i) {
-					epvector cterm;
-					cterm.reserve(1);
-					cterm.push_back(expair(i%2 ? _ex1/i : _ex_1/i, _ex0));
-					acc = pseries(rel, cterm).add_series(ex_to<pseries>(acc));
+					epvector cterm { expair(i%2 ? _ex1/i : _ex_1/i, _ex0) };
+					acc = pseries(rel, std::move(cterm)).add_series(ex_to<pseries>(acc));
 					acc = (ex_to<pseries>(rest)).mul_series(ex_to<pseries>(acc));
 				}
 				return acc;
 			}
 			const ex newarg = ex_to<pseries>((arg/coeff).series(rel, order+n, options)).shift_exponents(-n).convert_to_poly(true);
-			return pseries(rel, seq).add_series(ex_to<pseries>(log(newarg).series(rel, order, options)));
+			return pseries(rel, std::move(seq)).add_series(ex_to<pseries>(log(newarg).series(rel, order, options)));
 		} else  // it was a monomial
-			return pseries(rel, seq);
+			return pseries(rel, std::move(seq));
 	}
 	if (!(options & series_options::suppress_branchcut) &&
 	     arg_pt.info(info_flags::negative)) {
@@ -272,10 +269,9 @@ static ex log_series(const ex &arg,
 		const ex &point = rel.rhs();
 		const symbol foo;
 		const ex replarg = series(log(arg), s==foo, order).subs(foo==point, subs_options::no_pattern);
-		epvector seq;
-		seq.push_back(expair(-I*csgn(arg*I)*Pi, _ex0));
-		seq.push_back(expair(Order(_ex1), order));
-		return series(replarg - I*Pi + pseries(rel, seq), rel, order);
+		epvector seq { expair(-I*csgn(arg*I)*Pi, _ex0),
+		               expair(Order(_ex1), order) };
+		return series(replarg - I*Pi + pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();  // caught by function::series()
 }
@@ -936,10 +932,9 @@ static ex atan_series(const ex &arg,
 			Order0correction += log((I*arg_pt+_ex_1)/(I*arg_pt+_ex1))*I*_ex_1_2;
 		else
 			Order0correction += log((I*arg_pt+_ex1)/(I*arg_pt+_ex_1))*I*_ex1_2;
-		epvector seq;
-		seq.push_back(expair(Order0correction, _ex0));
-		seq.push_back(expair(Order(_ex1), order));
-		return series(replarg - pseries(rel, seq), rel, order);
+		epvector seq { expair(Order0correction, _ex0),
+		               expair(Order(_ex1), order) };
+		return series(replarg - pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();
 }
@@ -1531,22 +1526,21 @@ static ex atanh_series(const ex &arg,
 		return ((log(_ex1+arg)-log(_ex1-arg))*_ex1_2).series(rel, order, options);
 	// ...and the branch cuts (the discontinuity at the cut being just I*Pi)
 	if (!(options & series_options::suppress_branchcut)) {
- 		// method:
- 		// This is the branch cut: assemble the primitive series manually and
- 		// then add the corresponding complex step function.
- 		const symbol &s = ex_to<symbol>(rel.lhs());
- 		const ex &point = rel.rhs();
- 		const symbol foo;
- 		const ex replarg = series(atanh(arg), s==foo, order).subs(foo==point, subs_options::no_pattern);
+		// method:
+		// This is the branch cut: assemble the primitive series manually and
+		// then add the corresponding complex step function.
+		const symbol &s = ex_to<symbol>(rel.lhs());
+		const ex &point = rel.rhs();
+		const symbol foo;
+		const ex replarg = series(atanh(arg), s==foo, order).subs(foo==point, subs_options::no_pattern);
 		ex Order0correction = replarg.op(0)+csgn(I*arg)*Pi*I*_ex1_2;
 		if (arg_pt<_ex0)
 			Order0correction += log((arg_pt+_ex_1)/(arg_pt+_ex1))*_ex1_2;
 		else
 			Order0correction += log((arg_pt+_ex1)/(arg_pt+_ex_1))*_ex_1_2;
- 		epvector seq;
-		seq.push_back(expair(Order0correction, _ex0));
- 		seq.push_back(expair(Order(_ex1), order));
- 		return series(replarg - pseries(rel, seq), rel, order);
+		epvector seq { expair(Order0correction, _ex0),
+		               expair(Order(_ex1), order) };
+		return series(replarg - pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();
 }