X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.cpp;h=e50fac4062a0e771a8d711962e69203e8f00f9e0;hp=be9d6b41d91b5e2ad328c3a5f7ec492b9d361549;hb=05d274b894f2f84217d308bf4d4f2202b9627c63;hpb=b4be7b0f30fbb6178cf4ee83e1b3952e084bd8ca diff --git a/ginac/idx.cpp b/ginac/idx.cpp index be9d6b41..e50fac40 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-2019 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,17 +27,23 @@ #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, print_func(&varidx::do_print). - // print_latex inherited from idx + print_func(&varidx::do_print_latex). print_func(&varidx::do_print_tree)) GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx, @@ -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,9 +161,19 @@ 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() + 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); @@ -181,7 +191,7 @@ void varidx::do_print(const print_context & c, unsigned level) const void varidx::do_print_tree(const print_tree & c, unsigned level) const { - c.s << std::string(level, ' ') << class_name() + c.s << std::string(level, ' ') << class_name() << " @" << this << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec << (covariant ? ", covariant" : ", contravariant") << std::endl; @@ -212,7 +222,7 @@ void spinidx::do_print_latex(const print_latex & c, unsigned level) const void spinidx::do_print_tree(const print_tree & c, unsigned level) const { - c.s << std::string(level, ' ') << class_name() + c.s << std::string(level, ' ') << class_name() << " @" << this << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec << (covariant ? ", covariant" : ", contravariant") << (dotted ? ", dotted" : ", undotted") @@ -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); } @@ -242,11 +255,15 @@ 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->clearflag(status_flags::hash_calculated); + copy->value = mapped_value; + return *copy; + } } /** Returns order relation between two indices of the same type. The order @@ -325,11 +342,17 @@ bool spinidx::match_same_type(const basic & other) const unsigned idx::calchash() const { - unsigned v = golden_ratio_hash(tinfo()); + // 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. + unsigned v = make_hash_seed(typeid(*this)); v = rotate_left(v); v ^= value.gethash(); - v = rotate_left(v); - v ^= dim.gethash(); // Store calculated hash value only if object is already evaluated if (flags & status_flags::evaluated) { @@ -342,7 +365,7 @@ unsigned idx::calchash() 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 +ex idx::evalf() const { return *this; } @@ -350,18 +373,18 @@ ex idx::evalf(int level) const ex idx::subs(const exmap & m, unsigned options) const { // First look for index substitutions - exmap::const_iterator it = m.find(*this); + auto it = m.find(*this); 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 idx *i_copy = duplicate(); i_copy->value = it->second; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } // None, substitute objects in value (not in dimension) @@ -372,7 +395,7 @@ ex idx::subs(const exmap & m, unsigned options) const idx *i_copy = duplicate(); i_copy->value = subsed_value; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } /** Implementation of ex::diff() for an index always returns 0. @@ -404,7 +427,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 @@ -439,7 +462,7 @@ ex idx::replace_dim(const ex & new_dim) const idx *i_copy = duplicate(); i_copy->dim = new_dim; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } ex idx::minimal_dim(const idx & other) const @@ -452,7 +475,7 @@ ex varidx::toggle_variance() const varidx *i_copy = duplicate(); i_copy->covariant = !i_copy->covariant; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } ex spinidx::toggle_dot() const @@ -460,7 +483,7 @@ ex spinidx::toggle_dot() const spinidx *i_copy = duplicate(); i_copy->dotted = !i_copy->dotted; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } ex spinidx::toggle_variance_dot() const @@ -469,7 +492,7 @@ ex spinidx::toggle_variance_dot() const i_copy->covariant = !i_copy->covariant; i_copy->dotted = !i_copy->dotted; i_copy->clearflag(status_flags::hash_calculated); - return i_copy->setflag(status_flags::dynallocated); + return *i_copy; } ////////// @@ -479,7 +502,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 @@ -518,7 +541,7 @@ void find_free_and_dummy(exvector::const_iterator it, exvector::const_iterator i // Find dummy pairs and free indices it = v.begin(); itend = v.end(); - exvector::const_iterator last = it++; + auto last = it++; while (it != itend) { if (is_dummy_pair(*it, *last)) { out_dummy.push_back(*last); @@ -537,9 +560,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;