X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=a44cfcc5df87d0a8b02d9518d965972883c66620;hp=215a48a08d78ae88ea8cee7052490eb2a72f85b3;hb=10365850aa3803337bfea1fc201b81b6752096d4;hpb=83a7ee99a947cbbf331018b803ad6be43a9ccd45

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 215a48a0..a44cfcc5 100644
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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,17 +20,19 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-#include <functional>
-#include <limits>
-
 #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 {
 
@@ -56,7 +58,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symmetry, basic,
 // default constructor
 //////////
 
-symmetry::symmetry() : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry() :  type(none)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -65,13 +67,13 @@ symmetry::symmetry() : inherited(&symmetry::tinfo_static), type(none)
 // other constructors
 //////////
 
-symmetry::symmetry(unsigned i) : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry(unsigned i) :  type(none)
 {
 	indices.insert(i);
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : inherited(&symmetry::tinfo_static), type(t)
+symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) :  type(t)
 {
 	add(c1); add(c2);
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -82,8 +84,9 @@ symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : in
 //////////
 
 /** 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"));
@@ -110,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
@@ -133,8 +137,6 @@ void symmetry::archive(archive_node &n) const
 	}
 }
 
-DEFAULT_UNARCHIVE(symmetry)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -159,7 +161,7 @@ int symmetry::compare_same_type(const basic & other) const
 		return 1;
 	if (this_size < that_size)
 		return -1;
-	typedef std::set<unsigned>::iterator set_it;
+	typedef std::set<unsigned>::const_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)
@@ -185,11 +187,12 @@ int symmetry::compare_same_type(const basic & other) const
 
 unsigned symmetry::calchash() const
 {
-	unsigned v = golden_ratio_hash((p_int)tinfo());
+	unsigned v = make_hash_seed(typeid(*this));
 
 	if (type == none) {
 		v = rotate_left(v);
-		v ^= *(indices.begin());
+		if (!indices.empty())
+			v ^= *(indices.begin());
 	} else {
 		for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
 		{
@@ -267,6 +270,18 @@ 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 (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
+		if (ex_to<symmetry>(*i).has_nonsymmetric())
+			return true;
+
+	return false;
+}
+
 bool symmetry::has_cyclic() const
 {
 	if (type == cyclic)
@@ -493,7 +508,8 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
 
 	// 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++)
@@ -503,8 +519,9 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
 			memcpy(iv2, iv, num * sizeof(unsigned));
 			term *= permutation_sign(iv2, iv2 + num);
 		}
-		sum += term;
+		sum_v.push_back(term);
 	}
+	ex sum = (new add(sum_v))->setflag(status_flags::dynallocated);
 
 	delete[] iv;
 	delete[] iv2;