X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcolor.cpp;h=b70298b6214c55b0c94982dc3c76c72721180b4b;hp=9a364c4395427198a842d765c0c057e34a6200b0;hb=4f596b14ac1cdb03163c74e210cab493358ababf;hpb=6d7bf9ee5a7ce05cb3a23dae664e781d7325d7b8

diff --git a/ginac/color.cpp b/ginac/color.cpp
index 9a364c43..b70298b6 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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,7 +17,7 @@
  *
  *  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 <iostream>
@@ -39,6 +39,8 @@ 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<print_dflt>(&su3one::do_print).
   print_func<print_latex>(&su3one::do_print_latex))
@@ -61,7 +63,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(su3d, tensor,
 
 color::color() : representation_label(0)
 {
-	tinfo_key = TINFO_color;
+	tinfo_key = &color::tinfo_static;
 }
 
 DEFAULT_CTOR(su3one)
@@ -78,7 +80,7 @@ DEFAULT_CTOR(su3d)
  *  @see color_ONE */
 color::color(const ex & b, unsigned char rl) : inherited(b), representation_label(rl)
 {
-	tinfo_key = TINFO_color;
+	tinfo_key = &color::tinfo_static;
 }
 
 /** Construct object with one color index. This constructor is for internal
@@ -86,17 +88,17 @@ 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;
+	tinfo_key = &color::tinfo_static;
 }
 
-color::color(unsigned char rl, const exvector & v, bool discardable) : inherited(sy_none(), v, discardable), representation_label(rl)
+color::color(unsigned char rl, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl)
 {
-	tinfo_key = TINFO_color;
+	tinfo_key = &color::tinfo_static;
 }
 
-color::color(unsigned char rl, std::auto_ptr<exvector> vp) : inherited(sy_none(), vp), representation_label(rl)
+color::color(unsigned char rl, std::auto_ptr<exvector> vp) : inherited(not_symmetric(), vp), representation_label(rl)
 {
-	tinfo_key = TINFO_color;
+	tinfo_key = &color::tinfo_static;
 }
 
 //////////
@@ -475,37 +477,44 @@ bool su3f::contract_with(exvector::iterator self, exvector::iterator other, exve
 
 ex color_ONE(unsigned char rl)
 {
-	return color(su3one(), rl);
+	static ex ONE = (new su3one)->setflag(status_flags::dynallocated);
+	return color(ONE, rl);
 }
 
 ex color_T(const ex & a, unsigned char rl)
 {
+	static ex t = (new su3t)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(a))
 		throw(std::invalid_argument("indices of color_T must be of type idx"));
 	if (!ex_to<idx>(a).get_dim().is_equal(8))
 		throw(std::invalid_argument("index dimension for color_T must be 8"));
 
-	return color(su3t(), a, rl);
+	return color(t, a, rl);
 }
 
 ex color_f(const ex & a, const ex & b, const ex & c)
 {
+	static ex f = (new su3f)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(a) || !is_a<idx>(b) || !is_a<idx>(c))
 		throw(std::invalid_argument("indices of color_f must be of type idx"));
 	if (!ex_to<idx>(a).get_dim().is_equal(8) || !ex_to<idx>(b).get_dim().is_equal(8) || !ex_to<idx>(c).get_dim().is_equal(8))
 		throw(std::invalid_argument("index dimension for color_f must be 8"));
 
-	return indexed(su3f(), sy_anti(), a, b, c);
+	return indexed(f, antisymmetric3(), a, b, c);
 }
 
 ex color_d(const ex & a, const ex & b, const ex & c)
 {
+	static ex d = (new su3d)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(a) || !is_a<idx>(b) || !is_a<idx>(c))
 		throw(std::invalid_argument("indices of color_d must be of type idx"));
 	if (!ex_to<idx>(a).get_dim().is_equal(8) || !ex_to<idx>(b).get_dim().is_equal(8) || !ex_to<idx>(c).get_dim().is_equal(8))
 		throw(std::invalid_argument("index dimension for color_d must be 8"));
 
-	return indexed(su3d(), sy_symm(), a, b, c);
+	return indexed(d, symmetric3(), a, b, c);
 }
 
 ex color_h(const ex & a, const ex & b, const ex & c)
@@ -514,18 +523,32 @@ 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(tinfo_t ti)
 {
-	return ti == (TINFO_color + rl);
+	p_int start_loc=(p_int)&color::return_type_tinfo_static;
+	return (p_int)ti>=start_loc && (p_int)ti<start_loc+256;
 }
 
-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(tinfo_t ti)
+{
+	return (unsigned char)((p_int)ti-(p_int)&color::return_type_tinfo_static);
+}
+
+ex color_trace(const ex & e, const std::set<unsigned char> & rls)
 {
 	if (is_a<color>(e)) {
 
-		if (ex_to<color>(e).get_representation_label() == rl
-		 && is_a<su3one>(e.op(0)))
+		unsigned char rl = ex_to<color>(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<su3one>(e.op(0)))
 			return _ex3;
 		else
 			return _ex0;
@@ -536,8 +559,8 @@ ex color_trace(const ex & e, unsigned char rl)
 		ex prod = _ex1;
 		for (size_t i=0; i<e.nops(); i++) {
 			const ex &o = e.op(i);
-			if (is_color_tinfo(o.return_type_tinfo(), rl))
-				prod *= color_trace(o, rl);
+			if (is_color_tinfo(o.return_type_tinfo()))
+				prod *= color_trace(o, rls);
 			else
 				prod *= o;
 		}
@@ -545,13 +568,16 @@ ex color_trace(const ex & e, unsigned char rl)
 
 	} else if (is_exactly_a<ncmul>(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<ncmul>(e_expanded))
-			return color_trace(e_expanded, rl);
+			return color_trace(e_expanded, rls);
 
 		size_t num = e.nops();
 
@@ -590,11 +616,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<unsigned char> fcn(color_trace, rl);
+		pointer_to_map_function_1arg<const std::set<unsigned char> &> 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<unsigned char> rls;
+	for (lst::const_iterator i = rll.begin(); i != rll.end(); ++i) {
+		if (i->info(info_flags::nonnegint))
+			rls.insert(ex_to<numeric>(*i).to_int());
+	}
+
+	return color_trace(e, rls);
+}
+
+ex color_trace(const ex & e, unsigned char rl)
+{
+	// Convert label to set
+	std::set<unsigned char> rls;
+	rls.insert(rl);
+
+	return color_trace(e, rls);
+}
+
 } // namespace GiNaC