X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ftensor.h;h=712ec7e131539ce8aaf3c92e815f52486521d1a0;hb=44ec54892fdadceeb95e78e786f0411860f342ad;hp=5698b9b944450e44852b3571cb610dd0051b95ec;hpb=6c9a7dfd6b92368b21a2fe5aaf3638bc849099ba;p=ginac.git

diff --git a/ginac/tensor.h b/ginac/tensor.h
index 5698b9b9..712ec7e1 100644
--- a/ginac/tensor.h
+++ b/ginac/tensor.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's special tensors. */
 
 /*
- *  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
@@ -37,11 +37,18 @@ class tensor : public basic
 
 	// other constructors
 protected:
-	tensor(unsigned ti);
+	tensor(unsigned ti) : inherited(ti) {}
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 protected:
-	unsigned return_type(void) const { return return_types::noncommutative_composite; }
+	unsigned return_type() const { return return_types::noncommutative_composite; }
+
+	// non-virtual functions in this class
+public:
+	/** Replace dummy index in contracted-with object by the contracting
+	 *  object's second index (used internally for delta and metric tensor
+	 *  contractions. */
+	bool replace_contr_index(exvector::iterator self, exvector::iterator other) const;
 };
 
 
@@ -51,7 +58,7 @@ class tensdelta : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(tensdelta, 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;
@@ -66,7 +73,7 @@ class tensmetric : public tensor
 {
 	GINAC_DECLARE_REGISTERED_CLASS(tensmetric, 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;
@@ -86,7 +93,7 @@ public:
 	/** Construct Lorentz metric tensor with given signature. */
 	minkmetric(bool pos_sig);
 
-	// 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;
@@ -105,7 +112,7 @@ class spinmetric : public tensmetric
 {
 	GINAC_DECLARE_REGISTERED_CLASS(spinmetric, tensmetric)
 
-	// 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;
@@ -124,23 +131,20 @@ class tensepsilon : public tensor
 public:
 	tensepsilon(bool minkowski, bool pos_sig);
 
-	// 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;
 
 	// member variables
 private:
 	bool minkowski; /**< If true, tensor is in Minkowski-type space. Otherwise it is in a Euclidean space. */
-	bool pos_sig;  /**< If true, the metric is assumed to be diag(-1,1,1...). Otherwise it is diag(1,-1,-1,...). This is only relevant if minkowski = true. */
+	bool pos_sig;   /**< If true, the metric is assumed to be diag(-1,1,1...). Otherwise it is diag(1,-1,-1,...). This is only relevant if minkowski = true. */
 };
 
 
 // utility functions
-inline const tensor &ex_to_tensor(const ex &e)
-{
-	return static_cast<const tensor &>(*e.bp);
-}
 
 /** Create a delta tensor with specified indices. The indices must be of class
  *  idx or a subclass. The delta tensor is always symmetric and its trace is
@@ -209,18 +213,6 @@ ex epsilon_tensor(const ex & i1, const ex & i2, const ex & i3);
  *  @return newly constructed epsilon tensor */
 ex lorentz_eps(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool pos_sig = false);
 
-/** Create an epsilon tensor in a 4-dimensional projection of a D-dimensional
- *  Minkowski space. It vanishes whenever one of the indices is not in the
- *  set {0, 1, 2, 3}.
- *
- *  @param i1 First index
- *  @param i2 Second index
- *  @param i3 Third index
- *  @param i4 Fourth index
- *  @param pos_sig Whether the signature of the metric is positive
- *  @return newly constructed epsilon tensor */
-ex eps0123(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool pos_sig = false);
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_TENSOR_H__