X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.cpp;h=9a91e03dc45d5fa0957fd4954e678d58597c1ccb;hp=cc5f52c3fef153a30596efb2980bc8f012ab81f4;hb=2b0ad5c381dc081cc4066b0c5f939f5169ad9ab3;hpb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d diff --git a/ginac/idx.cpp b/ginac/idx.cpp index cc5f52c3..9a91e03d 100644 --- a/ginac/idx.cpp +++ b/ginac/idx.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indices. */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2008 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 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -29,37 +29,46 @@ #include "lst.h" #include "relational.h" #include "operators.h" -#include "print.h" #include "archive.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(idx, basic) -GINAC_IMPLEMENT_REGISTERED_CLASS(varidx, idx) -GINAC_IMPLEMENT_REGISTERED_CLASS(spinidx, varidx) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(idx, basic, + print_func(&idx::do_print). + print_func(&idx::do_print_latex). + print_func(&idx::do_print_csrc). + print_func(&idx::do_print_tree)) + +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(varidx, idx, + print_func(&varidx::do_print). + print_func(&varidx::do_print_latex). + print_func(&varidx::do_print_tree)) + +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx, + print_func(&spinidx::do_print). + print_func(&spinidx::do_print_latex). + print_func(&spinidx::do_print_tree)) ////////// // default constructor ////////// -idx::idx() : inherited(TINFO_idx) {} +idx::idx() {} varidx::varidx() : covariant(false) { - tinfo_key = TINFO_varidx; } spinidx::spinidx() : dotted(false) { - tinfo_key = TINFO_spinidx; } ////////// // other constructors ////////// -idx::idx(const ex & v, const ex & d) : inherited(TINFO_idx), value(v), dim(d) +idx::idx(const ex & v, const ex & d) : value(v), dim(d) { if (is_dim_numeric()) if (!dim.info(info_flags::posint)) @@ -68,33 +77,37 @@ 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) { - tinfo_key = TINFO_varidx; } spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, d, cov), dotted(dot) { - tinfo_key = TINFO_spinidx; } ////////// // archiving ////////// -idx::idx(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) +void idx::read_archive(const archive_node& n, lst& sym_lst) { + inherited::read_archive(n, sym_lst); n.find_ex("value", value, sym_lst); n.find_ex("dim", dim, sym_lst); } +GINAC_BIND_UNARCHIVER(idx); -varidx::varidx(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) +void varidx::read_archive(const archive_node& n, lst& sym_lst) { + inherited::read_archive(n, sym_lst); n.find_bool("covariant", covariant); } +GINAC_BIND_UNARCHIVER(varidx); -spinidx::spinidx(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) +void spinidx::read_archive(const archive_node& n, lst& sym_lst) { + inherited::read_archive(n, sym_lst); n.find_bool("dotted", dotted); } +GINAC_BIND_UNARCHIVER(spinidx); void idx::archive(archive_node &n) const { @@ -115,134 +128,115 @@ void spinidx::archive(archive_node &n) const n.add_bool("dotted", dotted); } -DEFAULT_UNARCHIVE(idx) -DEFAULT_UNARCHIVE(varidx) -DEFAULT_UNARCHIVE(spinidx) - ////////// // functions overriding virtual functions from base classes ////////// -void idx::print(const print_context & c, unsigned level) const -{ - if (is_a(c)) { +void idx::print_index(const print_context & c, unsigned level) const +{ + bool need_parens = !(is_exactly_a(value) || is_a(value)); + if (need_parens) + c.s << "("; + value.print(c); + if (need_parens) + c.s << ")"; + if (c.options & print_options::print_index_dimensions) { + c.s << "["; + dim.print(c); + c.s << "]"; + } +} - c.s << std::string(level, ' ') << class_name() - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << std::endl; - unsigned delta_indent = static_cast(c).delta_indent; - value.print(c, level + delta_indent); - dim.print(c, level + delta_indent); +void idx::do_print(const print_context & c, unsigned level) const +{ + c.s << "."; + print_index(c, level); +} - } else { +void idx::do_print_latex(const print_latex & c, unsigned level) const +{ + c.s << "{"; + print_index(c, level); + c.s << "}"; +} - if (is_a(c)) - c.s << "{"; - else - c.s << "."; - bool need_parens = !(is_exactly_a(value) || is_a(value)); - if (need_parens) - c.s << "("; +void idx::do_print_csrc(const print_csrc & c, unsigned level) const +{ + c.s << "["; + if (value.info(info_flags::integer)) + c.s << ex_to(value).to_int(); + else value.print(c); - if (need_parens) - c.s << ")"; - if (c.options & print_options::print_index_dimensions) { - c.s << "["; - dim.print(c); - c.s << "]"; - } - if (is_a(c)) - c.s << "}"; - } + c.s << "]"; } -void varidx::print(const print_context & c, unsigned level) const +void idx::do_print_tree(const print_tree & c, unsigned level) const { - if (is_a(c)) { - - c.s << std::string(level, ' ') << class_name() - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << (covariant ? ", covariant" : ", contravariant") - << std::endl; - unsigned delta_indent = static_cast(c).delta_indent; - value.print(c, level + delta_indent); - dim.print(c, level + delta_indent); + c.s << std::string(level, ' ') << class_name() << " @" << this + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << std::endl; + value.print(c, level + c.delta_indent); + dim.print(c, level + c.delta_indent); +} - } else { - if (is_a(c)) - c.s << "{"; - else { - if (covariant) - c.s << "."; - else - c.s << "~"; - } - bool need_parens = !(is_exactly_a(value) || is_a(value)); - if (need_parens) - c.s << "("; - value.print(c); - if (need_parens) - c.s << ")"; - if (c.options & print_options::print_index_dimensions) { - c.s << "["; - dim.print(c); - c.s << "]"; - } - if (is_a(c)) - c.s << "}"; - } +void varidx::do_print(const print_context & c, unsigned level) const +{ + if (covariant) + c.s << "."; + else + c.s << "~"; + print_index(c, level); } -void spinidx::print(const print_context & c, unsigned level) const +void varidx::do_print_tree(const print_tree & c, unsigned level) const { - if (is_a(c)) { + c.s << std::string(level, ' ') << class_name() << " @" << this + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << (covariant ? ", covariant" : ", contravariant") + << std::endl; + value.print(c, level + c.delta_indent); + dim.print(c, level + c.delta_indent); +} - c.s << std::string(level, ' ') << class_name() - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << (covariant ? ", covariant" : ", contravariant") - << (dotted ? ", dotted" : ", undotted") - << std::endl; - unsigned delta_indent = static_cast(c).delta_indent; - value.print(c, level + delta_indent); - dim.print(c, level + delta_indent); +void spinidx::do_print(const print_context & c, unsigned level) const +{ + if (covariant) + c.s << "."; + else + c.s << "~"; + if (dotted) + c.s << "*"; + print_index(c, level); +} - } else { +void spinidx::do_print_latex(const print_latex & c, unsigned level) const +{ + if (dotted) + c.s << "\\dot{"; + else + c.s << "{"; + print_index(c, level); + c.s << "}"; +} - bool is_tex = is_a(c); - if (is_tex) { - if (covariant) - c.s << "_{"; - else - c.s << "^{"; - } else { - if (covariant) - c.s << "."; - else - c.s << "~"; - } - if (dotted) { - if (is_tex) - c.s << "\\dot{"; - else - c.s << "*"; - } - 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_tex && dotted) - c.s << "}"; - if (is_tex) - c.s << "}"; - } +void spinidx::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 + << (covariant ? ", covariant" : ", contravariant") + << (dotted ? ", dotted" : ", undotted") + << std::endl; + value.print(c, level + c.delta_indent); + dim.print(c, level + c.delta_indent); } bool idx::info(unsigned inf) const { - if (inf == info_flags::idx) - return true; + switch(inf) { + case info_flags::idx: + case info_flags::has_indices: + return true; + } return inherited::info(inf); } @@ -260,11 +254,16 @@ ex idx::op(size_t i) const ex idx::map(map_function & f) const { - idx *copy = duplicate(); - copy->setflag(status_flags::dynallocated); - copy->clearflag(status_flags::hash_calculated); - copy->value = f(value); - return *copy; + const ex &mapped_value = f(value); + if (are_ex_trivially_equal(value, mapped_value)) + return *this; + else { + idx *copy = duplicate(); + copy->setflag(status_flags::dynallocated); + copy->clearflag(status_flags::hash_calculated); + copy->value = mapped_value; + return *copy; + } } /** Returns order relation between two indices of the same type. The order @@ -341,6 +340,30 @@ bool spinidx::match_same_type(const basic & other) const return inherited::match_same_type(other); } +unsigned idx::calchash() const +{ + // NOTE: The code in simplify_indexed() assumes that canonically + // ordered sequences of indices have the two members of dummy index + // pairs lying next to each other. The hash values for indices must + // be devised accordingly. The easiest (only?) way to guarantee the + // desired ordering is to make indices with the same value have equal + // hash keys. That is, the hash values must not depend on the index + // dimensions or other attributes (variance etc.). + // The compare_same_type() methods will take care of the rest. + const void* this_tinfo = (const void*)(typeid(*this).name()); + unsigned v = golden_ratio_hash((p_int)this_tinfo); + v = rotate_left(v); + v ^= value.gethash(); + + // Store calculated hash value only if object is already evaluated + if (flags & status_flags::evaluated) { + setflag(status_flags::hash_calculated); + hashvalue = v; + } + + return v; +} + /** 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 @@ -355,7 +378,7 @@ ex idx::subs(const exmap & m, unsigned options) const if (it != m.end()) { // Substitution index->index - if (is_a(it->second)) + if (is_a(it->second) || (options & subs_options::really_subs_idx)) return it->second; // Otherwise substitute value @@ -405,7 +428,7 @@ bool idx::is_dummy_pair_same_type(const basic & other) const if (dim.is_equal(o.dim)) return true; - return (dim < o.dim || dim > o.dim || (is_exactly_a(dim) && is_a(o.dim)) || (is_a(dim) && is_exactly_a(o.dim))); + return is_exactly_a(dim) || is_exactly_a(o.dim); } bool varidx::is_dummy_pair_same_type(const basic & other) const @@ -480,7 +503,7 @@ ex spinidx::toggle_variance_dot() const bool is_dummy_pair(const idx & i1, const idx & i2) { // The indices must be of exactly the same type - if (i1.tinfo() != i2.tinfo()) + if (typeid(i1) != typeid(i2)) return false; // Same type, let the indices decide whether they are paired @@ -538,9 +561,9 @@ void find_free_and_dummy(exvector::const_iterator it, exvector::const_iterator i ex minimal_dim(const ex & dim1, const ex & dim2) { - if (dim1.is_equal(dim2) || dim1 < dim2 || (is_exactly_a(dim1) && is_a(dim2))) + if (dim1.is_equal(dim2) || dim1 < dim2 || (is_exactly_a(dim1) && !is_a(dim2))) return dim1; - else if (dim1 > dim2 || (is_a(dim1) && is_exactly_a(dim2))) + else if (dim1 > dim2 || (!is_a(dim1) && is_exactly_a(dim2))) return dim2; else { std::ostringstream s;