X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcolor.h;h=8ff75442fa608de3dfe2c58861450837973314fc;hp=ba62735099a9c55b81ffaca836d6cbf282a0ea8c;hb=646d0ad9d3f64b2437f2f55fbc007fad1cbedf86;hpb=708e9e647029af699333fceffc0a76bef70a4709

diff --git a/ginac/color.h b/ginac/color.h
index ba627350..8ff75442 100644
--- a/ginac/color.h
+++ b/ginac/color.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's color (SU(3) Lie algebra) objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -47,20 +47,20 @@ public:
 
 	// internal constructors
 	color(unsigned char rl, const exvector & v, bool discardable = false);
-	color(unsigned char rl, exvector * vp); // vp will be deleted
+	color(unsigned char rl, std::auto_ptr<exvector> vp);
 
 	// functions overriding virtual functions from base classes
 protected:
+	ex eval_ncmul(const exvector & v) const;
 	bool match_same_type(const basic & other) const;
-	ex simplify_ncmul(const exvector & v) const;
-	ex thisexprseq(const exvector & v) const;
-	ex thisexprseq(exvector * vp) const;
-	unsigned return_type(void) const { return return_types::noncommutative; }
-	unsigned return_type_tinfo(void) const { return TINFO_color + representation_label; }
+	ex thiscontainer(const exvector & v) const;
+	ex thiscontainer(std::auto_ptr<exvector> vp) const;
+	unsigned return_type() const { return return_types::noncommutative; }
+	unsigned return_type_tinfo() const { return TINFO_color + representation_label; }
 
 	// non-virtual functions in this class
 public:
-	unsigned char get_representation_label(void) const {return representation_label;}
+	unsigned char get_representation_label() const {return representation_label;}
 
 	// member variables
 private:
@@ -73,9 +73,10 @@ class su3one : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(su3one, tensor)
 
-	// functions overriding virtual functions from bases classes
-public:
-	void print(const print_context & c, unsigned level = 0) const;
+	// non-virtual functions in this class
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
 };
 
 /** This class represents an su(3) generator. */
@@ -83,10 +84,14 @@ class su3t : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(su3t, tensor)
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+
+	// non-virtual functions in this class
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
 };
 
 /** This class represents the tensor of antisymmetric su(3) structure
@@ -95,11 +100,15 @@ class su3f : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(su3f, tensor)
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	ex eval_indexed(const basic & i) const;
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+
+	// non-virtual functions in this class
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
 };
 
 /** This class represents the tensor of symmetric su(3) structure constants. */
@@ -107,23 +116,20 @@ class su3d : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(su3d, tensor)
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	ex eval_indexed(const basic & i) const;
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+
+	// non-virtual functions in this class
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
 };
 
 
 // global functions
 
-/** Return the color object handled by an ex.  Deprecated: use ex_to<color>().
- *  This is unsafe: you need to check the type first. */
-inline const color &ex_to_color(const ex &e)
-{
-	return static_cast<const color &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<color>(obj) for color objects. */
 template<> inline bool is_exactly_a<color>(const basic & obj)
 {