X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcolor.cpp;h=891d55c1f9d309cc223c8996c3d4585263c57219;hp=e06eff44a43c659ef7bb7567f6dc04fdffc03961;hb=aa2485821e68ea5f627d5753b41245a4cbd62fe3;hpb=23acc666fcef311fd97092aee7f8c55e80395351 diff --git a/ginac/color.cpp b/ginac/color.cpp index e06eff44..891d55c1 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-2004 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 @@ -17,12 +17,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - #include "color.h" #include "idx.h" #include "ncmul.h" @@ -35,6 +32,9 @@ #include "archive.h" #include "utils.h" +#include +#include + namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(color, indexed) @@ -61,7 +61,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(su3d, tensor, color::color() : representation_label(0) { - tinfo_key = TINFO_color; } DEFAULT_CTOR(su3one) @@ -78,7 +77,6 @@ DEFAULT_CTOR(su3d) * @see color_ONE */ color::color(const ex & b, unsigned char rl) : inherited(b), representation_label(rl) { - tinfo_key = TINFO_color; } /** Construct object with one color index. This constructor is for internal @@ -86,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 = TINFO_color; } color::color(unsigned char rl, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl) { - tinfo_key = TINFO_color; } color::color(unsigned char rl, std::auto_ptr vp) : inherited(not_symmetric(), vp), representation_label(rl) { - tinfo_key = TINFO_color; +} + +return_type_t color::return_type_tinfo() const +{ + 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; @@ -116,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 @@ -521,18 +522,31 @@ 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 the specified representation label. */ -static bool is_color_tinfo(unsigned ti, unsigned char rl) + * is that of a color object (with an arbitrary representation label). */ +static bool is_color_tinfo(const return_type_t& ti) { - return ti == (TINFO_color + rl); + return *(ti.tinfo) == typeid(color); } -ex color_trace(const ex & e, unsigned char rl) +/** Extract representation label from tinfo key (as returned by + * return_type_tinfo()). */ +static unsigned char get_representation_label(const return_type_t& ti) +{ + return (unsigned char)ti.rl; +} + +ex color_trace(const ex & e, const std::set & rls) { if (is_a(e)) { - if (ex_to(e).get_representation_label() == rl - && is_a(e.op(0))) + unsigned char rl = ex_to(e).get_representation_label(); + + // Are we taking the trace over this object's representation label? + if (rls.find(rl) == rls.end()) + return e; + + // Yes, all generators are traceless, except for color_ONE + if (is_a(e.op(0))) return _ex3; else return _ex0; @@ -543,8 +557,8 @@ ex color_trace(const ex & e, unsigned char rl) ex prod = _ex1; for (size_t i=0; i(e)) { - if (!is_color_tinfo(e.return_type_tinfo(), rl)) - return _ex0; + unsigned char rl = get_representation_label(e.return_type_tinfo()); - // Expand product, if necessary + // Are we taking the trace over this string's representation label? + if (rls.find(rl) == rls.end()) + return e; + + // Yes, expand product if necessary ex e_expanded = e.expand(); if (!is_a(e_expanded)) - return color_trace(e_expanded, rl); + return color_trace(e_expanded, rls); size_t num = e.nops(); @@ -597,11 +614,32 @@ ex color_trace(const ex & e, unsigned char rl) } else if (e.nops() > 0) { // Trace maps to all other container classes (this includes sums) - pointer_to_map_function_1arg fcn(color_trace, rl); + pointer_to_map_function_1arg &> fcn(color_trace, rls); return e.map(fcn); } else return _ex0; } +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()); + } + + return color_trace(e, rls); +} + +ex color_trace(const ex & e, unsigned char rl) +{ + // Convert label to set + std::set rls; + rls.insert(rl); + + return color_trace(e, rls); +} + } // namespace GiNaC