X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.cpp;h=160bc378f563550e1b5491ca272704954ca77428;hp=d704cbdd276dac1f9306d71148004b981f4b6e61;hb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1 diff --git a/ginac/idx.cpp b/ginac/idx.cpp index d704cbdd..160bc378 100644 --- a/ginac/idx.cpp +++ b/ginac/idx.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indices. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2002 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,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include -#include #include "idx.h" #include "symbol.h" @@ -29,7 +29,6 @@ #include "print.h" #include "archive.h" #include "utils.h" -#include "debugmsg.h" namespace GiNaC { @@ -38,23 +37,18 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(varidx, idx) GINAC_IMPLEMENT_REGISTERED_CLASS(spinidx, varidx) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// -idx::idx() : inherited(TINFO_idx) -{ - debugmsg("idx default constructor", LOGLEVEL_CONSTRUCT); -} +idx::idx() : inherited(TINFO_idx) {} varidx::varidx() : covariant(false) { - debugmsg("varidx default constructor", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_varidx; } spinidx::spinidx() : dotted(false) { - debugmsg("spinidx default constructor", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_spinidx; } @@ -87,7 +81,6 @@ DEFAULT_DESTROY(spinidx) idx::idx(const ex & v, const ex & d) : inherited(TINFO_idx), value(v), dim(d) { - debugmsg("idx constructor from ex,ex", LOGLEVEL_CONSTRUCT); if (is_dim_numeric()) if (!dim.info(info_flags::posint)) throw(std::invalid_argument("dimension of space must be a positive integer")); @@ -95,13 +88,11 @@ idx::idx(const ex & v, const ex & d) : inherited(TINFO_idx), value(v), dim(d) varidx::varidx(const ex & v, const ex & d, bool cov) : inherited(v, d), covariant(cov) { - debugmsg("varidx constructor from ex,ex,bool", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_varidx; } spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, d, cov), dotted(dot) { - debugmsg("spinidx constructor from ex,ex,bool,bool", LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_spinidx; } @@ -111,20 +102,17 @@ spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, idx::idx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("idx constructor from archive_node", LOGLEVEL_CONSTRUCT); n.find_ex("value", value, sym_lst); n.find_ex("dim", dim, sym_lst); } varidx::varidx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("varidx constructor from archive_node", LOGLEVEL_CONSTRUCT); n.find_bool("covariant", covariant); } spinidx::spinidx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) { - debugmsg("spinidx constructor from archive_node", LOGLEVEL_CONSTRUCT); n.find_bool("dotted", dotted); } @@ -157,8 +145,6 @@ DEFAULT_UNARCHIVE(spinidx) void idx::print(const print_context & c, unsigned level) const { - debugmsg("idx print", LOGLEVEL_PRINT); - if (is_of_type(c, print_tree)) { c.s << std::string(level, ' ') << class_name() @@ -170,7 +156,9 @@ void idx::print(const print_context & c, unsigned level) const } else { - if (!is_of_type(c, print_latex)) + if (is_a(c)) + c.s << "_{"; + else c.s << "."; bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol)); if (need_parens) @@ -178,13 +166,13 @@ void idx::print(const print_context & c, unsigned level) const value.print(c); if (need_parens) c.s << ")"; + if (is_a(c)) + c.s << "}"; } } void varidx::print(const print_context & c, unsigned level) const { - debugmsg("varidx print", LOGLEVEL_PRINT); - if (is_of_type(c, print_tree)) { c.s << std::string(level, ' ') << class_name() @@ -196,8 +184,12 @@ void varidx::print(const print_context & c, unsigned level) const dim.print(c, level + delta_indent); } else { - - if (!is_of_type(c, print_latex)) { + if (is_a(c)) { + if (covariant) + c.s << "_{"; + else + c.s << "^{"; + } else { if (covariant) c.s << "."; else @@ -209,13 +201,13 @@ void varidx::print(const print_context & c, unsigned level) const value.print(c); if (need_parens) c.s << ")"; + if (is_a(c)) + c.s << "}"; } } void spinidx::print(const print_context & c, unsigned level) const { - debugmsg("spinidx print", LOGLEVEL_PRINT); - if (is_of_type(c, print_tree)) { c.s << std::string(level, ' ') << class_name() @@ -230,7 +222,12 @@ void spinidx::print(const print_context & c, unsigned level) const } else { bool is_tex = is_of_type(c, print_latex); - if (!is_tex) { + if (is_tex) { + if (covariant) + c.s << "_{"; + else + c.s << "^{"; + } else { if (covariant) c.s << "."; else @@ -250,6 +247,8 @@ void spinidx::print(const print_context & c, unsigned level) const c.s << ")"; if (is_tex && dotted) c.s << "}"; + if (is_tex) + c.s << "}"; } } @@ -276,7 +275,7 @@ ex & idx::let_op(int i) * must be such that dummy indices lie next to each other. */ int idx::compare_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, idx)); + GINAC_ASSERT(is_a(other)); const idx &o = static_cast(other); int cmpval = value.compare(o.value); @@ -287,7 +286,7 @@ int idx::compare_same_type(const basic & other) const bool idx::match_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, idx)); + GINAC_ASSERT(is_a(other)); const idx &o = static_cast(other); return dim.is_equal(o.dim); @@ -295,7 +294,7 @@ bool idx::match_same_type(const basic & other) const int varidx::compare_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, varidx)); + GINAC_ASSERT(is_a(other)); const varidx &o = static_cast(other); int cmpval = inherited::compare_same_type(other); @@ -310,7 +309,7 @@ int varidx::compare_same_type(const basic & other) const bool varidx::match_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, varidx)); + GINAC_ASSERT(is_a(other)); const varidx &o = static_cast(other); if (covariant != o.covariant) @@ -320,7 +319,7 @@ bool varidx::match_same_type(const basic & other) const int spinidx::compare_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, spinidx)); + GINAC_ASSERT(is_a(other)); const spinidx &o = static_cast(other); // Check dottedness first so dummy indices will end up next to each other @@ -336,7 +335,7 @@ int spinidx::compare_same_type(const basic & other) const bool spinidx::match_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, spinidx)); + GINAC_ASSERT(is_a(other)); const spinidx &o = static_cast(other); if (dotted != o.dotted) @@ -357,7 +356,7 @@ ex idx::subs(const lst & ls, const lst & lr, bool no_pattern) const // First look for index substitutions for (unsigned i=0; i(ls.op(i)))) { // Substitution index->index if (is_ex_of_type(lr.op(i), idx)) @@ -387,7 +386,7 @@ ex idx::subs(const lst & ls, const lst & lr, bool no_pattern) const * @see ex::diff */ ex idx::derivative(const symbol & s) const { - return _ex0(); + return _ex0; } //////////