G_numeric: use cl_N and int to manipulate numbers (instead of ex).

[ginac.git] / ginac / tensor.h

diff --git a/ginac/tensor.h b/ginac/tensor.h
index 712ec7e131539ce8aaf3c92e815f52486521d1a0..daf869e67f98140d93665f3258c6640d9bb77c54 100644 (file)
--- a/ginac/tensor.h
+++ b/ginac/tensor.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's special tensors. */
 
 /*
- *  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
  */
 
 #ifndef __GINAC_TENSOR_H__
@@ -37,7 +37,7 @@ class tensor : public basic
 
        // other constructors
 protected:
-       tensor(unsigned ti) : inherited(ti) {}
+       tensor(tinfo_t ti) : inherited(ti) {}
 
        // functions overriding virtual functions from base classes
 protected:
@@ -60,9 +60,15 @@ class tensdelta : public tensor
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
+       bool info(unsigned inf) 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:
+       unsigned return_type() const { return return_types::commutative; }
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
 };
 
 
@@ -75,9 +81,14 @@ class tensmetric : public tensor
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
+       bool info(unsigned inf) 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:
+       unsigned return_type() const { return return_types::commutative; }
+       void do_print(const print_context & c, unsigned level) const;
 };
 
 
@@ -95,9 +106,15 @@ public:
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
+       bool info(unsigned inf) const;
        ex eval_indexed(const basic & i) const;
 
+       // non-virtual functions in this class
+protected:
+       unsigned return_type() const { return return_types::commutative; }
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+
        // member variables
 private:
        bool pos_sig; /**< If true, the metric is diag(-1,1,1...). Otherwise it is diag(1,-1,-1,...). */
@@ -114,9 +131,14 @@ class spinmetric : public tensmetric
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
+       bool info(unsigned inf) 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;
 };
 
 
@@ -133,10 +155,16 @@ public:
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
+       bool info(unsigned inf) 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:
+       unsigned return_type() const { return return_types::commutative; }
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+
        // member variables
 private:
        bool minkowski; /**< If true, tensor is in Minkowski-type space. Otherwise it is in a Euclidean space. */