From 0a647d0cef0d6417d5afe7cd1cf0619a0b843e0f Mon Sep 17 00:00:00 2001 From: Christian Bauer Date: Thu, 18 Dec 2003 18:52:57 +0000 Subject: [PATCH] synced to HEAD (faster mul::expand()) --- ginac/mul.cpp | 71 +++++++++++++++++++++++++++++++-------------------- ginac/mul.h | 1 + 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/ginac/mul.cpp b/ginac/mul.cpp index 4af3bb3e..55394f8c 100644 --- a/ginac/mul.cpp +++ b/ginac/mul.cpp @@ -828,6 +828,20 @@ bool mul::can_make_flat(const expair & p) const return ex_to(p.coeff).is_equal(_num1); } +bool mul::can_be_further_expanded(const ex & e) +{ + if (is_exactly_a(e)) { + for (epvector::const_iterator cit = ex_to(e).seq.begin(); cit != ex_to(e).seq.end(); ++cit) { + if (is_exactly_a(cit->rest) && cit->coeff.info(info_flags::posint)) + return true; + } + } else if (is_exactly_a(e)) { + if (is_exactly_a(e.op(0)) && e.op(1).info(info_flags::posint)) + return true; + } + return false; +} + ex mul::expand(unsigned options) const { // First, expand the children @@ -837,18 +851,15 @@ ex mul::expand(unsigned options) const // Now, look for all the factors that are sums and multiply each one out // with the next one that is found while collecting the factors which are // not sums - int number_of_adds = 0; ex last_expanded = _ex1; + bool need_reexpand = false; epvector non_adds; non_adds.reserve(expanded_seq.size()); - bool non_adds_has_sums = false; // Look for sums or powers of sums in the non_adds (we need this later) - epvector::const_iterator cit = expanded_seq.begin(), last = expanded_seq.end(); - while (cit != last) { + for (epvector::const_iterator cit = expanded_seq.begin(); cit != expanded_seq.end(); ++cit) { if (is_exactly_a(cit->rest) && (cit->coeff.is_equal(_ex1))) { - ++number_of_adds; if (is_exactly_a(last_expanded)) { // Expand a product of two sums, aggressive version. @@ -866,6 +877,7 @@ ex mul::expand(unsigned options) const const epvector::const_iterator add2end = add2.seq.end(); epvector distrseq; distrseq.reserve(add1.seq.size()+add2.seq.size()); + // Multiply add2 with the overall coefficient of add1 and append it to distrseq: if (!add1.overall_coeff.is_zero()) { if (add1.overall_coeff.is_equal(_ex1)) @@ -874,6 +886,7 @@ ex mul::expand(unsigned options) const for (epvector::const_iterator i=add2begin; i!=add2end; ++i) distrseq.push_back(expair(i->rest, ex_to(i->coeff).mul_dyn(ex_to(add1.overall_coeff)))); } + // Multiply add1 with the overall coefficient of add2 and append it to distrseq: if (!add2.overall_coeff.is_zero()) { if (add2.overall_coeff.is_equal(_ex1)) @@ -882,8 +895,10 @@ ex mul::expand(unsigned options) const for (epvector::const_iterator i=add1begin; i!=add1end; ++i) distrseq.push_back(expair(i->rest, ex_to(i->coeff).mul_dyn(ex_to(add2.overall_coeff)))); } + // Compute the new overall coefficient and put it together: ex tmp_accu = (new add(distrseq, add1.overall_coeff*add2.overall_coeff))->setflag(status_flags::dynallocated); + // Multiply explicitly all non-numeric terms of add1 and add2: for (epvector::const_iterator i1=add1begin; i1!=add1end; ++i1) { // We really have to combine terms here in order to compactify @@ -893,7 +908,7 @@ ex mul::expand(unsigned options) const for (epvector::const_iterator i2=add2begin; i2!=add2end; ++i2) { // Don't push_back expairs which might have a rest that evaluates to a numeric, // since that would violate an invariant of expairseq: - const ex rest = ex((new mul(i1->rest, i2->rest))->setflag(status_flags::dynallocated)).expand(); + const ex rest = (new mul(i1->rest, i2->rest))->setflag(status_flags::dynallocated); if (is_exactly_a(rest)) oc += ex_to(rest).mul(ex_to(i1->coeff).mul(ex_to(i2->coeff))); else @@ -904,15 +919,14 @@ ex mul::expand(unsigned options) const last_expanded = tmp_accu; } else { - non_adds.push_back(split_ex_to_pair(last_expanded)); + if (!last_expanded.is_equal(_ex1)) + non_adds.push_back(split_ex_to_pair(last_expanded)); last_expanded = cit->rest; } + } else { - if (is_exactly_a(cit->rest)) - non_adds_has_sums = true; non_adds.push_back(*cit); } - ++cit; } if (expanded_seqp) delete expanded_seqp; @@ -920,33 +934,36 @@ ex mul::expand(unsigned options) const // Now the only remaining thing to do is to multiply the factors which // were not sums into the "last_expanded" sum if (is_exactly_a(last_expanded)) { - const add & finaladd = ex_to(last_expanded); - - size_t n = finaladd.nops(); + size_t n = last_expanded.nops(); exvector distrseq; distrseq.reserve(n); for (size_t i=0; i((new mul(factors, overall_coeff))->setflag(status_flags::dynallocated)); - - // The new term may have sums in it if e.g. a sqrt() of a sum in - // the non_adds meets a sqrt() of a sum in the factor from - // last_expanded. In this case we should re-expand the term. - if (non_adds_has_sums || is_exactly_a(new_factor.rest)) - distrseq.push_back(ex(term).expand()); - else - distrseq.push_back(term.setflag(options == 0 ? status_flags::expanded : 0)); + factors.push_back(split_ex_to_pair(last_expanded.op(i))); + ex term = (new mul(factors, overall_coeff))->setflag(status_flags::dynallocated); + if (can_be_further_expanded(term)) + distrseq.push_back(term.expand()); + else { + if (options == 0) + ex_to(term).setflag(status_flags::expanded); + distrseq.push_back(term); + } } + return ((new add(distrseq))-> setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0))); } + non_adds.push_back(split_ex_to_pair(last_expanded)); - return (new mul(non_adds, overall_coeff))-> - setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0)); + ex result = (new mul(non_adds, overall_coeff))->setflag(status_flags::dynallocated); + if (can_be_further_expanded(result)) { + return result.expand(); + } else { + if (options == 0) + ex_to(result).setflag(status_flags::expanded); + return result; + } } diff --git a/ginac/mul.h b/ginac/mul.h index 26fb764b..dbe521f1 100644 --- a/ginac/mul.h +++ b/ginac/mul.h @@ -87,6 +87,7 @@ protected: public: ex algebraic_subs_mul(const lst & ls, const lst & lr, unsigned options) const; protected: + static bool can_be_further_expanded(const ex & e); epvector * expandchildren(unsigned options) const; }; -- 2.44.0