From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Tue, 16 Dec 2003 18:24:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release_1-1-6~10
X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=commitdiff_plain;h=90d53d7fa16cc53d0dff41282be02a25eb5d437b;p=ginac.git

*** empty log message ***
---

diff --git a/ginac/power.cpp b/ginac/power.cpp
index bead94dc..a6e0a5f3 100644
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -654,7 +654,7 @@ ex power::expand(unsigned options) const
 	
 	// (x*y)^n -> x^n * y^n
 	if (is_exactly_a<mul>(expanded_basis))
-		return expand_mul(ex_to<mul>(expanded_basis), num_exponent, options);
+		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))
@@ -711,7 +711,7 @@ ex power::expand_add(const add & a, int n, unsigned options) const
 			             !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]), options));
+				term.push_back(expand_mul(ex_to<mul>(b), numeric(k[l]), options, true));
 			else
 				term.push_back(power(b,k[l]));
 		}
@@ -725,7 +725,7 @@ ex power::expand_add(const add & a, int n, unsigned options) const
 		             !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]), options));
+			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]));
 
@@ -785,7 +785,7 @@ ex power::expand_add_2(const add & a, unsigned options) const
 		
 		if (c.is_equal(_ex1)) {
 			if (is_exactly_a<mul>(r)) {
-				sum.push_back(expair(expand_mul(ex_to<mul>(r), _num2, options),
+				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),
@@ -793,7 +793,7 @@ ex power::expand_add_2(const add & a, unsigned options) const
 			}
 		} else {
 			if (is_exactly_a<mul>(r)) {
-				sum.push_back(a.combine_ex_with_coeff_to_pair(expand_mul(ex_to<mul>(r), _num2, options),
+				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),
@@ -828,7 +828,7 @@ ex power::expand_add_2(const add & a, unsigned options) const
 
 /** 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, unsigned options) const
+ex power::expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand) const
 {
 	GINAC_ASSERT(n.is_integer());
 
@@ -848,7 +848,7 @@ ex power::expand_mul(const mul & m, const numeric & n, unsigned options) const
 			// it is safe not to call mul::combine_pair_with_coeff_to_pair()
 			// since n is an integer
 			numeric new_coeff = ex_to<numeric>(cit->coeff).mul(n);
-			if (is_exactly_a<add>(cit->rest) && new_coeff.is_pos_integer()) {
+			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;
@@ -861,8 +861,9 @@ ex power::expand_mul(const mul & m, const numeric & n, unsigned options) const
 	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);
-	else
+	if (from_expand)
 		return result.setflag(status_flags::expanded);
+	return result;
 }
 
 } // namespace GiNaC
diff --git a/ginac/power.h b/ginac/power.h
index c2067910..453ddc20 100644
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -80,7 +80,7 @@ protected:
 protected:
 	ex expand_add(const add & a, int n, unsigned options) const;
 	ex expand_add_2(const add & a, unsigned options) const;
-	ex expand_mul(const mul & m, const numeric & n, unsigned options) const;
+	ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false) const;
 	
 // member variables