X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymmetry.cpp;h=115df0bfe4924505dfc507eadf08754b592afada;hp=e48e269851e0846442bbbc1975928348e8d24271;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=e485c265061056d29de6fb252cd82ebedd41ec41 diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp index e48e2698..115df0bf 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-2019 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 @@ -118,22 +123,16 @@ void symmetry::archive(archive_node &n) const n.add_unsigned("type", type); if (children.empty()) { - std::set::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 ////////// @@ -158,9 +157,8 @@ int symmetry::compare_same_type(const basic & other) const 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) { + 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) @@ -184,16 +182,16 @@ 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) - { + for (auto & i : children) { v = rotate_left(v); - v ^= i->gethash(); + v ^= i.gethash(); } } @@ -247,7 +245,7 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const c.s << ", indices=("; if (!indices.empty()) { - std::set::const_iterator i = indices.begin(), end = indices.end(); + auto i = indices.begin(), end = indices.end(); --end; while (i != end) c.s << *i++ << ","; @@ -255,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); } } @@ -266,13 +262,25 @@ 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(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()) + for (auto & i : children) + if (ex_to(i).has_cyclic()) return true; return false; @@ -317,71 +325,71 @@ void symmetry::validate(unsigned n) static const symmetry & index0() { - static ex s = (new symmetry(0))->setflag(status_flags::dynallocated); + static ex s = dynallocate(0); return ex_to(s); } static const symmetry & index1() { - static ex s = (new symmetry(1))->setflag(status_flags::dynallocated); + static ex s = dynallocate(1); return ex_to(s); } static const symmetry & index2() { - static ex s = (new symmetry(2))->setflag(status_flags::dynallocated); + static ex s = dynallocate(2); return ex_to(s); } static const symmetry & index3() { - static ex s = (new symmetry(3))->setflag(status_flags::dynallocated); + static ex s = dynallocate(3); return ex_to(s); } const symmetry & not_symmetric() { - static ex s = (new symmetry)->setflag(status_flags::dynallocated); + static ex s = dynallocate(); return ex_to(s); } const symmetry & symmetric2() { - static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::symmetric, index0(), index1()); return ex_to(s); } const symmetry & symmetric3() { - static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::symmetric, index0(), index1()).add(index2()); return ex_to(s); } const symmetry & symmetric4() { - static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::symmetric, index0(), index1()).add(index2()).add(index3()); return ex_to(s); } const symmetry & antisymmetric2() { - static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::antisymmetric, index0(), index1()); return ex_to(s); } const symmetry & antisymmetric3() { - static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::antisymmetric, index0(), index1()).add(index2()); return ex_to(s); } const symmetry & antisymmetric4() { - static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated); + static ex s = dynallocate(symmetry::antisymmetric, index0(), index1()).add(index2()).add(index3()); return ex_to(s); } -class sy_is_less : public std::binary_function { +class sy_is_less { exvector::iterator v; public: @@ -392,7 +400,7 @@ public: GINAC_ASSERT(is_exactly_a(lh)); GINAC_ASSERT(is_exactly_a(rh)); GINAC_ASSERT(ex_to(lh).indices.size() == ex_to(rh).indices.size()); - std::set::const_iterator ait = ex_to(lh).indices.begin(), aitend = ex_to(lh).indices.end(), bit = ex_to(rh).indices.begin(); + auto ait = ex_to(lh).indices.begin(), aitend = ex_to(lh).indices.end(), bit = ex_to(rh).indices.begin(); while (ait != aitend) { int cmpval = v[*ait].compare(v[*bit]); if (cmpval < 0) @@ -405,7 +413,7 @@ public: } }; -class sy_swap : public std::binary_function { +class sy_swap { exvector::iterator v; public: @@ -418,7 +426,7 @@ public: GINAC_ASSERT(is_exactly_a(lh)); GINAC_ASSERT(is_exactly_a(rh)); GINAC_ASSERT(ex_to(lh).indices.size() == ex_to(rh).indices.size()); - std::set::const_iterator ait = ex_to(lh).indices.begin(), aitend = ex_to(lh).indices.end(), bit = ex_to(rh).indices.begin(); + auto ait = ex_to(lh).indices.begin(), aitend = ex_to(lh).indices.end(), bit = ex_to(rh).indices.begin(); while (ait != aitend) { v[*ait].swap(v[*bit]); ++ait; ++bit; @@ -431,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::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(*first)); 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; } @@ -469,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::max(); } @@ -488,11 +496,12 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite unsigned *iv = new unsigned[num], *iv2; for (unsigned i=0; i(sum_v); delete[] iv; delete[] iv2;