X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=a44cfcc5df87d0a8b02d9518d965972883c66620;hp=9cee0ffb37b24ec718cabf91c3897307ff3c9fab;hb=4e1e7c6547dafc0b0f8695f9eced2591ae816a31;hpb=808c9d678e7b1a05713387b7c12def5a60a1ada2 diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp index 9cee0ffb..a44cfcc5 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-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,16 +20,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include - #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 +#include +#include +#include namespace GiNaC { @@ -55,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); } @@ -64,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); @@ -81,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")); @@ -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 @@ -132,8 +137,6 @@ void symmetry::archive(archive_node &n) const } } -DEFAULT_UNARCHIVE(symmetry) - ////////// // functions overriding virtual functions from base classes ////////// @@ -158,7 +161,7 @@ int symmetry::compare_same_type(const basic & other) const return 1; if (this_size < that_size) return -1; - typedef std::set::iterator set_it; + typedef std::set::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) @@ -184,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) { @@ -266,6 +270,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 (exvector::const_iterator i=children.begin(); i!=children.end(); ++i) + if (ex_to(*i).has_nonsymmetric()) + return true; + + return false; +} + +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 @@ -419,7 +447,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; @@ -430,7 +458,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; } @@ -457,7 +485,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(); } @@ -480,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; isetflag(status_flags::dynallocated); delete[] iv; delete[] iv2;