X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Findexed.cpp;h=50e3b01b60b83cbd6b77f5d8cfc0175e19c302dc;hp=e32f4c7a103f047cc09a5332665b7ef0e6c91ef8;hb=eefedc70f63222beca918a3df89cabac700df1eb;hpb=e93f20fd0deb9b45d2163cbec247e5181f021a28 diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp index e32f4c7a..50e3b01b 100644 --- a/ginac/indexed.cpp +++ b/ginac/indexed.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indexed expressions. */ /* - * GiNaC Copyright (C) 1999-2002 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 @@ -21,6 +21,7 @@ */ #include +#include #include #include "indexed.h" @@ -31,17 +32,20 @@ #include "power.h" #include "relational.h" #include "symmetry.h" +#include "operators.h" #include "lst.h" -#include "print.h" #include "archive.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(indexed, exprseq) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(indexed, exprseq, + print_func(&indexed::do_print). + print_func(&indexed::do_print_latex). + print_func(&indexed::do_print_tree)) ////////// -// default ctor, dtor, copy ctor, assignment operator and helpers +// default constructor ////////// indexed::indexed() : symtree(sy_none()) @@ -49,14 +53,6 @@ indexed::indexed() : symtree(sy_none()) tinfo_key = TINFO_indexed; } -void indexed::copy(const indexed & other) -{ - inherited::copy(other); - symtree = other.symtree; -} - -DEFAULT_DESTROY(indexed) - ////////// // other constructors ////////// @@ -133,7 +129,7 @@ indexed::indexed(const symmetry & symm, const exvector & v, bool discardable) : tinfo_key = TINFO_indexed; } -indexed::indexed(const symmetry & symm, exvector * vp) : inherited(vp), symtree(symm) +indexed::indexed(const symmetry & symm, std::auto_ptr vp) : inherited(vp), symtree(symm) { tinfo_key = TINFO_indexed; } @@ -142,7 +138,7 @@ indexed::indexed(const symmetry & symm, exvector * vp) : inherited(vp), symtree( // archiving ////////// -indexed::indexed(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) +indexed::indexed(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) { if (!n.find_ex("symmetry", symtree, sym_lst)) { // GiNaC versions <= 0.9.0 had an unsigned "symmetry" property @@ -175,38 +171,80 @@ DEFAULT_UNARCHIVE(indexed) // functions overriding virtual functions from base classes ////////// -void indexed::print(const print_context & c, unsigned level) const +void indexed::printindices(const print_context & c, unsigned level) const { - GINAC_ASSERT(seq.size() > 0); - - if (is_a(c)) { + if (seq.size() > 1) { - c.s << std::string(level, ' ') << class_name() - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << ", " << seq.size()-1 << " indices" - << ", symmetry=" << symtree << std::endl; - unsigned delta_indent = static_cast(c).delta_indent; - seq[0].print(c, level + delta_indent); - printindices(c, level + delta_indent); + exvector::const_iterator it=seq.begin() + 1, itend = seq.end(); - } else { + if (is_a(c)) { - bool is_tex = is_a(c); - const ex & base = seq[0]; + // TeX output: group by variance + bool first = true; + bool covariant = true; - if (precedence() <= level) - c.s << (is_tex ? "{(" : "("); - if (is_tex) - c.s << "{"; - base.print(c, precedence()); - if (is_tex) + while (it != itend) { + bool cur_covariant = (is_a(*it) ? ex_to(*it).is_covariant() : true); + if (first || cur_covariant != covariant) { // Variance changed + // The empty {} prevents indices from ending up on top of each other + if (!first) + c.s << "}{}"; + covariant = cur_covariant; + if (covariant) + c.s << "_{"; + else + c.s << "^{"; + } + it->print(c, level); + c.s << " "; + first = false; + it++; + } c.s << "}"; - printindices(c, level); - if (precedence() <= level) - c.s << (is_tex ? ")}" : ")"); + + } else { + + // Ordinary output + while (it != itend) { + it->print(c, level); + it++; + } + } } } +void indexed::print_indexed(const print_context & c, const char *openbrace, const char *closebrace, unsigned level) const +{ + if (precedence() <= level) + c.s << openbrace << '('; + c.s << openbrace; + seq[0].print(c, precedence()); + c.s << closebrace; + printindices(c, level); + if (precedence() <= level) + c.s << ')' << closebrace; +} + +void indexed::do_print(const print_context & c, unsigned level) const +{ + print_indexed(c, "", "", level); +} + +void indexed::do_print_latex(const print_latex & c, unsigned level) const +{ + print_indexed(c, "{", "}", level); +} + +void indexed::do_print_tree(const print_tree & c, unsigned level) const +{ + c.s << std::string(level, ' ') << class_name() << " @" << this + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << ", " << seq.size()-1 << " indices" + << ", symmetry=" << symtree << std::endl; + seq[0].print(c, level + c.delta_indent); + printindices(c, level + c.delta_indent); +} + bool indexed::info(unsigned inf) const { if (inf == info_flags::indexed) return true; @@ -249,11 +287,11 @@ ex indexed::eval(int level) const 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)) { + if (is_exactly_a(base) && is_exactly_a(base.op(base.nops() - 1))) { exvector v(seq); ex f = ex_to(base.op(base.nops() - 1)); v[0] = seq[0] / f; - return f * thisexprseq(v); + return f * thiscontainer(v); } // Canonicalize indices according to the symmetry properties @@ -265,7 +303,7 @@ ex indexed::eval(int level) const // Something has changed while sorting indices, more evaluations later if (sig == 0) return _ex0; - return ex(sig) * thisexprseq(v); + return ex(sig) * thiscontainer(v); } } @@ -273,12 +311,12 @@ ex indexed::eval(int level) const return ex_to(base).eval_indexed(*this); } -ex indexed::thisexprseq(const exvector & v) const +ex indexed::thiscontainer(const exvector & v) const { return indexed(ex_to(symtree), v); } -ex indexed::thisexprseq(exvector * vp) const +ex indexed::thiscontainer(std::auto_ptr vp) const { return indexed(ex_to(symtree), vp); } @@ -287,15 +325,15 @@ ex indexed::expand(unsigned options) const { GINAC_ASSERT(seq.size() > 0); - if ((options & expand_options::expand_indexed) && is_ex_exactly_of_type(seq[0], add)) { + if ((options & expand_options::expand_indexed) && is_exactly_a(seq[0])) { // expand_indexed expands (a+b).i -> a.i + b.i const ex & base = seq[0]; ex sum = _ex0; - for (unsigned i=0; i 1) { - - exvector::const_iterator it=seq.begin() + 1, itend = seq.end(); - - if (is_a(c)) { - - // TeX output: group by variance - bool first = true; - bool covariant = true; - - while (it != itend) { - bool cur_covariant = (is_ex_of_type(*it, varidx) ? ex_to(*it).is_covariant() : true); - if (first || cur_covariant != covariant) { // Variance changed - // The empty {} prevents indices from ending up on top of each other - if (!first) - c.s << "}{}"; - covariant = cur_covariant; - if (covariant) - c.s << "_{"; - else - c.s << "^{"; - } - it->print(c, level); - c.s << " "; - first = false; - it++; - } - c.s << "}"; - - } else { - - // Ordinary output - while (it != itend) { - it->print(c, level); - it++; - } - } - } -} - /** Check whether all indices are of class idx and validate the symmetry * tree. This function is used internally to make sure that all constructed * indexed objects really carry indices and not some other classes. */ -void indexed::validate(void) const +void indexed::validate() const { GINAC_ASSERT(seq.size() > 0); exvector::const_iterator it = seq.begin() + 1, itend = seq.end(); while (it != itend) { - if (!is_ex_of_type(*it, idx)) + if (!is_a(*it)) throw(std::invalid_argument("indices of indexed object must be of type idx")); it++; } if (!symtree.is_zero()) { - if (!is_ex_exactly_of_type(symtree, symmetry)) + if (!is_exactly_a(symtree)) throw(std::invalid_argument("symmetry of indexed object must be of type symmetry")); const_cast(ex_to(symtree)).validate(seq.size() - 1); } @@ -387,6 +383,22 @@ ex indexed::derivative(const symbol & s) const // 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) { @@ -394,16 +406,16 @@ 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 +exvector indexed::get_indices() const { GINAC_ASSERT(seq.size() >= 1); return exvector(seq.begin() + 1, seq.end()); } -exvector indexed::get_dummy_indices(void) const +exvector indexed::get_dummy_indices() const { exvector free_indices, dummy_indices; find_free_and_dummy(seq.begin() + 1, seq.end(), free_indices, dummy_indices); @@ -431,17 +443,17 @@ bool indexed::has_dummy_index_for(const ex & i) const return false; } -exvector indexed::get_free_indices(void) const +exvector indexed::get_free_indices() const { exvector free_indices, dummy_indices; find_free_and_dummy(seq.begin() + 1, seq.end(), free_indices, dummy_indices); return free_indices; } -exvector add::get_free_indices(void) const +exvector add::get_free_indices() const { exvector free_indices; - for (unsigned i=0; i 0) { - if (find_if(global_dummy_indices.begin(), global_dummy_indices.end(), bind2nd(ex_is_equal(), *it)) == global_dummy_indices.end()) { + if (find_if(global_dummy_indices.begin(), global_dummy_indices.end(), bind2nd(op0_is_equal(), *it)) == global_dummy_indices.end()) { global_dummy_indices.push_back(*it); global_size++; remaining--; @@ -528,19 +540,21 @@ static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, ex } GINAC_ASSERT(local_size <= global_size); - // 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()); + exvector local_uniq, global_uniq; + set_difference(local_syms.begin(), local_syms.end(), global_syms.begin(), global_syms.end(), std::back_insert_iterator(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()) @@ -548,7 +562,7 @@ static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, ex else { while (global_uniq.size() > local_uniq.size()) global_uniq.pop_back(); - return e.subs(lst(local_uniq), lst(global_uniq)); + return e.subs(lst(local_uniq.begin(), local_uniq.end()), lst(global_uniq.begin(), global_uniq.end()), subs_options::no_pattern); } } @@ -587,7 +601,7 @@ bool reposition_dummy_indices(ex & e, exvector & variant_dummy_indices, exvector e = e.subs(lst( *it2 == ex_to(*it2).toggle_variance(), ex_to(*it2).toggle_variance() == *it2 - )); + ), subs_options::no_pattern); something_changed = true; it2 = ex_to(e).seq.begin() + (it2 - it2start); it2start = ex_to(e).seq.begin(); @@ -602,7 +616,7 @@ bool reposition_dummy_indices(ex & e, exvector & variant_dummy_indices, exvector 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()); + e = e.subs(*it2 == ex_to(*it2).toggle_variance(), subs_options::no_pattern); something_changed = true; it2 = ex_to(e).seq.begin() + (it2 - it2start); it2start = ex_to(e).seq.begin(); @@ -632,27 +646,27 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du { // Remember whether the product was commutative or noncommutative // (because we chop it into factors and need to reassemble later) - bool non_commutative = is_ex_exactly_of_type(e, ncmul); + bool non_commutative = is_exactly_a(e); // Collect factors in an exvector, store squares twice exvector v; v.reserve(e.nops() * 2); - if (is_ex_exactly_of_type(e, power)) { + if (is_exactly_a(e)) { // We only get called for simple squares, split a^2 -> a*a 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(f) && f.op(1).is_equal(_ex2)) { v.push_back(f.op(0)); v.push_back(f.op(0)); - } else if (is_ex_exactly_of_type(f, ncmul)) { + } else if (is_exactly_a(f)) { // Noncommutative factor found, split it as well non_commutative = true; // everything becomes noncommutative, ncmul will sort out the commutative factors later - for (unsigned j=0; j(*it1)) continue; bool first_noncommutative = (it1->return_type() != return_types::commutative); @@ -679,7 +693,7 @@ try_again: exvector::iterator it2; for (it2 = it1 + 1; it2 != itend; it2++) { - if (!is_ex_of_type(*it2, indexed)) + if (!is_a(*it2)) continue; bool second_noncommutative = (it2->return_type() != return_types::commutative); @@ -693,15 +707,32 @@ try_again: // Check whether the two factors share dummy indices exvector free, dummy; find_free_and_dummy(un, free, dummy); - unsigned num_dummies = dummy.size(); + size_t num_dummies = dummy.size(); if (num_dummies == 0) continue; // At least one dummy index, is it a defined scalar product? bool contracted = false; if (free.empty()) { - if (sp.is_defined(*it1, *it2)) { - *it1 = sp.evaluate(*it1, *it2); + + // Find minimal dimension of all indices of both factors + exvector::const_iterator dit = ex_to(*it1).seq.begin() + 1, ditend = ex_to(*it1).seq.end(); + ex dim = ex_to(*dit).get_dim(); + ++dit; + for (; dit != ditend; ++dit) { + dim = minimal_dim(dim, ex_to(*dit).get_dim()); + } + dit = ex_to(*it2).seq.begin() + 1; + ditend = ex_to(*it2).seq.end(); + for (; dit != ditend; ++dit) { + dim = minimal_dim(dim, ex_to(*dit).get_dim()); + } + + // User-defined scalar product? + if (sp.is_defined(*it1, *it2, dim)) { + + // Yes, substitute it + *it1 = sp.evaluate(*it1, *it2, dim); *it2 = _ex1; goto contraction_done; } @@ -718,14 +749,14 @@ try_again: if (contracted) { contraction_done: if (first_noncommutative || second_noncommutative - || is_ex_exactly_of_type(*it1, add) || is_ex_exactly_of_type(*it2, add) - || is_ex_exactly_of_type(*it1, mul) || is_ex_exactly_of_type(*it2, mul) - || is_ex_exactly_of_type(*it1, ncmul) || is_ex_exactly_of_type(*it2, ncmul)) { + || is_exactly_a(*it1) || is_exactly_a(*it2) + || is_exactly_a(*it1) || is_exactly_a(*it2) + || is_exactly_a(*it1) || is_exactly_a(*it2)) { // One of the factors became a sum or product: // re-expand expression and run again // Non-commutative products are always re-expanded to give - // simplify_ncmul() the chance to re-order and canonicalize + // eval_ncmul() the chance to re-order and canonicalize // the product ex r = (non_commutative ? ex(ncmul(v, true)) : ex(mul(v))); return simplify_indexed(r, free_indices, dummy_indices, sp); @@ -745,7 +776,7 @@ contraction_done: exvector un, individual_dummy_indices; for (it1 = v.begin(), itend = v.end(); it1 != itend; ++it1) { exvector free_indices_of_factor; - if (is_ex_of_type(*it1, indexed)) { + if (is_a(*it1)) { exvector dummy_indices_of_factor; find_free_and_dummy(ex_to(*it1).seq.begin() + 1, ex_to(*it1).seq.end(), free_indices_of_factor, dummy_indices_of_factor); individual_dummy_indices.insert(individual_dummy_indices.end(), dummy_indices_of_factor.begin(), dummy_indices_of_factor.end()); @@ -773,7 +804,7 @@ contraction_done: // 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)) + if (!is_a(*it1)) continue; if (reposition_dummy_indices(*it1, variant_dummy_indices, moved_indices)) @@ -791,10 +822,11 @@ contraction_done: // 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; iop(0)); + if (symmetrize(r, dummy_syms).is_zero()) { free_indices.clear(); return _ex0; } @@ -804,8 +836,8 @@ contraction_done: r = rename_dummy_indices(r, dummy_indices, local_dummy_indices); // Product of indexed object with a scalar? - if (is_ex_exactly_of_type(r, mul) && r.nops() == 2 - && is_ex_exactly_of_type(r.op(1), numeric) && is_ex_of_type(r.op(0), indexed)) + if (is_exactly_a(r) && r.nops() == 2 + && is_exactly_a(r.op(1)) && is_a(r.op(0))) return ex_to(r.op(0).op(0)).scalar_mul_indexed(r.op(0), ex_to(r.op(1))); else return r; @@ -813,20 +845,31 @@ contraction_done: /** This structure stores the original and symmetrized versions of terms * obtained during the simplification of sums. */ -class symminfo { +class terminfo { public: - symminfo() {} - ~symminfo() {} + terminfo(const ex & orig_, const ex & symm_) : orig(orig_), symm(symm_) {} + + ex orig; /**< original term */ + ex symm; /**< symmtrized term */ +}; - symminfo(const ex & symmterm_, const ex & orig_) +class terminfo_is_less { +public: + bool operator() (const terminfo & ti1, const terminfo & ti2) const { - if (is_a(orig_) && is_a(orig_.op(orig_.nops()-1))) { - ex tmp = orig_.op(orig_.nops()-1); - orig = orig_ / tmp; - } else - orig = orig_; + 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) {} - if (is_a(symmterm_) && is_a(symmterm_.op(symmterm_.nops()-1))) { + symminfo(const ex & symmterm_, const ex & orig_, size_t 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 { @@ -835,41 +878,25 @@ public: } } - symminfo(const symminfo & other) - { - symmterm = other.symmterm; - coeff = other.coeff; - orig = other.orig; - } + ex symmterm; /**< symmetrized term */ + ex coeff; /**< coefficient of symmetrized term */ + ex orig; /**< original term */ + size_t num; /**< how many symmetrized terms resulted from the original term */ +}; - const symminfo & operator=(const symminfo & other) +class symminfo_is_less_by_symmterm { +public: + bool operator() (const symminfo & si1, const symminfo & si2) const { - if (this != &other) { - symmterm = other.symmterm; - coeff = other.coeff; - orig = other.orig; - } - return *this; + return (si1.symmterm.compare(si2.symmterm) < 0); } - - ex symmterm; - ex coeff; - ex orig; }; -class symminfo_is_less { +class symminfo_is_less_by_orig { public: - bool operator() (const symminfo & si1, const symminfo & si2) + bool operator() (const symminfo & si1, const symminfo & si2) const { - int comp = si1.symmterm.compare(si2.symmterm); - if (comp < 0) return true; - if (comp > 0) return false; - comp = si1.orig.compare(si2.orig); - if (comp < 0) return true; - if (comp > 0) return false; - comp = si1.coeff.compare(si2.coeff); - if (comp < 0) return true; - return false; + return (si1.orig.compare(si2.orig) < 0); } }; @@ -881,7 +908,7 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi // Simplification of single indexed object: just find the free indices // and perform dummy index renaming/repositioning - if (is_ex_of_type(e_expanded, indexed)) { + if (is_a(e_expanded)) { // Find the dummy indices const indexed &i = ex_to(e_expanded); @@ -906,12 +933,12 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi // Simplification of sum = sum of simplifications, check consistency of // free indices in each term - if (is_ex_exactly_of_type(e_expanded, add)) { + if (is_exactly_a(e_expanded)) { bool first = true; - ex sum = _ex0; + ex sum; free_indices.clear(); - for (unsigned i=0; i(sum) && is_a(term)) sum = ex_to(sum.op(0)).add_indexed(sum, term); else sum += term; @@ -936,51 +967,135 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi return sum; } - // Symmetrizing over the dummy indices may cancel terms - int num_terms_orig = (is_a(sum) ? sum.nops() : 1); - if (num_terms_orig > 1 && dummy_indices.size() >= 2) { - - // Construct list of all dummy index symbols - lst dummy_syms; - for (int i=0; i v; - for (int i=0; i(sum_symm)) - for (int j=0; j(sum) ? sum.nops() : 1); + if (num_terms_orig < 2 || dummy_indices.size() < 2) + return sum; + + // Yes, construct vector of all dummy index symbols + exvector dummy_syms; + dummy_syms.reserve(dummy_indices.size()); + for (exvector::const_iterator it = dummy_indices.begin(); it != dummy_indices.end(); ++it) + dummy_syms.push_back(it->op(0)); + + // Chop the sum into terms and symmetrize each one over the dummy + // indices + std::vector terms; + for (size_t i=0; i terms_pass2; + for (std::vector::const_iterator i=terms.begin(); i!=terms.end(); ) { + size_t 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)) { + size_t num = i->symm.nops(); + for (size_t 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); } - // Now add up all the unsymmetrized versions of the terms that - // did not cancel out in the symmetrization - exvector result; - std::sort(v.begin(), v.end(), symminfo_is_less()); - for (std::vector::iterator i=v.begin(); i!=v.end(); ) { - std::vector::iterator j = i; - for (j++; j!=v.end() && i->symmterm == j->symmterm; j++) ; - for (std::vector::iterator k=i; k!=j; k++) - result.push_back((k->coeff)*(i->orig)); + 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? + size_t 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; } - ex sum_symm = (new add(result))->setflag(status_flags::dynallocated); - if (sum_symm.is_zero()) - free_indices.clear(); - return sum_symm; } - return sum; + // 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))) + if (is_exactly_a(e_expanded) + || is_exactly_a(e_expanded) + || (is_exactly_a(e_expanded) && is_a(e_expanded.op(0)) && e_expanded.op(1).is_equal(_ex2))) return simplify_indexed_product(e_expanded, free_indices, dummy_indices, sp); // Cannot do anything @@ -993,7 +1108,7 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi * the free indices in sums are consistent. * * @return simplified expression */ -ex ex::simplify_indexed(void) const +ex ex::simplify_indexed() const { exvector free_indices, dummy_indices; scalar_products sp; @@ -1014,19 +1129,19 @@ ex ex::simplify_indexed(const scalar_products & sp) const } /** Symmetrize expression over its free indices. */ -ex ex::symmetrize(void) const +ex ex::symmetrize() const { return GiNaC::symmetrize(*this, get_free_indices()); } /** Antisymmetrize expression over its free indices. */ -ex ex::antisymmetrize(void) const +ex ex::antisymmetrize() const { return GiNaC::antisymmetrize(*this, get_free_indices()); } /** Symmetrize expression by cyclic permutation over its free indices. */ -ex ex::symmetrize_cyclic(void) const +ex ex::symmetrize_cyclic() const { return GiNaC::symmetrize_cyclic(*this, get_free_indices()); } @@ -1035,65 +1150,101 @@ ex ex::symmetrize_cyclic(void) const // helper classes ////////// +spmapkey::spmapkey(const ex & v1_, const ex & v2_, const ex & dim_) : dim(dim_) +{ + // If indexed, extract base objects + ex s1 = is_a(v1_) ? v1_.op(0) : v1_; + ex s2 = is_a(v2_) ? v2_.op(0) : v2_; + + // Enforce canonical order in pair + if (s1.compare(s2) > 0) { + v1 = s2; + v2 = s1; + } else { + v1 = s1; + v2 = s2; + } +} + +bool spmapkey::operator==(const spmapkey &other) const +{ + if (!v1.is_equal(other.v1)) + return false; + if (!v2.is_equal(other.v2)) + return false; + if (is_a(dim) || is_a(other.dim)) + return true; + else + return dim.is_equal(other.dim); +} + +bool spmapkey::operator<(const spmapkey &other) const +{ + int cmp = v1.compare(other.v1); + if (cmp) + return cmp < 0; + cmp = v2.compare(other.v2); + if (cmp) + return cmp < 0; + + // Objects are equal, now check dimensions + if (is_a(dim) || is_a(other.dim)) + return false; + else + return dim.compare(other.dim) < 0; +} + +void spmapkey::debugprint() const +{ + std::cerr << "(" << v1 << "," << v2 << "," << dim << ")"; +} + void scalar_products::add(const ex & v1, const ex & v2, const ex & sp) { - spm[make_key(v1, v2)] = sp; + spm[spmapkey(v1, v2)] = sp; } -void scalar_products::add_vectors(const lst & l) +void scalar_products::add(const ex & v1, const ex & v2, const ex & dim, const ex & sp) +{ + spm[spmapkey(v1, v2, dim)] = sp; +} + +void scalar_products::add_vectors(const lst & l, const ex & dim) { // Add all possible pairs of products - unsigned num = l.nops(); - for (unsigned i=0; isecond; + return spm.find(spmapkey(v1, v2, dim))->second; } -void scalar_products::debugprint(void) const +void scalar_products::debugprint() const { std::cerr << "map size=" << spm.size() << std::endl; spmap::const_iterator i = spm.begin(), end = spm.end(); while (i != end) { const spmapkey & k = i->first; - std::cerr << "item key=(" << k.first << "," << k.second; - std::cerr << "), value=" << i->second << std::endl; + std::cerr << "item key="; + k.debugprint(); + std::cerr << ", value=" << i->second << std::endl; ++i; } } -/** Make key from object pair. */ -spmapkey scalar_products::make_key(const ex & v1, const ex & v2) -{ - // If indexed, extract base objects - ex s1 = is_ex_of_type(v1, indexed) ? v1.op(0) : v1; - ex s2 = is_ex_of_type(v2, indexed) ? v2.op(0) : v2; - - // Enforce canonical order in pair - if (s1.compare(s2) > 0) - return spmapkey(s2, s1); - else - return spmapkey(s1, s2); -} - } // namespace GiNaC