X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=9e00a8c843633fdfece0c0ab9715343a9ddd7e02;hp=96225e7416437068816a422f51cc5de6a6116513;hb=ee1ec9db30b446d2d6348df2ce758ed2ff62a310;hpb=3ac17e18ada69428fe170c10abcc5f33a30f0676 diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp index 96225e74..9e00a8c8 100644 --- a/ginac/symmetry.cpp +++ b/ginac/symmetry.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's symmetry definitions. */ /* - * GiNaC Copyright (C) 1999-2006 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 @@ -20,16 +20,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include - #include "symmetry.h" #include "lst.h" #include "numeric.h" // for factorial() #include "operators.h" #include "archive.h" #include "utils.h" +#include "hash_seed.h" + +#include +#include +#include +#include namespace GiNaC { @@ -55,7 +57,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); } @@ -64,13 +66,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); @@ -81,8 +83,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")); @@ -109,6 +112,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 @@ -132,8 +136,6 @@ void symmetry::archive(archive_node &n) const } } -DEFAULT_UNARCHIVE(symmetry) - ////////// // functions overriding virtual functions from base classes ////////// @@ -142,11 +144,69 @@ int symmetry::compare_same_type(const basic & other) const { GINAC_ASSERT(is_a(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(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::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[i]) + .compare_same_type(ex_to(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); + v ^= *(indices.begin()); + } else { + for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i) + { + 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()) { @@ -208,6 +268,18 @@ void symmetry::do_print_tree(const print_tree & 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(*i).has_cyclic()) + return true; + + return false; +} + symmetry &symmetry::add(const symmetry &c) { // All children must have the same number of indices @@ -361,7 +433,7 @@ 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::max(); // Canonicalize children first bool something_changed = false; @@ -372,7 +444,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm) int child_sign = canonicalize(v, ex_to(*first)); if (child_sign == 0) return 0; - if (child_sign != INT_MAX) { + if (child_sign != std::numeric_limits::max()) { something_changed = true; sign *= child_sign; } @@ -399,7 +471,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm) default: break; } - return something_changed ? sign : INT_MAX; + return something_changed ? sign : std::numeric_limits::max(); }