X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=725506fa6fa5a8e4af653c9c647ff33ad020834e;hp=e0f1ba3e338029ebfe5cd6e4a0a07ed19d55d5a4;hb=526825bcee294cb20e37d8db6d5040ba0f8c428f;hpb=d448856f20cb58f939ddbf636e7f72e3599b1468

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index e0f1ba3e..725506fa 100644
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2009 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,24 +17,27 @@
  *
  *  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 <stdexcept>
-#include <functional>
-#include <algorithm>
-
 #include "symmetry.h"
 #include "lst.h"
 #include "numeric.h" // for factorial()
-#include "print.h"
+#include "operators.h"
 #include "archive.h"
 #include "utils.h"
-#include "debugmsg.h"
+#include "hash_seed.h"
+
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <stdexcept>
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(symmetry, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symmetry, basic,
+  print_func<print_context>(&symmetry::do_print).
+  print_func<print_tree>(&symmetry::do_print_tree))
 
 /*
    Some notes about the structure of a symmetry tree:
@@ -51,41 +54,28 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(symmetry, basic)
 */
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default constructor
 //////////
 
-symmetry::symmetry() : type(none)
+symmetry::symmetry() :  type(none)
 {
-	debugmsg("symmetry default constructor", LOGLEVEL_CONSTRUCT);
-	tinfo_key = TINFO_symmetry;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-void symmetry::copy(const symmetry & other)
-{
-	inherited::copy(other);
-	type = other.type;
-	indices = other.indices;
-	children = other.children;
-}
-
-DEFAULT_DESTROY(symmetry)
-
 //////////
 // other constructors
 //////////
 
-symmetry::symmetry(unsigned i) : type(none)
+symmetry::symmetry(unsigned i) :  type(none)
 {
-	debugmsg("symmetry constructor from unsigned", LOGLEVEL_CONSTRUCT);
 	indices.insert(i);
-	tinfo_key = TINFO_symmetry;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : type(t)
+symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) :  type(t)
 {
-	debugmsg("symmetry constructor from symmetry_type,symmetry &,symmetry &", LOGLEVEL_CONSTRUCT);
 	add(c1); add(c2);
-	tinfo_key = TINFO_symmetry;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
@@ -93,10 +83,9 @@ symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : ty
 //////////
 
 /** Construct object from archive_node. */
-symmetry::symmetry(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+void symmetry::read_archive(const archive_node &n, lst &sym_lst)
 {
-	debugmsg("symmetry ctor from archive_node", LOGLEVEL_CONSTRUCT);
-
+	inherited::read_archive(n, sym_lst);
 	unsigned t;
 	if (!(n.find_unsigned("type", t)))
 		throw (std::runtime_error("unknown symmetry type in archive"));
@@ -123,6 +112,7 @@ symmetry::symmetry(const archive_node &n, const lst &sym_lst) : inherited(n, sym
 		}
 	}
 }
+GINAC_BIND_UNARCHIVER(symmetry);
 
 /** Archive the object. */
 void symmetry::archive(archive_node &n) const
@@ -146,8 +136,6 @@ void symmetry::archive(archive_node &n) const
 	}
 }
 
-DEFAULT_UNARCHIVE(symmetry)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -156,70 +144,124 @@ int symmetry::compare_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_a<symmetry>(other));
 
-	// All symmetry trees are equal. They are not supposed to appear in
-	// ordinary expressions anyway...
+	// For archiving purposes we need to have an ordering of symmetries.
+	const symmetry &othersymm = ex_to<symmetry>(other);
+
+	// Compare type.
+	if (type > othersymm.type)
+		return 1;
+	if (type < othersymm.type)
+		return -1;
+
+	// Compare the index set.
+	size_t this_size = indices.size();
+	size_t that_size = othersymm.indices.size();
+	if (this_size > that_size)
+		return 1;
+	if (this_size < that_size)
+		return -1;
+	typedef std::set<unsigned>::iterator set_it;
+	set_it end = indices.end();
+	for (set_it i=indices.begin(),j=othersymm.indices.begin(); i!=end; ++i,++j) {
+		if(*i < *j)
+			return 1;
+		if(*i > *j)
+			return -1;
+	}
+
+	// Compare the children.
+	if (children.size() > othersymm.children.size())
+		return 1;
+	if (children.size() < othersymm.children.size())
+		return -1;
+	for (size_t i=0; i<children.size(); ++i) {
+		int cmpval = ex_to<symmetry>(children[i])
+			.compare_same_type(ex_to<symmetry>(othersymm.children[i]));
+		if (cmpval)
+			return cmpval;
+	}
+
 	return 0;
 }
 
-void symmetry::print(const print_context & c, unsigned level) const
+unsigned symmetry::calchash() const
 {
-	debugmsg("symmetry print", LOGLEVEL_PRINT);
+	unsigned v = make_hash_seed(typeid(*this));
 
-	if (is_a<print_tree>(c)) {
+	if (type == none) {
+		v = rotate_left(v);
+		if (!indices.empty())
+			v ^= *(indices.begin());
+	} else {
+		for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
+		{
+			v = rotate_left(v);
+			v ^= i->gethash();
+		}
+	}
 
-		c.s << std::string(level, ' ') << class_name()
-		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-		    << ", type=";
+	if (flags & status_flags::evaluated) {
+		setflag(status_flags::hash_calculated);
+		hashvalue = v;
+	}
+
+	return v;
+}
 
+void symmetry::do_print(const print_context & c, unsigned level) const
+{
+	if (children.empty()) {
+		if (indices.size() > 0)
+			c.s << *(indices.begin());
+		else
+			c.s << "none";
+	} else {
 		switch (type) {
-			case none: c.s << "none"; break;
-			case symmetric: c.s << "symm"; break;
-			case antisymmetric: c.s << "anti"; break;
-			case cyclic: c.s << "cycl"; break;
-			default: c.s << "<unknown>"; break;
+			case none: c.s << '!'; break;
+			case symmetric: c.s << '+'; break;
+			case antisymmetric: c.s << '-'; break;
+			case cyclic: c.s << '@'; break;
+			default: c.s << '?'; break;
 		}
-
-		c.s << ", indices=(";
-		if (!indices.empty()) {
-			std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
-			--end;
-			while (i != end)
-				c.s << *i++ << ",";
-			c.s << *i;
+		c.s << '(';
+		size_t num = children.size();
+		for (size_t i=0; i<num; i++) {
+			children[i].print(c);
+			if (i != num - 1)
+				c.s << ",";
 		}
-		c.s << ")\n";
+		c.s << ')';
+	}
+}
 
-		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
-		exvector::const_iterator i = children.begin(), end = children.end();
-		while (i != end) {
-			i->print(c, level + delta_indent);
-			++i;
-		}
+void symmetry::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
+	    << ", type=";
+
+	switch (type) {
+		case none: c.s << "none"; break;
+		case symmetric: c.s << "symm"; break;
+		case antisymmetric: c.s << "anti"; break;
+		case cyclic: c.s << "cycl"; break;
+		default: c.s << "<unknown>"; break;
+	}
 
-	} else {
+	c.s << ", indices=(";
+	if (!indices.empty()) {
+		std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
+		--end;
+		while (i != end)
+			c.s << *i++ << ",";
+		c.s << *i;
+	}
+	c.s << ")\n";
 
-		if (children.empty()) {
-			if (indices.size() > 0)
-				c.s << *(indices.begin());
-			else
-				c.s << "none";
-		} else {
-			switch (type) {
-				case none: c.s << '!'; break;
-				case symmetric: c.s << '+'; break;
-				case antisymmetric: c.s << '-'; break;
-				case cyclic: c.s << '@'; break;
-				default: c.s << '?'; break;
-			}
-			c.s << '(';
-			unsigned num = children.size();
-			for (unsigned i=0; i<num; i++) {
-				children[i].print(c);
-				if (i != num - 1)
-					c.s << ",";
-			}
-			c.s << ')';
-		}
+	exvector::const_iterator i = children.begin(), end = children.end();
+	while (i != end) {
+		i->print(c, level + c.delta_indent);
+		++i;
 	}
 }
 
@@ -227,6 +269,18 @@ void symmetry::print(const print_context & c, unsigned level) const
 // non-virtual functions in this class
 //////////
 
+bool symmetry::has_cyclic() const
+{
+	if (type == cyclic)
+		return true;
+
+	for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
+		if (ex_to<symmetry>(*i).has_cyclic())
+			return true;
+
+	return false;
+}
+
 symmetry &symmetry::add(const symmetry &c)
 {
 	// All children must have the same number of indices
@@ -264,6 +318,72 @@ void symmetry::validate(unsigned n)
 // global functions
 //////////
 
+static const symmetry & index0()
+{
+	static ex s = (new symmetry(0))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index1()
+{
+	static ex s = (new symmetry(1))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index2()
+{
+	static ex s = (new symmetry(2))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index3()
+{
+	static ex s = (new symmetry(3))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & not_symmetric()
+{
+	static ex s = (new symmetry)->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric2()
+{
+	static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric3()
+{
+	static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric4()
+{
+	static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric2()
+{
+	static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric3()
+{
+	static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric4()
+{
+	static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+	return ex_to<symmetry>(s);
+}
+
 class sy_is_less : public std::binary_function<ex, ex, bool> {
 	exvector::iterator v;
 
@@ -312,9 +432,9 @@ public:
 
 int canonicalize(exvector::iterator v, const symmetry &symm)
 {
-	// Less than two indices? Then do nothing
+	// Less than two elements? Then do nothing
 	if (symm.indices.size() < 2)
-		return INT_MAX;
+		return std::numeric_limits<int>::max();
 
 	// Canonicalize children first
 	bool something_changed = false;
@@ -325,7 +445,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
 		int child_sign = canonicalize(v, ex_to<symmetry>(*first));
 		if (child_sign == 0)
 			return 0;
-		if (child_sign != INT_MAX) {
+		if (child_sign != std::numeric_limits<int>::max()) {
 			something_changed = true;
 			sign *= child_sign;
 		}
@@ -342,6 +462,8 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
 		case symmetry::antisymmetric:
 			// Sort the children in ascending order, keeping track of the signum
 			sign *= permutation_sign(first, last, sy_is_less(v), sy_swap(v, something_changed));
+			if (sign == 0)
+				return 0;
 			break;
 		case symmetry::cyclic:
 			// Permute the smallest child to the front
@@ -350,7 +472,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
 		default:
 			break;
 	}
-	return something_changed ? sign : INT_MAX;
+	return something_changed ? sign : std::numeric_limits<int>::max();
 }
 
 
@@ -362,10 +484,8 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
 	if (num < 2)
 		return e;
 
-	// Transform object vector to a list
-	exlist iv_lst;
-	iv_lst.insert(iv_lst.begin(), first, last);
-	lst orig_lst(iv_lst, true);
+	// Transform object vector to a lst (for subs())
+	lst orig_lst(first, last);
 
 	// Create index vectors for permutation
 	unsigned *iv = new unsigned[num], *iv2;
@@ -380,7 +500,7 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
 		lst new_lst;
 		for (unsigned i=0; i<num; i++)
 			new_lst.append(orig_lst.op(iv[i]));
-		ex term = e.subs(orig_lst, new_lst);
+		ex term = e.subs(orig_lst, new_lst, subs_options::no_pattern|subs_options::no_index_renaming);
 		if (asymmetric) {
 			memcpy(iv2, iv, num * sizeof(unsigned));
 			term *= permutation_sign(iv2, iv2 + num);
@@ -411,10 +531,8 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
 	if (num < 2)
 		return e;
 
-	// Transform object vector to a list
-	exlist iv_lst;
-	iv_lst.insert(iv_lst.begin(), first, last);
-	lst orig_lst(iv_lst, true);
+	// Transform object vector to a lst (for subs())
+	lst orig_lst(first, last);
 	lst new_lst = orig_lst;
 
 	// Loop over all cyclic permutations (the first permutation, which is
@@ -423,7 +541,7 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
 	for (unsigned i=0; i<num-1; i++) {
 		ex perm = new_lst.op(0);
 		new_lst.remove_first().append(perm);
-		sum += e.subs(orig_lst, new_lst);
+		sum += e.subs(orig_lst, new_lst, subs_options::no_pattern|subs_options::no_index_renaming);
 	}
 	return sum / num;
 }
@@ -431,20 +549,14 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
 /** Symmetrize expression over a list of objects (symbols, indices). */
 ex ex::symmetrize(const lst & l) const
 {
-	exvector v;
-	v.reserve(l.nops());
-	for (unsigned i=0; i<l.nops(); i++)
-		v.push_back(l.op(i));
+	exvector v(l.begin(), l.end());
 	return symm(*this, v.begin(), v.end(), false);
 }
 
 /** Antisymmetrize expression over a list of objects (symbols, indices). */
 ex ex::antisymmetrize(const lst & l) const
 {
-	exvector v;
-	v.reserve(l.nops());
-	for (unsigned i=0; i<l.nops(); i++)
-		v.push_back(l.op(i));
+	exvector v(l.begin(), l.end());
 	return symm(*this, v.begin(), v.end(), true);
 }
 
@@ -452,10 +564,7 @@ ex ex::antisymmetrize(const lst & l) const
  *  (symbols, indices). */
 ex ex::symmetrize_cyclic(const lst & l) const
 {
-	exvector v;
-	v.reserve(l.nops());
-	for (unsigned i=0; i<l.nops(); i++)
-		v.push_back(l.op(i));
+	exvector v(l.begin(), l.end());
 	return GiNaC::symmetrize_cyclic(*this, v.begin(), v.end());
 }