fixed typos

[ginac.git] / ginac / color.h

diff --git a/ginac/color.h b/ginac/color.h
index 0916bdfdc642b2207f889ad53b8682049635c0c4..2086909e1304dd1c7a35ac9e53c658263150348c 100644 (file)
--- a/ginac/color.h
+++ b/ginac/color.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's color (SU(3) Lie algebra) objects. */
 
 /*
  *  Interface to GiNaC's color (SU(3) Lie algebra) objects. */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
  *
  *  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


@@ -33,7 +33,7 @@ namespace GiNaC {
  *  of SU(3), as used for calculations in quantum chromodynamics. A
  *  representation label (an unsigned 8-bit integer) is used to distinguish
  *  elements from different Lie algebras (objects with different labels
  *  of SU(3), as used for calculations in quantum chromodynamics. A
  *  representation label (an unsigned 8-bit integer) is used to distinguish
  *  elements from different Lie algebras (objects with different labels

- *  commute). These objects implement an abstract representation of the
+ *  commutate). These objects implement an abstract representation of the

  *  group, not a specific matrix representation. The indices used for color
  *  objects should not have a variance. */
 class color : public indexed
  *  group, not a specific matrix representation. The indices used for color
  *  objects should not have a variance. */
 class color : public indexed


@@ -47,19 +47,20 @@ public:
 
        // internal constructors
        color(unsigned char rl, const exvector & v, bool discardable = false);
 
        // 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:
 
        // functions overriding virtual functions from base classes
 protected:

-       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 eval_ncmul(const exvector & v) const;
+       bool match_same_type(const basic & other) const;
+       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:
 
        // 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:
 
        // member variables
 private:


@@ -72,9 +73,10 @@ class su3one : public tensor
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3one, 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. */
 };
 
 /** This class represents an su(3) generator. */


@@ -82,10 +84,14 @@ class su3t : public tensor
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3t, tensor)
 
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3t, tensor)
 

-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes

 public:
 public:

-       void print(const print_context & c, unsigned level = 0) const;

        bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) 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
 };
 
 /** This class represents the tensor of antisymmetric su(3) structure


@@ -94,11 +100,15 @@ class su3f : public tensor
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3f, tensor)
 
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3f, tensor)
 

-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes

 public:
 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;
        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. */
 };
 
 /** This class represents the tensor of symmetric su(3) structure constants. */


@@ -106,23 +116,20 @@ class su3d : public tensor
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3d, tensor)
 
 {
        GINAC_DECLARE_REGISTERED_CLASS(su3d, tensor)
 

-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes

 public:
 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;
        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
 
 };
 
 
 // global functions
 

-/** Return the color object handled by an ex.
- *  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)
 {
 /** Specialization of is_exactly_a<color>(obj) for color objects. */
 template<> inline bool is_exactly_a<color>(const basic & obj)
 {