X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fidx.cpp;h=c539974d1e8c0f435b806a4116c8e6f597aef693;hb=74bc832973cda4204e349396c9f4f7d056f16366;hp=174f95f0f311af7e096bba61402d0083016c7b0e;hpb=b573b0146341709649f373e0fc5c0d440877ebaf;p=ginac.git diff --git a/ginac/idx.cpp b/ginac/idx.cpp index 174f95f0..c539974d 100644 --- a/ginac/idx.cpp +++ b/ginac/idx.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's indices. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2020 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,10 +20,6 @@ * 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,6 +27,11 @@ #include "operators.h" #include "archive.h" #include "utils.h" +#include "hash_seed.h" + +#include +#include +#include namespace GiNaC { @@ -54,23 +55,21 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx, // default constructor ////////// -idx::idx() : inherited(&idx::tinfo_static) {} +idx::idx() {} varidx::varidx() : covariant(false) { - tinfo_key = &varidx::tinfo_static; } spinidx::spinidx() : dotted(false) { - tinfo_key = &spinidx::tinfo_static; } ////////// // other constructors ////////// -idx::idx(const ex & v, const ex & d) : inherited(&idx::tinfo_static), 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)) @@ -79,33 +78,37 @@ idx::idx(const ex & v, const ex & d) : inherited(&idx::tinfo_static), value(v), varidx::varidx(const ex & v, const ex & d, bool cov) : inherited(v, d), covariant(cov) { - tinfo_key = &varidx::tinfo_static; } spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, d, cov), dotted(dot) { - tinfo_key = &spinidx::tinfo_static; } ////////// // 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 { @@ -126,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 ////////// @@ -261,7 +260,6 @@ ex idx::map(map_function & f) const return *this; else { idx *copy = duplicate(); - copy->setflag(status_flags::dynallocated); copy->clearflag(status_flags::hash_calculated); copy->value = mapped_value; return *copy; @@ -352,8 +350,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. - const void* this_tinfo = (const void*)(typeid(*this).name()); - unsigned v = golden_ratio_hash((p_int)this_tinfo); + unsigned v = make_hash_seed(typeid(*this)); v = rotate_left(v); v ^= value.gethash(); @@ -368,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; } @@ -376,7 +373,7 @@ 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 @@ -387,7 +384,7 @@ ex idx::subs(const exmap & m, unsigned options) const 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) @@ -398,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. @@ -465,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 @@ -478,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 @@ -486,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 @@ -495,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; } ////////// @@ -544,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);