From 65dd17f1d3b192b7fbe773250702ad191c4019f8 Mon Sep 17 00:00:00 2001 From: Alexander Frink Date: Wed, 29 Mar 2000 22:22:14 +0000 Subject: [PATCH 1/1] bug fixed in an incomplete assertion in power.cpp --- ginac/power.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ginac/power.cpp b/ginac/power.cpp index bbac8d07..fb4edd56 100644 --- a/ginac/power.cpp +++ b/ginac/power.cpp @@ -632,7 +632,10 @@ ex power::expand_add(const add & a, int n) const GINAC_ASSERT(!is_ex_exactly_of_type(b,add)); GINAC_ASSERT(!is_ex_exactly_of_type(b,power)|| !is_ex_exactly_of_type(ex_to_power(b).exponent,numeric)|| - !ex_to_numeric(ex_to_power(b).exponent).is_pos_integer()); + !ex_to_numeric(ex_to_power(b).exponent).is_pos_integer()|| + !is_ex_exactly_of_type(ex_to_power(b).basis,add)|| + !is_ex_exactly_of_type(ex_to_power(b).basis,mul)|| + !is_ex_exactly_of_type(ex_to_power(b).basis,power)); if (is_ex_exactly_of_type(b,mul)) { term.push_back(expand_mul(ex_to_mul(b),numeric(k[l]))); } else { @@ -644,7 +647,10 @@ ex power::expand_add(const add & a, int n) const GINAC_ASSERT(!is_ex_exactly_of_type(b,add)); GINAC_ASSERT(!is_ex_exactly_of_type(b,power)|| !is_ex_exactly_of_type(ex_to_power(b).exponent,numeric)|| - !ex_to_numeric(ex_to_power(b).exponent).is_pos_integer()); + !ex_to_numeric(ex_to_power(b).exponent).is_pos_integer()|| + !is_ex_exactly_of_type(ex_to_power(b).basis,add)|| + !is_ex_exactly_of_type(ex_to_power(b).basis,mul)|| + !is_ex_exactly_of_type(ex_to_power(b).basis,power)); if (is_ex_exactly_of_type(b,mul)) { term.push_back(expand_mul(ex_to_mul(b),numeric(n-k_cum[m-2]))); } else { -- 2.44.0