X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fidx.cpp;h=bf103f0ff9593e62d795654e84b7b1d5742a5dd5;hb=99202cc88fdd22315a4110db5ac2864099a90c15;hp=df79607d2f1b5ac16cc2662481e416c257e4dfd2;hpb=591b85b0697370f2f5f25a29a1e94ff831a02c12;p=ginac.git diff --git a/ginac/idx.cpp b/ginac/idx.cpp index df79607d..bf103f0f 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); } @@ -152,14 +140,12 @@ DEFAULT_UNARCHIVE(varidx) DEFAULT_UNARCHIVE(spinidx) ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// void idx::print(const print_context & c, unsigned level) const { - debugmsg("idx print", LOGLEVEL_PRINT); - - 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 @@ -170,22 +156,24 @@ 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)); + bool need_parens = !(is_exactly_a(value) || is_a(value)); if (need_parens) c.s << "("; 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)) { + if (is_a(c)) { c.s << std::string(level, ' ') << class_name() << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec @@ -196,27 +184,28 @@ 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)) + c.s << "{"; + else { if (covariant) c.s << "."; else c.s << "~"; } - bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol)); + bool need_parens = !(is_exactly_a(value) || is_a(value)); if (need_parens) c.s << "("; 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)) { + if (is_a(c)) { c.s << std::string(level, ' ') << class_name() << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec @@ -229,8 +218,13 @@ void spinidx::print(const print_context & c, unsigned level) const } else { - bool is_tex = is_of_type(c, print_latex); - if (!is_tex) { + bool is_tex = is_a(c); + if (is_tex) { + if (covariant) + c.s << "_{"; + else + c.s << "^{"; + } else { if (covariant) c.s << "."; else @@ -242,7 +236,7 @@ void spinidx::print(const print_context & c, unsigned level) const else c.s << "*"; } - bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol)); + bool need_parens = !(is_exactly_a(value) || is_a(value)); if (need_parens) c.s << "("; value.print(c); @@ -250,6 +244,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 +272,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); @@ -285,9 +281,17 @@ int idx::compare_same_type(const basic & other) const return dim.compare(o.dim); } +bool idx::match_same_type(const basic & other) const +{ + GINAC_ASSERT(is_a(other)); + const idx &o = static_cast(other); + + return dim.is_equal(o.dim); +} + 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); @@ -300,9 +304,19 @@ int varidx::compare_same_type(const basic & other) const return 0; } +bool varidx::match_same_type(const basic & other) const +{ + GINAC_ASSERT(is_a(other)); + const varidx &o = static_cast(other); + + if (covariant != o.covariant) + return false; + return inherited::match_same_type(other); +} + 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 @@ -316,34 +330,21 @@ int spinidx::compare_same_type(const basic & other) const return 0; } -bool idx::match(const ex & pattern, lst & repl_lst) const +bool spinidx::match_same_type(const basic & other) const { - if (!is_ex_of_type(pattern, idx)) - return false; - const idx &o = ex_to(pattern); - if (!dim.is_equal(o.dim)) - return false; - return value.match(o.value, repl_lst); -} + GINAC_ASSERT(is_a(other)); + const spinidx &o = static_cast(other); -bool varidx::match(const ex & pattern, lst & repl_lst) const -{ - if (!is_ex_of_type(pattern, varidx)) - return false; - const varidx &o = ex_to(pattern); - if (covariant != o.covariant) + if (dotted != o.dotted) return false; - return inherited::match(pattern, repl_lst); + return inherited::match_same_type(other); } -bool spinidx::match(const ex & pattern, lst & repl_lst) const +/** By default, basic::evalf would evaluate the index value but we don't want + * a.1 to become a.(1.0). */ +ex idx::evalf(int level) const { - if (!is_ex_of_type(pattern, spinidx)) - return false; - const spinidx &o = ex_to(pattern); - if (dotted != o.dotted) - return false; - return inherited::match(pattern, repl_lst); + return *this; } ex idx::subs(const lst & ls, const lst & lr, bool no_pattern) const @@ -352,10 +353,10 @@ 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)) + if (is_a(lr.op(i))) return lr.op(i); // Otherwise substitute value @@ -377,6 +378,14 @@ ex idx::subs(const lst & ls, const lst & lr, bool no_pattern) const return i_copy->setflag(status_flags::dynallocated); } +/** Implementation of ex::diff() for an index always returns 0. + * + * @see ex::diff */ +ex idx::derivative(const symbol & s) const +{ + return _ex0; +} + ////////// // new virtual functions ////////// @@ -386,7 +395,7 @@ bool idx::is_dummy_pair_same_type(const basic & other) const const idx &o = static_cast(other); // Only pure symbols form dummy pairs, "2n+1" doesn't - if (!is_ex_of_type(value, symbol)) + if (!is_a(value)) return false; // Value must be equal, of course @@ -466,7 +475,7 @@ bool is_dummy_pair(const idx & i1, const idx & i2) bool is_dummy_pair(const ex & e1, const ex & e2) { // The expressions must be indices - if (!is_ex_of_type(e1, idx) || !is_ex_of_type(e2, idx)) + if (!is_a(e1) || !is_a(e2)) return false; return is_dummy_pair(ex_to(e1), ex_to(e2));