X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=6bd3fe4bba7160f78b6372d06ab81ade13e1c3e8;hp=6cf5aaeac223a109f6280c8044bbd7cc68142748;hb=f9880838cc42de5dfbedcbc181eaedf6c07bfc75;hpb=13896261ee985f23e5b5648532e70f0cce704ede

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 6cf5aaea..6bd3fe4b 100644
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
@@ -17,19 +17,22 @@
  *
  *  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 <stdexcept>
-#include <functional>
-
 #include "symmetry.h"
 #include "lst.h"
+#include "add.h"
 #include "numeric.h" // for factorial()
 #include "operators.h"
 #include "archive.h"
 #include "utils.h"
+#include "hash_seed.h"
+
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <stdexcept>
 
 namespace GiNaC {
 
@@ -55,25 +58,25 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symmetry, basic,
 // default constructor
 //////////
 
-symmetry::symmetry() : type(none)
+symmetry::symmetry() :  type(none)
 {
-	tinfo_key = TINFO_symmetry;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
 // other constructors
 //////////
 
-symmetry::symmetry(unsigned i) : type(none)
+symmetry::symmetry(unsigned i) :  type(none)
 {
 	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)
 {
 	add(c1); add(c2);
-	tinfo_key = TINFO_symmetry;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
@@ -81,8 +84,9 @@ symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : ty
 //////////
 
 /** Construct object from archive_node. */
-symmetry::symmetry(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void symmetry::read_archive(const archive_node &n, lst &sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	unsigned t;
 	if (!(n.find_unsigned("type", t)))
 		throw (std::runtime_error("unknown symmetry type in archive"));
@@ -109,6 +113,7 @@ symmetry::symmetry(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 		}
 	}
 }
+GINAC_BIND_UNARCHIVER(symmetry);
 
 /** Archive the object. */
 void symmetry::archive(archive_node &n) const
@@ -118,22 +123,16 @@ void symmetry::archive(archive_node &n) const
 	n.add_unsigned("type", type);
 
 	if (children.empty()) {
-		std::set<unsigned>::const_iterator i = indices.begin(), iend = indices.end();
-		while (i != iend) {
-			n.add_unsigned("index", *i);
-			i++;
+		for (auto & i : indices) {
+			n.add_unsigned("index", i);
 		}
 	} else {
-		exvector::const_iterator i = children.begin(), iend = children.end();
-		while (i != iend) {
-			n.add_ex("child", *i);
-			i++;
+		for (auto & i : children) {
+			n.add_ex("child", i);
 		}
 	}
 }
 
-DEFAULT_UNARCHIVE(symmetry)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -142,11 +141,68 @@ 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;
+	auto end = indices.end();
+	for (auto 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;
 }
 
+unsigned symmetry::calchash() const
+{
+	unsigned v = make_hash_seed(typeid(*this));
+
+	if (type == none) {
+		v = rotate_left(v);
+		if (!indices.empty())
+			v ^= *(indices.begin());
+	} else {
+		for (auto & i : children) {
+			v = rotate_left(v);
+			v ^= i.gethash();
+		}
+	}
+
+	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()) {
@@ -189,7 +245,7 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 
 	c.s << ", indices=(";
 	if (!indices.empty()) {
-		std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
+		auto i = indices.begin(), end = indices.end();
 		--end;
 		while (i != end)
 			c.s << *i++ << ",";
@@ -197,10 +253,8 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 	}
 	c.s << ")\n";
 
-	exvector::const_iterator i = children.begin(), end = children.end();
-	while (i != end) {
-		i->print(c, level + c.delta_indent);
-		++i;
+	for (auto & i : children) {
+		i.print(c, level + c.delta_indent);
 	}
 }
 
@@ -208,6 +262,30 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 // non-virtual functions in this class
 //////////
 
+bool symmetry::has_nonsymmetric() const
+{
+	if (type == antisymmetric || type == cyclic)
+		return true;
+
+	for (auto & i : children)
+		if (ex_to<symmetry>(i).has_nonsymmetric())
+			return true;
+
+	return false;
+}
+
+bool symmetry::has_cyclic() const
+{
+	if (type == cyclic)
+		return true;
+
+	for (auto & i : children)
+		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
@@ -245,7 +323,73 @@ void symmetry::validate(unsigned n)
 // global functions
 //////////
 
-class sy_is_less : public std::binary_function<ex, ex, bool> {
+static const symmetry & index0()
+{
+	static ex s = dynallocate<symmetry>(0);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index1()
+{
+	static ex s = dynallocate<symmetry>(1);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index2()
+{
+	static ex s = dynallocate<symmetry>(2);
+	return ex_to<symmetry>(s);
+}
+
+static const symmetry & index3()
+{
+	static ex s = dynallocate<symmetry>(3);
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & not_symmetric()
+{
+	static ex s = dynallocate<symmetry>();
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric2()
+{
+	static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1());
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric3()
+{
+	static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2());
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & symmetric4()
+{
+	static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2()).add(index3());
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric2()
+{
+	static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1());
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric3()
+{
+	static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2());
+	return ex_to<symmetry>(s);
+}
+
+const symmetry & antisymmetric4()
+{
+	static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2()).add(index3());
+	return ex_to<symmetry>(s);
+}
+
+class sy_is_less {
 	exvector::iterator v;
 
 public:
@@ -256,7 +400,7 @@ public:
 		GINAC_ASSERT(is_exactly_a<symmetry>(lh));
 		GINAC_ASSERT(is_exactly_a<symmetry>(rh));
 		GINAC_ASSERT(ex_to<symmetry>(lh).indices.size() == ex_to<symmetry>(rh).indices.size());
-		std::set<unsigned>::const_iterator ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
+		auto ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
 		while (ait != aitend) {
 			int cmpval = v[*ait].compare(v[*bit]);
 			if (cmpval < 0)
@@ -269,7 +413,7 @@ public:
 	}
 };
 
-class sy_swap : public std::binary_function<ex, ex, void> {
+class sy_swap {
 	exvector::iterator v;
 
 public:
@@ -282,7 +426,7 @@ public:
 		GINAC_ASSERT(is_exactly_a<symmetry>(lh));
 		GINAC_ASSERT(is_exactly_a<symmetry>(rh));
 		GINAC_ASSERT(ex_to<symmetry>(lh).indices.size() == ex_to<symmetry>(rh).indices.size());
-		std::set<unsigned>::const_iterator ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
+		auto ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
 		while (ait != aitend) {
 			v[*ait].swap(v[*bit]);
 			++ait; ++bit;
@@ -295,18 +439,18 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
 {
 	// 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;
 	int sign = 1;
-	exvector::const_iterator first = symm.children.begin(), last = symm.children.end();
+	auto first = symm.children.begin(), last = symm.children.end();
 	while (first != last) {
 		GINAC_ASSERT(is_exactly_a<symmetry>(*first));
 		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;
 		}
@@ -333,7 +477,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();
 }
 
 
@@ -352,22 +496,24 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
 	unsigned *iv = new unsigned[num], *iv2;
 	for (unsigned i=0; i<num; i++)
 		iv[i] = i;
-	iv2 = (asymmetric ? new unsigned[num] : NULL);
+	iv2 = (asymmetric ? new unsigned[num] : nullptr);
 
 	// Loop over all permutations (the first permutation, which is the
 	// identity, is unrolled)
-	ex sum = e;
+	exvector sum_v;
+	sum_v.push_back(e);
 	while (std::next_permutation(iv, iv + num)) {
 		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, subs_options::no_pattern);
+		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);
 		}
-		sum += term;
+		sum_v.push_back(term);
 	}
+	ex sum = dynallocate<add>(sum_v);
 
 	delete[] iv;
 	delete[] iv2;
@@ -402,7 +548,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, subs_options::no_pattern);
+		sum += e.subs(orig_lst, new_lst, subs_options::no_pattern|subs_options::no_index_renaming);
 	}
 	return sum / num;
 }