X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcolor.cpp;h=37f653a40f6a257d22bff20c43f3252ed7e81bea;hp=2c323e253cb81c3e714d6ce7fd3710b85ec5d1e7;hb=c018acc8ddca143ba6a202ad095b192205708bc4;hpb=29b420743599f001b8bfc8b63fb6ac81aa3dfba7 diff --git a/ginac/color.cpp b/ginac/color.cpp index 2c323e25..37f653a4 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-2006 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2016 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; @@ -335,7 +332,7 @@ bool su3t::contract_with(exvector::iterator self, exvector::iterator other, exve // T.a S T.a = 1/2 Tr(S) - 1/6 S } else { - exvector::iterator it = self + 1; + auto it = self + 1; while (it != other) { if (!is_a(*it)) { return false; @@ -403,9 +400,7 @@ bool su3d::contract_with(exvector::iterator self, exvector::iterator other, exve && ex_to(*self).has_dummy_index_for(other[1].op(1))) { exvector self_indices = ex_to(*self).get_indices(); - exvector dummy_indices; - dummy_indices.push_back(other[0].op(1)); - dummy_indices.push_back(other[1].op(1)); + exvector dummy_indices = {other[0].op(1), other[1].op(1)}; int sig; ex a = permute_free_index_to_front(self_indices, dummy_indices, sig); *self = numeric(5, 6); @@ -456,9 +451,7 @@ bool su3f::contract_with(exvector::iterator self, exvector::iterator other, exve && ex_to(*self).has_dummy_index_for(other[1].op(1))) { exvector self_indices = ex_to(*self).get_indices(); - exvector dummy_indices; - dummy_indices.push_back(other[0].op(1)); - dummy_indices.push_back(other[1].op(1)); + exvector dummy_indices = {other[0].op(1), other[1].op(1)}; int sig; ex a = permute_free_index_to_front(self_indices, dummy_indices, sig); *self = numeric(3, 2) * sig * I; @@ -477,13 +470,13 @@ bool su3f::contract_with(exvector::iterator self, exvector::iterator other, exve ex color_ONE(unsigned char rl) { - static ex ONE = (new su3one)->setflag(status_flags::dynallocated); + static ex ONE = dynallocate(); return color(ONE, rl); } ex color_T(const ex & a, unsigned char rl) { - static ex t = (new su3t)->setflag(status_flags::dynallocated); + static ex t = dynallocate(); if (!is_a(a)) throw(std::invalid_argument("indices of color_T must be of type idx")); @@ -495,7 +488,7 @@ ex color_T(const ex & a, unsigned char rl) ex color_f(const ex & a, const ex & b, const ex & c) { - static ex f = (new su3f)->setflag(status_flags::dynallocated); + static ex f = dynallocate(); if (!is_a(a) || !is_a(b) || !is_a(c)) throw(std::invalid_argument("indices of color_f must be of type idx")); @@ -507,7 +500,7 @@ ex color_f(const ex & a, const ex & b, const ex & c) ex color_d(const ex & a, const ex & b, const ex & c) { - static ex d = (new su3d)->setflag(status_flags::dynallocated); + static ex d = dynallocate(); if (!is_a(a) || !is_a(b) || !is_a(c)) throw(std::invalid_argument("indices of color_d must be of type idx")); @@ -524,17 +517,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) @@ -599,7 +591,7 @@ ex color_trace(const ex & e, const std::set & rls) // + 1/2 h_a(n-1)_an_k Tr T_a1 .. T_a(n-2) T_k const ex &last_index = e.op(num - 1).op(1); const ex &next_to_last_index = e.op(num - 2).op(1); - idx summation_index((new symbol)->setflag(status_flags::dynallocated), 8); + idx summation_index(dynallocate(), 8); exvector v1; v1.reserve(num - 2); @@ -627,9 +619,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);