X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Findexed.cpp;h=18f44571fad8b7ae9c74cc879440ef561feac273;hp=c6a84e31ac70e6346091651bd0eb61f1a70fef5d;hb=a835de8cc61681f66b49f2bd944c0d7ad8157f77;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1 diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp index c6a84e31..18f44571 100644 --- a/ginac/indexed.cpp +++ b/ginac/indexed.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indexed expressions. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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 @@ -20,8 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include +#include #include -#include #include "indexed.h" #include "idx.h" @@ -29,24 +30,23 @@ #include "mul.h" #include "ncmul.h" #include "power.h" +#include "relational.h" #include "symmetry.h" #include "lst.h" #include "print.h" #include "archive.h" #include "utils.h" -#include "debugmsg.h" namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(indexed, exprseq) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// indexed::indexed() : symtree(sy_none()) { - debugmsg("indexed default constructor", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; } @@ -64,63 +64,54 @@ DEFAULT_DESTROY(indexed) indexed::indexed(const ex & b) : inherited(b), symtree(sy_none()) { - debugmsg("indexed constructor from ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const ex & i1) : inherited(b, i1), symtree(sy_none()) { - debugmsg("indexed constructor from ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const ex & i1, const ex & i2) : inherited(b, i1, i2), symtree(sy_none()) { - debugmsg("indexed constructor from ex,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const ex & i1, const ex & i2, const ex & i3) : inherited(b, i1, i2, i3), symtree(sy_none()) { - debugmsg("indexed constructor from ex,ex,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const ex & i1, const ex & i2, const ex & i3, const ex & i4) : inherited(b, i1, i2, i3, i4), symtree(sy_none()) { - debugmsg("indexed constructor from ex,ex,ex,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2) : inherited(b, i1, i2), symtree(symm) { - debugmsg("indexed constructor from ex,symmetry,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3) : inherited(b, i1, i2, i3), symtree(symm) { - debugmsg("indexed constructor from ex,symmetry,ex,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3, const ex & i4) : inherited(b, i1, i2, i3, i4), symtree(symm) { - debugmsg("indexed constructor from ex,symmetry,ex,ex,ex,ex", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; validate(); } indexed::indexed(const ex & b, const exvector & v) : inherited(b), symtree(sy_none()) { - debugmsg("indexed constructor from ex,exvector", LOGLEVEL_CONSTRUCT); seq.insert(seq.end(), v.begin(), v.end()); tinfo_key = TINFO_indexed; validate(); @@ -128,7 +119,6 @@ indexed::indexed(const ex & b, const exvector & v) : inherited(b), symtree(sy_no indexed::indexed(const ex & b, const symmetry & symm, const exvector & v) : inherited(b), symtree(symm) { - debugmsg("indexed constructor from ex,symmetry,exvector", LOGLEVEL_CONSTRUCT); seq.insert(seq.end(), v.begin(), v.end()); tinfo_key = TINFO_indexed; validate(); @@ -136,19 +126,16 @@ indexed::indexed(const ex & b, const symmetry & symm, const exvector & v) : inhe indexed::indexed(const symmetry & symm, const exprseq & es) : inherited(es), symtree(symm) { - debugmsg("indexed constructor from symmetry,exprseq", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; } indexed::indexed(const symmetry & symm, const exvector & v, bool discardable) : inherited(v, discardable), symtree(symm) { - debugmsg("indexed constructor from symmetry,exvector", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; } indexed::indexed(const symmetry & symm, exvector * vp) : inherited(vp), symtree(symm) { - debugmsg("indexed constructor from symmetry,exvector *", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_indexed; } @@ -158,7 +145,6 @@ indexed::indexed(const symmetry & symm, exvector * vp) : inherited(vp), symtree( indexed::indexed(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("indexed constructor from archive_node", LOGLEVEL_CONSTRUCT); if (!n.find_ex("symmetry", symtree, sym_lst)) { // GiNaC versions <= 0.9.0 had an unsigned "symmetry" property unsigned symm = 0; @@ -174,7 +160,7 @@ indexed::indexed(const archive_node &n, const lst &sym_lst) : inherited(n, sym_l symtree = sy_none(); break; } - ex_to_nonconst_symmetry(symtree).validate(seq.size() - 1); + const_cast(ex_to(symtree)).validate(seq.size() - 1); } } @@ -192,10 +178,9 @@ DEFAULT_UNARCHIVE(indexed) void indexed::print(const print_context & c, unsigned level) const { - debugmsg("indexed print", LOGLEVEL_PRINT); GINAC_ASSERT(seq.size() > 0); - if (is_of_type(c, print_tree)) { + if (is_a(c)) { c.s << std::string(level, ' ') << class_name() << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec @@ -207,21 +192,19 @@ void indexed::print(const print_context & c, unsigned level) const } else { - bool is_tex = is_of_type(c, print_latex); + bool is_tex = is_a(c); const ex & base = seq[0]; - bool need_parens = is_ex_exactly_of_type(base, add) || is_ex_exactly_of_type(base, mul) - || is_ex_exactly_of_type(base, ncmul) || is_ex_exactly_of_type(base, power) - || is_ex_of_type(base, indexed); + + if (precedence() <= level) + c.s << (is_tex ? "{(" : "("); if (is_tex) c.s << "{"; - if (need_parens) - c.s << "("; - base.print(c); - if (need_parens) - c.s << ")"; + base.print(c, precedence()); if (is_tex) c.s << "}"; printindices(c, level); + if (precedence() <= level) + c.s << (is_tex ? ")}" : ")"); } } @@ -250,7 +233,7 @@ bool indexed::all_index_values_are(unsigned inf) const int indexed::compare_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, indexed)); + GINAC_ASSERT(is_a(other)); return inherited::compare_same_type(other); } @@ -264,7 +247,7 @@ ex indexed::eval(int level) const // If the base object is 0, the whole object is 0 if (base.is_zero()) - return _ex0(); + return _ex0; // If the base object is a product, pull out the numeric factor if (is_ex_exactly_of_type(base, mul) && is_ex_exactly_of_type(base.op(base.nops() - 1), numeric)) { @@ -277,36 +260,18 @@ ex indexed::eval(int level) const // Canonicalize indices according to the symmetry properties if (seq.size() > 2) { exvector v = seq; - GINAC_ASSERT(is_ex_exactly_of_type(symtree, symmetry)); + GINAC_ASSERT(is_exactly_a(symtree)); int sig = canonicalize(v.begin() + 1, ex_to(symtree)); if (sig != INT_MAX) { // Something has changed while sorting indices, more evaluations later if (sig == 0) - return _ex0(); + return _ex0; return ex(sig) * thisexprseq(v); } } // Let the class of the base object perform additional evaluations - return base.bp->eval_indexed(*this); -} - -int indexed::degree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -int indexed::ldegree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -ex indexed::coeff(const ex & s, int n) const -{ - if (is_equal(*s.bp)) - return n==1 ? _ex1() : _ex0(); - else - return n==0 ? ex(*this) : _ex0(); + return ex_to(base).eval_indexed(*this); } ex indexed::thisexprseq(const exvector & v) const @@ -327,7 +292,7 @@ ex indexed::expand(unsigned options) const // expand_indexed expands (a+b).i -> a.i + b.i const ex & base = seq[0]; - ex sum = _ex0(); + ex sum = _ex0; for (unsigned i=0; i(c)) { // TeX output: group by variance bool first = true; @@ -363,9 +328,10 @@ void indexed::printindices(const print_context & c, unsigned level) const while (it != itend) { bool cur_covariant = (is_ex_of_type(*it, varidx) ? ex_to(*it).is_covariant() : true); - if (first || cur_covariant != covariant) { + if (first || cur_covariant != covariant) { // Variance changed + // The empty {} prevents indices from ending up on top of each other if (!first) - c.s << "}"; + c.s << "}{}"; covariant = cur_covariant; if (covariant) c.s << "_{"; @@ -406,7 +372,7 @@ void indexed::validate(void) const if (!symtree.is_zero()) { if (!is_ex_exactly_of_type(symtree, symmetry)) throw(std::invalid_argument("symmetry of indexed object must be of type symmetry")); - ex_to_nonconst_symmetry(symtree).validate(seq.size() - 1); + const_cast(ex_to(symtree)).validate(seq.size() - 1); } } @@ -415,13 +381,29 @@ void indexed::validate(void) const * @see ex::diff */ ex indexed::derivative(const symbol & s) const { - return _ex0(); + return _ex0; } ////////// // global functions ////////// +struct idx_is_equal_ignore_dim : public std::binary_function { + bool operator() (const ex &lh, const ex &rh) const + { + if (lh.is_equal(rh)) + return true; + else + try { + // Replacing the dimension might cause an error (e.g. with + // index classes that only work in a fixed number of dimensions) + return lh.is_equal(ex_to(rh).replace_dim(ex_to(lh).get_dim())); + } catch (...) { + return false; + } + } +}; + /** Check whether two sorted index vectors are consistent (i.e. equal). */ static bool indices_consistent(const exvector & v1, const exvector & v2) { @@ -429,7 +411,7 @@ static bool indices_consistent(const exvector & v1, const exvector & v2) if (v1.size() != v2.size()) return false; - return equal(v1.begin(), v1.end(), v2.begin(), ex_is_equal()); + return equal(v1.begin(), v1.end(), v2.begin(), idx_is_equal_ignore_dim()); } exvector indexed::get_indices(void) const @@ -526,7 +508,7 @@ exvector power::get_free_indices(void) const /** Rename dummy indices in an expression. * - * @param e Expression to be worked on + * @param e Expression to work on * @param local_dummy_indices The set of dummy indices that appear in the * expression "e" * @param global_dummy_indices The set of dummy indices that have appeared @@ -545,6 +527,7 @@ static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, ex // More local indices than we encountered before, add the new ones // to the global set + int old_global_size = global_size; int remaining = local_size - global_size; exvector::const_iterator it = local_dummy_indices.begin(), itend = local_dummy_indices.end(); while (it != itend && remaining > 0) { @@ -555,28 +538,111 @@ static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, ex } it++; } - } - // Replace index symbols in expression + // If this is the first set of local indices, do nothing + if (old_global_size == 0) + return e; + } GINAC_ASSERT(local_size <= global_size); - bool all_equal = true; - lst local_syms, global_syms; - for (unsigned i=0; i(local_dummy_indices[i]).get_dim().is_equal(ex_to(global_dummy_indices[i]).get_dim())) { - all_equal = false; - local_syms.append(loc_sym); - global_syms.append(glob_sym); + + // Construct lists of index symbols + exlist local_syms, global_syms; + for (unsigned i=0; i(local_uniq), ex_is_less()); + set_difference(global_syms.begin(), global_syms.end(), local_syms.begin(), local_syms.end(), std::back_insert_iterator(global_uniq), ex_is_less()); + + // Replace remaining non-common local index symbols by global ones + if (local_uniq.empty()) + return e; + else { + while (global_uniq.size() > local_uniq.size()) + global_uniq.pop_back(); + return e.subs(lst(local_uniq), lst(global_uniq)); + } +} + +/** Given a set of indices, extract those of class varidx. */ +static void find_variant_indices(const exvector & v, exvector & variant_indices) +{ + exvector::const_iterator it1, itend; + for (it1 = v.begin(), itend = v.end(); it1 != itend; ++it1) { + if (is_exactly_a(*it1)) + variant_indices.push_back(*it1); + } +} + +/** Raise/lower dummy indices in a single indexed objects to canonicalize their + * variance. + * + * @param e Object to work on + * @param variant_dummy_indices The set of indices that might need repositioning (will be changed by this function) + * @param moved_indices The set of indices that have been repositioned (will be changed by this function) + * @return true if 'e' was changed */ +bool reposition_dummy_indices(ex & e, exvector & variant_dummy_indices, exvector & moved_indices) +{ + bool something_changed = false; + + // If a dummy index is encountered for the first time in the + // product, pull it up, otherwise, pull it down + exvector::const_iterator it2, it2start, it2end; + for (it2start = ex_to(e).seq.begin(), it2end = ex_to(e).seq.end(), it2 = it2start + 1; it2 != it2end; ++it2) { + if (!is_exactly_a(*it2)) + continue; + + exvector::iterator vit, vitend; + for (vit = variant_dummy_indices.begin(), vitend = variant_dummy_indices.end(); vit != vitend; ++vit) { + if (it2->op(0).is_equal(vit->op(0))) { + if (ex_to(*it2).is_covariant()) { + e = e.subs(lst( + *it2 == ex_to(*it2).toggle_variance(), + ex_to(*it2).toggle_variance() == *it2 + )); + something_changed = true; + it2 = ex_to(e).seq.begin() + (it2 - it2start); + it2start = ex_to(e).seq.begin(); + it2end = ex_to(e).seq.end(); + } + moved_indices.push_back(*vit); + variant_dummy_indices.erase(vit); + goto next_index; + } + } + + for (vit = moved_indices.begin(), vitend = moved_indices.end(); vit != vitend; ++vit) { + if (it2->op(0).is_equal(vit->op(0))) { + if (ex_to(*it2).is_contravariant()) { + e = e.subs(*it2 == ex_to(*it2).toggle_variance()); + something_changed = true; + it2 = ex_to(e).seq.begin() + (it2 - it2start); + it2start = ex_to(e).seq.begin(); + it2end = ex_to(e).seq.end(); + } + goto next_index; + } } + +next_index: ; } - if (all_equal) - return e; - else - return e.subs(local_syms, global_syms); + + return something_changed; } +/* Ordering that only compares the base expressions of indexed objects. */ +struct ex_base_is_less : public std::binary_function { + bool operator() (const ex &lh, const ex &rh) const + { + return (is_a(lh) ? lh.op(0) : lh).compare(is_a(rh) ? rh.op(0) : rh) < 0; + } +}; + /** Simplify product of indexed expressions (commutative, noncommutative and * simple squares), return list of free indices. */ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp) @@ -591,13 +657,13 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du if (is_ex_exactly_of_type(e, power)) { // We only get called for simple squares, split a^2 -> a*a - GINAC_ASSERT(e.op(1).is_equal(_ex2())); + GINAC_ASSERT(e.op(1).is_equal(_ex2)); v.push_back(e.op(0)); v.push_back(e.op(0)); } else { for (unsigned i=0; i 1 - && ex_to(ex_to(*it1).symtree).has_symmetry() - && ex_to(ex_to(*it2).symtree).has_symmetry()) { - - // Check all pairs of dummy indices - for (unsigned idx1=0; idx1subs(subs_lst, repl_lst); - ex swapped2 = it2->subs(subs_lst, repl_lst); - if (it1->is_equal(swapped1) && it2->is_equal(-swapped2) - || it1->is_equal(-swapped1) && it2->is_equal(swapped2)) { - free_indices.clear(); - return _ex0(); - } - } - } - } - // Try to contract the first one with the second one - contracted = it1->op(0).bp->contract_with(it1, it2, v); + contracted = ex_to(it1->op(0)).contract_with(it1, it2, v); if (!contracted) { // That didn't work; maybe the second object knows how to // contract itself with the first one - contracted = it2->op(0).bp->contract_with(it2, it1, v); + contracted = ex_to(it2->op(0)).contract_with(it2, it1, v); } if (contracted) { contraction_done: @@ -717,8 +760,7 @@ contraction_done: // Find free indices (concatenate them all and call find_free_and_dummy()) // and all dummy indices that appear exvector un, individual_dummy_indices; - it1 = v.begin(); itend = v.end(); - while (it1 != itend) { + for (it1 = v.begin(), itend = v.end(); it1 != itend; ++it1) { exvector free_indices_of_factor; if (is_ex_of_type(*it1, indexed)) { exvector dummy_indices_of_factor; @@ -727,29 +769,122 @@ contraction_done: } else free_indices_of_factor = it1->get_free_indices(); un.insert(un.end(), free_indices_of_factor.begin(), free_indices_of_factor.end()); - it1++; } exvector local_dummy_indices; find_free_and_dummy(un, free_indices, local_dummy_indices); local_dummy_indices.insert(local_dummy_indices.end(), individual_dummy_indices.begin(), individual_dummy_indices.end()); + // Filter out the dummy indices with variance + exvector variant_dummy_indices; + find_variant_indices(local_dummy_indices, variant_dummy_indices); + + // Any indices with variance present at all? + if (!variant_dummy_indices.empty()) { + + // Yes, bring the product into a canonical order that only depends on + // the base expressions of indexed objects + if (!non_commutative) + std::sort(v.begin(), v.end(), ex_base_is_less()); + + exvector moved_indices; + + // Iterate over all indexed objects in the product + for (it1 = v.begin(), itend = v.end(); it1 != itend; ++it1) { + if (!is_ex_of_type(*it1, indexed)) + continue; + + if (reposition_dummy_indices(*it1, variant_dummy_indices, moved_indices)) + something_changed = true; + } + } + ex r; if (something_changed) r = non_commutative ? ex(ncmul(v, true)) : ex(mul(v)); else r = e; + // The result should be symmetric with respect to exchange of dummy + // indices, so if the symmetrization vanishes, the whole expression is + // zero. This detects things like eps.i.j.k * p.j * p.k = 0. + if (local_dummy_indices.size() >= 2) { + lst dummy_syms; + for (int i=0; iscalar_mul_indexed(r.op(0), ex_to(r.op(1))); + return ex_to(r.op(0).op(0)).scalar_mul_indexed(r.op(0), ex_to(r.op(1))); else return r; } +/** This structure stores the original and symmetrized versions of terms + * obtained during the simplification of sums. */ +class terminfo { +public: + terminfo(const ex & orig_, const ex & symm_) : orig(orig_), symm(symm_) {} + + ex orig; /**< original term */ + ex symm; /**< symmtrized term */ +}; + +class terminfo_is_less { +public: + bool operator() (const terminfo & ti1, const terminfo & ti2) const + { + return (ti1.symm.compare(ti2.symm) < 0); + } +}; + +/** This structure stores the individual symmetrized terms obtained during + * the simplification of sums. */ +class symminfo { +public: + symminfo() : num(0) {} + + symminfo(const ex & symmterm_, const ex & orig_, unsigned num_) : orig(orig_), num(num_) + { + if (is_exactly_a(symmterm_) && is_exactly_a(symmterm_.op(symmterm_.nops()-1))) { + coeff = symmterm_.op(symmterm_.nops()-1); + symmterm = symmterm_ / coeff; + } else { + coeff = 1; + symmterm = symmterm_; + } + } + + ex symmterm; /**< symmetrized term */ + ex coeff; /**< coefficient of symmetrized term */ + ex orig; /**< original term */ + unsigned num; /**< how many symmetrized terms resulted from the original term */ +}; + +class symminfo_is_less_by_symmterm { +public: + bool operator() (const symminfo & si1, const symminfo & si2) const + { + return (si1.symmterm.compare(si2.symmterm) < 0); + } +}; + +class symminfo_is_less_by_orig { +public: + bool operator() (const symminfo & si1, const symminfo & si2) const + { + return (si1.orig.compare(si2.orig) < 0); + } +}; + /** Simplify indexed expression, return list of free indices. */ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp) { @@ -757,11 +892,27 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi ex e_expanded = e.expand(); // Simplification of single indexed object: just find the free indices - // and perform dummy index renaming + // and perform dummy index renaming/repositioning if (is_ex_of_type(e_expanded, indexed)) { + + // Find the dummy indices const indexed &i = ex_to(e_expanded); exvector local_dummy_indices; find_free_and_dummy(i.seq.begin() + 1, i.seq.end(), free_indices, local_dummy_indices); + + // Filter out the dummy indices with variance + exvector variant_dummy_indices; + find_variant_indices(local_dummy_indices, variant_dummy_indices); + + // Any indices with variance present at all? + if (!variant_dummy_indices.empty()) { + + // Yes, reposition them + exvector moved_indices; + reposition_dummy_indices(e_expanded, variant_dummy_indices, moved_indices); + } + + // Rename the dummy indices return rename_dummy_indices(e_expanded, dummy_indices, local_dummy_indices); } @@ -769,7 +920,7 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi // free indices in each term if (is_ex_exactly_of_type(e_expanded, add)) { bool first = true; - ex sum = _ex0(); + ex sum; free_indices.clear(); for (unsigned i=0; iadd_indexed(sum, term); + sum = ex_to(sum.op(0)).add_indexed(sum, term); else sum += term; } } } - return sum; + // If the sum turns out to be zero, we are finished + if (sum.is_zero()) { + free_indices.clear(); + return sum; + } + + // More than one term and more than one dummy index? + int num_terms_orig = (is_exactly_a(sum) ? sum.nops() : 1); + if (num_terms_orig < 2 || dummy_indices.size() < 2) + return sum; + + // Yes, construct list of all dummy index symbols + lst dummy_syms; + for (int i=0; i terms; + for (unsigned i=0; i terms_pass2; + for (std::vector::const_iterator i=terms.begin(); i!=terms.end(); ) { + unsigned num = 1; + std::vector::const_iterator j = i + 1; + while (j != terms.end() && j->symm == i->symm) { + num++; + j++; + } + terms_pass2.push_back(terminfo(i->orig * num, i->symm * num)); + i = j; + } + + // If there is only one term left, we are finished + if (terms_pass2.size() == 1) + return terms_pass2[0].orig; + + // Chop the symmetrized terms into subterms + std::vector sy; + for (std::vector::const_iterator i=terms_pass2.begin(); i!=terms_pass2.end(); ++i) { + if (is_exactly_a(i->symm)) { + unsigned num = i->symm.nops(); + for (unsigned j=0; jsymm.op(j), i->orig, num)); + } else + sy.push_back(symminfo(i->symm, i->orig, 1)); + } + + // Sort by symmetrized subterms + std::sort(sy.begin(), sy.end(), symminfo_is_less_by_symmterm()); + + // Combine equal symmetrized subterms + std::vector sy_pass2; + exvector result; + for (std::vector::const_iterator i=sy.begin(); i!=sy.end(); ) { + + // Combine equal terms + std::vector::const_iterator j = i + 1; + if (j != sy.end() && j->symmterm == i->symmterm) { + + // More than one term, collect the coefficients + ex coeff = i->coeff; + while (j != sy.end() && j->symmterm == i->symmterm) { + coeff += j->coeff; + j++; + } + + // Add combined term to result + if (!coeff.is_zero()) + result.push_back(coeff * i->symmterm); + + } else { + + // Single term, store for second pass + sy_pass2.push_back(*i); + } + + i = j; + } + + // Were there any remaining terms that didn't get combined? + if (sy_pass2.size() > 0) { + + // Yes, sort by their original terms + std::sort(sy_pass2.begin(), sy_pass2.end(), symminfo_is_less_by_orig()); + + for (std::vector::const_iterator i=sy_pass2.begin(); i!=sy_pass2.end(); ) { + + // How many symmetrized terms of this original term are left? + unsigned num = 1; + std::vector::const_iterator j = i + 1; + while (j != sy_pass2.end() && j->orig == i->orig) { + num++; + j++; + } + + if (num == i->num) { + + // All terms left, then add the original term to the result + result.push_back(i->orig); + + } else { + + // Some terms were combined with others, add up the remaining symmetrized terms + std::vector::const_iterator k; + for (k=i; k!=j; k++) + result.push_back(k->coeff * k->symmterm); + } + + i = j; + } + } + + // Add all resulting terms + ex sum_symm = (new add(result))->setflag(status_flags::dynallocated); + if (sum_symm.is_zero()) + free_indices.clear(); + return sum_symm; } // Simplification of products if (is_ex_exactly_of_type(e_expanded, mul) || is_ex_exactly_of_type(e_expanded, ncmul) - || (is_ex_exactly_of_type(e_expanded, power) && is_ex_of_type(e_expanded.op(0), indexed) && e_expanded.op(1).is_equal(_ex2()))) + || (is_ex_exactly_of_type(e_expanded, power) && is_ex_of_type(e_expanded.op(0), indexed) && e_expanded.op(1).is_equal(_ex2))) return simplify_indexed_product(e_expanded, free_indices, dummy_indices, sp); // Cannot do anything