X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.cpp;h=cefcfb1d840a5b1434f2d7580b5d6dab70f8de65;hp=c95c07c72fc87ef01655d157ef256e21a587bf78;hb=05f749ac2abb672f8e0a1cef938ea1e83e1255dc;hpb=23acc666fcef311fd97092aee7f8c55e80395351 diff --git a/ginac/idx.cpp b/ginac/idx.cpp index c95c07c7..cefcfb1d 100644 --- a/ginac/idx.cpp +++ b/ginac/idx.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indices. */ /* - * GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2010 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,13 +17,9 @@ * * 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 -#include -#include - #include "idx.h" #include "symbol.h" #include "lst.h" @@ -31,12 +27,18 @@ #include "operators.h" #include "archive.h" #include "utils.h" +#include "hash_seed.h" + +#include +#include +#include namespace GiNaC { 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, @@ -53,23 +55,21 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx, // 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)) @@ -78,33 +78,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 { @@ -125,10 +129,6 @@ 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 ////////// @@ -161,6 +161,16 @@ void idx::do_print_latex(const print_latex & c, unsigned level) const 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); + c.s << "]"; +} + void idx::do_print_tree(const print_tree & c, unsigned level) const { c.s << std::string(level, ' ') << class_name() << " @" << this @@ -223,8 +233,11 @@ void spinidx::do_print_tree(const print_tree & c, unsigned level) const 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); } @@ -338,7 +351,7 @@ unsigned idx::calchash() const // 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. - unsigned v = golden_ratio_hash(tinfo()); + unsigned v = make_hash_seed(typeid(*this)); v = rotate_left(v); v ^= value.gethash(); @@ -365,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 @@ -415,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 @@ -490,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 @@ -548,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;