X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fidx.cpp;h=601c339b9fb745e203073426fb0742bf1164e7c0;hb=cd22e73d44e3320898f62a0accdbbe005b33d3e5;hp=265c107557eba27135ab31fdad2c36bdddd29650;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;p=ginac.git

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 265c1075..601c339b 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-2016 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,49 +17,59 @@
  *
  *  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 <iostream>
-#include <sstream>
-#include <stdexcept>
-
 #include "idx.h"
 #include "symbol.h"
 #include "lst.h"
 #include "relational.h"
 #include "operators.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
+#include "hash_seed.h"
+
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
 
 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<print_context>(&idx::do_print).
+  print_func<print_latex>(&idx::do_print_latex).
+  print_func<print_csrc>(&idx::do_print_csrc).
+  print_func<print_tree>(&idx::do_print_tree))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(varidx, idx,
+  print_func<print_context>(&varidx::do_print).
+  print_func<print_latex>(&varidx::do_print_latex).
+  print_func<print_tree>(&varidx::do_print_tree))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinidx, varidx,
+  print_func<print_context>(&spinidx::do_print).
+  print_func<print_latex>(&spinidx::do_print_latex).
+  print_func<print_tree>(&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 +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
 {
@@ -115,134 +129,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<print_tree>(c)) {
+void idx::print_index(const print_context & c, unsigned level) const
+{
+	bool need_parens = !(is_exactly_a<numeric>(value) || is_a<symbol>(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<const print_tree &>(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<print_latex>(c))
-			c.s << "{";
-		else
-			c.s << ".";
-		bool need_parens = !(is_exactly_a<numeric>(value) || is_a<symbol>(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<numeric>(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<print_latex>(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<print_tree>(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<const print_tree &>(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<print_latex>(c))
-			c.s << "{";
-		else {
-			if (covariant)
-				c.s << ".";
-			else
-				c.s << "~";
-		}
-		bool need_parens = !(is_exactly_a<numeric>(value) || is_a<symbol>(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<print_latex>(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<print_tree>(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<const print_tree &>(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<print_latex>(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<numeric>(value) || is_a<symbol>(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 +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
@@ -341,43 +340,62 @@ 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.
+	unsigned v = make_hash_seed(typeid(*this));
+	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
+ex idx::evalf() const
 {
 	return *this;
 }
 
-ex idx::subs(const lst & ls, const lst & lr, unsigned options) const
+ex idx::subs(const exmap & m, unsigned options) const
 {
-	GINAC_ASSERT(ls.nops() == lr.nops());
-
 	// First look for index substitutions
-	lst::const_iterator its, itr;
-	for (its = ls.begin(), itr = lr.begin(); its != ls.end(); ++its, ++itr) {
-		if (is_equal(ex_to<basic>(*its))) {
-
-			// Substitution index->index
-			if (is_a<idx>(*itr))
-				return *itr;
-
-			// Otherwise substitute value
-			idx *i_copy = duplicate();
-			i_copy->value = *itr;
-			i_copy->clearflag(status_flags::hash_calculated);
-			return i_copy->setflag(status_flags::dynallocated);
-		}
+	exmap::const_iterator it = m.find(*this);
+	if (it != m.end()) {
+
+		// Substitution index->index
+		if (is_a<idx>(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;
 	}
 
 	// None, substitute objects in value (not in dimension)
-	const ex &subsed_value = value.subs(ls, lr, options);
+	const ex &subsed_value = value.subs(m, options);
 	if (are_ex_trivially_equal(value, subsed_value))
 		return *this;
 
 	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.
@@ -409,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<numeric>(dim) && is_a<symbol>(o.dim)) || (is_a<symbol>(dim) && is_exactly_a<numeric>(o.dim)));
+	return is_exactly_a<numeric>(dim) || is_exactly_a<numeric>(o.dim);
 }
 
 bool varidx::is_dummy_pair_same_type(const basic & other) const
@@ -444,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
@@ -457,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
@@ -465,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
@@ -474,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;
 }
 
 //////////
@@ -484,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
@@ -542,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<numeric>(dim1) && is_a<symbol>(dim2)))
+	if (dim1.is_equal(dim2) || dim1 < dim2 || (is_exactly_a<numeric>(dim1) && !is_a<numeric>(dim2)))
 		return dim1;
-	else if (dim1 > dim2 || (is_a<symbol>(dim1) && is_exactly_a<numeric>(dim2)))
+	else if (dim1 > dim2 || (!is_a<numeric>(dim1) && is_exactly_a<numeric>(dim2)))
 		return dim2;
 	else {
 		std::ostringstream s;