X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Findexed.cpp;h=3fad73f8eb22ae2e533f8b889ac247dafbba5a2e;hb=c4c269f1a22affca5b243cfe160527d574e9ddcf;hp=c899e13cd7f237580b11ae8becb5bb9474b7645c;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;p=ginac.git diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp index c899e13c..3fad73f8 100644 --- a/ginac/indexed.cpp +++ b/ginac/indexed.cpp @@ -34,13 +34,15 @@ #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 constructor @@ -169,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() + << 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; @@ -307,48 +351,6 @@ ex indexed::expand(unsigned options) const // non-virtual functions in this class ////////// -void indexed::printindices(const print_context & c, unsigned level) const -{ - if (seq.size() > 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_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 << "}"; - - } 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. */ @@ -560,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.begin(), local_uniq.end()), lst(global_uniq.begin(), global_uniq.end())); + return e.subs(lst(local_uniq.begin(), local_uniq.end()), lst(global_uniq.begin(), global_uniq.end()), subs_options::no_pattern); } } @@ -599,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(); @@ -614,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();