X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fcolor.cpp;h=dcc106dacda8309fec7f86c90ed295225a9f805d;hb=00d612ce3789ba9240ade1b8bf06b26c326bd8f2;hp=b70298b6214c55b0c94982dc3c76c72721180b4b;hpb=7d870583a6bf21a2ffb7b6f051b702064623892e;p=ginac.git diff --git a/ginac/color.cpp b/ginac/color.cpp index b70298b6..dcc106da 100644 --- a/ginac/color.cpp +++ b/ginac/color.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's color (SU(3) Lie algebra) objects. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2015 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,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - #include "color.h" #include "idx.h" #include "ncmul.h" @@ -35,12 +32,13 @@ #include "archive.h" #include "utils.h" +#include +#include + namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(color, indexed) -const tinfo_static_t color::return_type_tinfo_static[256] = {{}}; - GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(su3one, tensor, print_func(&su3one::do_print). print_func(&su3one::do_print_latex)) @@ -63,7 +61,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(su3d, tensor, color::color() : representation_label(0) { - tinfo_key = &color::tinfo_static; } DEFAULT_CTOR(su3one) @@ -80,7 +77,6 @@ DEFAULT_CTOR(su3d) * @see color_ONE */ color::color(const ex & b, unsigned char rl) : inherited(b), representation_label(rl) { - tinfo_key = &color::tinfo_static; } /** Construct object with one color index. This constructor is for internal @@ -88,25 +84,28 @@ color::color(const ex & b, unsigned char rl) : inherited(b), representation_labe * @see color_T */ color::color(const ex & b, const ex & i1, unsigned char rl) : inherited(b, i1), representation_label(rl) { - tinfo_key = &color::tinfo_static; } -color::color(unsigned char rl, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl) +color::color(unsigned char rl, const exvector & v) : inherited(not_symmetric(), v), representation_label(rl) +{ +} + +color::color(unsigned char rl, exvector && v) : inherited(not_symmetric(), std::move(v)), representation_label(rl) { - tinfo_key = &color::tinfo_static; } -color::color(unsigned char rl, std::auto_ptr vp) : inherited(not_symmetric(), vp), representation_label(rl) +return_type_t color::return_type_tinfo() const { - tinfo_key = &color::tinfo_static; + return make_return_type_t(representation_label); } ////////// // archiving ////////// -color::color(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) +void color::read_archive(const archive_node& n, lst& sym_lst) { + inherited::read_archive(n, sym_lst); unsigned rl; n.find_unsigned("label", rl); representation_label = rl; @@ -118,11 +117,11 @@ void color::archive(archive_node &n) const n.add_unsigned("label", representation_label); } -DEFAULT_UNARCHIVE(color) -DEFAULT_ARCHIVING(su3one) -DEFAULT_ARCHIVING(su3t) -DEFAULT_ARCHIVING(su3f) -DEFAULT_ARCHIVING(su3d) +GINAC_BIND_UNARCHIVER(color); +GINAC_BIND_UNARCHIVER(su3one); +GINAC_BIND_UNARCHIVER(su3t); +GINAC_BIND_UNARCHIVER(su3f); +GINAC_BIND_UNARCHIVER(su3d); ////////// // functions overriding virtual functions from base classes @@ -167,11 +166,9 @@ ex color::eval_ncmul(const exvector & v) const s.reserve(v.size()); // Remove superfluous ONEs - exvector::const_iterator it = v.begin(), itend = v.end(); - while (it != itend) { - if (!is_a(it->op(0))) - s.push_back(*it); - it++; + for (auto & it : v) { + if (!is_a(it.op(0))) + s.push_back(it); } if (s.empty()) @@ -185,9 +182,9 @@ ex color::thiscontainer(const exvector & v) const return color(representation_label, v); } -ex color::thiscontainer(std::auto_ptr vp) const +ex color::thiscontainer(exvector && v) const { - return color(representation_label, vp); + return color(representation_label, std::move(v)); } /** Given a vector iv3 of three indices and a vector iv2 of two indices that @@ -196,7 +193,7 @@ ex color::thiscontainer(std::auto_ptr vp) const * * @param iv3 Vector of 3 indices * @param iv2 Vector of 2 indices, must be a subset of iv3 - * @param sig Returs sign introduced by index permutation + * @param sig Returns sign introduced by index permutation * @return the free index (the one that is in iv3 but not in iv2) */ static ex permute_free_index_to_front(const exvector & iv3, const exvector & iv2, int & sig) { @@ -315,7 +312,7 @@ bool su3t::contract_with(exvector::iterator self, exvector::iterator other, exve if (is_exactly_a(other->op(0))) { - // Contraction only makes sense if the represenation labels are equal + // Contraction only makes sense if the representation labels are equal GINAC_ASSERT(is_a(*other)); if (ex_to(*other).get_representation_label() != rl) return false; @@ -524,17 +521,16 @@ ex color_h(const ex & a, const ex & b, const ex & c) /** Check whether a given tinfo key (as returned by return_type_tinfo() * is that of a color object (with an arbitrary representation label). */ -static bool is_color_tinfo(tinfo_t ti) +static bool is_color_tinfo(const return_type_t& ti) { - p_int start_loc=(p_int)&color::return_type_tinfo_static; - return (p_int)ti>=start_loc && (p_int)ti & rls) @@ -627,9 +623,9 @@ ex color_trace(const ex & e, const lst & rll) { // Convert list to set std::set rls; - for (lst::const_iterator i = rll.begin(); i != rll.end(); ++i) { - if (i->info(info_flags::nonnegint)) - rls.insert(ex_to(*i).to_int()); + for (auto & it : rll) { + if (it.info(info_flags::nonnegint)) + rls.insert(ex_to(it).to_int()); } return color_trace(e, rls);