Finalize 1.7.6 release.

[ginac.git] / ginac / idx.cpp

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index c1412b9de73ff8bcfe5c43e7d679e7c4d3757935..e50fac4062a0e771a8d711962e69203e8f00f9e0 100644 (file)
--- 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-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
@@ -20,10 +20,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
-
 #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 <iostream>
+#include <sstream>
+#include <stdexcept>
 
 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,7 +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.
-       unsigned v = golden_ratio_hash((p_int)tinfo());
+       unsigned v = make_hash_seed(typeid(*this));
        v = rotate_left(v);
        v ^= value.gethash();
 
@@ -367,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;
 }
@@ -375,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
@@ -386,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)
@@ -397,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.
@@ -464,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
@@ -477,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
@@ -485,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
@@ -494,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;
 }
 
 //////////
@@ -504,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
@@ -543,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);