moved some common code to the 'tensor' class

[ginac.git] / ginac / tensor.h

diff --git a/ginac/tensor.h b/ginac/tensor.h
index d868355b16b71ee07e9102c1b1995dd5e7330792..9b19dc187587e99f7cd2787018df64277a215d20 100644 (file)
--- 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-2002 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 base classes
 protected:
        unsigned return_type(void) 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;
 };
 
 
@@ -128,6 +135,7 @@ 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;
 
        // member variables
 private:
@@ -138,13 +146,6 @@ private:
 
 // utility functions
 
-/** Return the tensor object handled by an ex.  Deprecated: use ex_to<tensor>().
- *  This is unsafe: you need to check the type first. */
-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
  *  the dimension of the index space.