]> www.ginac.de Git - ginac.git/blobdiff - ginac/tensor.cpp
Prepare for release 1.0.6:
[ginac.git] / ginac / tensor.cpp
index 8881425f6e4c2189dc73ed2132e1f82bd34299cc..0ef65cc8ae66e963874e717384b3376dafacba4f 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of 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
@@ -20,6 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <iostream>
 #include <stdexcept>
 #include <vector>
 
@@ -34,7 +35,6 @@
 #include "print.h"
 #include "archive.h"
 #include "utils.h"
-#include "debugmsg.h"
 
 namespace GiNaC {
 
@@ -46,14 +46,9 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(spinmetric, tensmetric)
 GINAC_IMPLEMENT_REGISTERED_CLASS(tensepsilon, tensor)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
-tensor::tensor(unsigned ti) : inherited(ti)
-{
-       debugmsg("tensor constructor from unsigned", LOGLEVEL_CONSTRUCT); \
-}
-
 DEFAULT_CTORS(tensor)
 DEFAULT_CTORS(tensdelta)
 DEFAULT_CTORS(tensmetric)
@@ -64,19 +59,16 @@ DEFAULT_DESTROY(tensepsilon)
 
 minkmetric::minkmetric() : pos_sig(false)
 {
-       debugmsg("minkmetric default constructor", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_minkmetric;
 }
 
 spinmetric::spinmetric()
 {
-       debugmsg("spinmetric default constructor", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_spinmetric;
 }
 
 minkmetric::minkmetric(bool ps) : pos_sig(ps)
 {
-       debugmsg("minkmetric constructor from bool", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_minkmetric;
 }
 
@@ -88,13 +80,11 @@ void minkmetric::copy(const minkmetric & other)
 
 tensepsilon::tensepsilon() : minkowski(false), pos_sig(false)
 {
-       debugmsg("tensepsilon default constructor", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_tensepsilon;
 }
 
 tensepsilon::tensepsilon(bool mink, bool ps) : minkowski(mink), pos_sig(ps)
 {
-       debugmsg("tensepsilon constructor from bool,bool", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_tensepsilon;
 }
 
@@ -118,7 +108,6 @@ DEFAULT_UNARCHIVE(tensepsilon)
 
 minkmetric::minkmetric(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("minkmetric constructor from archive_node", LOGLEVEL_CONSTRUCT);
        n.find_bool("pos_sig", pos_sig);
 }
 
@@ -130,7 +119,6 @@ void minkmetric::archive(archive_node &n) const
 
 tensepsilon::tensepsilon(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("tensepsilon constructor from archive_node", LOGLEVEL_CONSTRUCT);
        n.find_bool("minkowski", minkowski);
        n.find_bool("pos_sig", pos_sig);
 }
@@ -199,9 +187,9 @@ ex tensdelta::eval_indexed(const basic & i) const
        if (static_cast<const indexed &>(i).all_index_values_are(info_flags::integer)) {
                int n1 = ex_to<numeric>(i1.get_value()).to_int(), n2 = ex_to<numeric>(i2.get_value()).to_int();
                if (n1 == n2)
-                       return _ex1();
+                       return _ex1;
                else
-                       return _ex0();
+                       return _ex0;
        }
 
        // No further simplifications
@@ -245,11 +233,11 @@ ex minkmetric::eval_indexed(const basic & i) const
        if (static_cast<const indexed &>(i).all_index_values_are(info_flags::nonnegint)) {
                int n1 = ex_to<numeric>(i1.get_value()).to_int(), n2 = ex_to<numeric>(i2.get_value()).to_int();
                if (n1 != n2)
-                       return _ex0();
+                       return _ex0;
                else if (n1 == 0)
-                       return pos_sig ? _ex_1() : _ex1();
+                       return pos_sig ? _ex_1 : _ex1;
                else
-                       return pos_sig ? _ex1() : _ex_1();
+                       return pos_sig ? _ex1 : _ex_1;
        }
 
        // Perform the usual evaluations of a metric tensor
@@ -270,17 +258,17 @@ ex spinmetric::eval_indexed(const basic & i) const
 
        // Convolutions are zero
        if (!(static_cast<const indexed &>(i).get_dummy_indices().empty()))
-               return _ex0();
+               return _ex0;
 
        // Numeric evaluation
        if (static_cast<const indexed &>(i).all_index_values_are(info_flags::nonnegint)) {
                int n1 = ex_to<numeric>(i1.get_value()).to_int(), n2 = ex_to<numeric>(i2.get_value()).to_int();
                if (n1 == n2)
-                       return _ex0();
+                       return _ex0;
                else if (n1 < n2)
-                       return _ex1();
+                       return _ex1;
                else
-                       return _ex_1();
+                       return _ex_1;
        }
 
        // No further simplifications
@@ -296,7 +284,7 @@ ex tensepsilon::eval_indexed(const basic & i) const
 
        // Convolutions are zero
        if (!(static_cast<const indexed &>(i).get_dummy_indices().empty()))
-               return _ex0();
+               return _ex0;
 
        // Numeric evaluation
        if (static_cast<const indexed &>(i).all_index_values_are(info_flags::nonnegint)) {
@@ -351,7 +339,7 @@ again:
 
                                // Contraction found, remove delta tensor and substitute
                                // index in second object
-                               *self = _ex1();
+                               *self = _ex1;
                                *other = other->subs(other_idx == *free_idx);
                                return true;
                        }
@@ -396,7 +384,7 @@ again:
 
                                // Contraction found, remove metric tensor and substitute
                                // index in second object
-                               *self = _ex1();
+                               *self = _ex1;
                                *other = other->subs(other_idx == *free_idx);
                                return true;
                        }
@@ -432,25 +420,25 @@ bool spinmetric::contract_with(exvector::iterator self, exvector::iterator other
 
                if (is_dummy_pair(self_i1, other_i1)) {
                        if (is_dummy_pair(self_i2, other_i2))
-                               *self = _ex2();
+                               *self = _ex2;
                        else
                                *self = delta_tensor(self_i2, other_i2);
-                       *other = _ex1();
+                       *other = _ex1;
                        return true;
                } else if (is_dummy_pair(self_i1, other_i2)) {
                        if (is_dummy_pair(self_i2, other_i1))
-                               *self = _ex_2();
+                               *self = _ex_2;
                        else
                                *self = -delta_tensor(self_i2, other_i1);
-                       *other = _ex1();
+                       *other = _ex1;
                        return true;
                } else if (is_dummy_pair(self_i2, other_i1)) {
                        *self = -delta_tensor(self_i1, other_i2);
-                       *other = _ex1();
+                       *other = _ex1;
                        return true;
                } else if (is_dummy_pair(self_i2, other_i2)) {
                        *self = delta_tensor(self_i1, other_i1);
-                       *other = _ex1();
+                       *other = _ex1;
                        return true;
                }
        }
@@ -517,7 +505,7 @@ bool tensepsilon::contract_with(exvector::iterator self, exvector::iterator othe
                }
                int sign = minkowski ? -1 : 1;
                *self = sign * M.determinant().simplify_indexed();
-               *other = _ex1();
+               *other = _ex1;
                return true;
 
        } else if (other->return_type() == return_types::commutative) {
@@ -549,8 +537,8 @@ bool tensepsilon::contract_with(exvector::iterator self, exvector::iterator othe
                                        } else {
 
                                                // Yes, the contraction is zero
-                                               *self = _ex0();
-                                               *other = _ex0();
+                                               *self = _ex0;
+                                               *other = _ex0;
                                                return true;
                                        }
                                }
@@ -608,7 +596,7 @@ ex epsilon_tensor(const ex & i1, const ex & i2)
        ex dim = ex_to<idx>(i1).get_dim();
        if (!dim.is_equal(ex_to<idx>(i2).get_dim()))
                throw(std::invalid_argument("all indices of epsilon tensor must have the same dimension"));
-       if (!ex_to<idx>(i1).get_dim().is_equal(_ex2()))
+       if (!ex_to<idx>(i1).get_dim().is_equal(_ex2))
                throw(std::runtime_error("index dimension of epsilon tensor must match number of indices"));
 
        return indexed(tensepsilon(), sy_anti(), i1, i2);
@@ -622,7 +610,7 @@ ex epsilon_tensor(const ex & i1, const ex & i2, const ex & i3)
        ex dim = ex_to<idx>(i1).get_dim();
        if (!dim.is_equal(ex_to<idx>(i2).get_dim()) || !dim.is_equal(ex_to<idx>(i3).get_dim()))
                throw(std::invalid_argument("all indices of epsilon tensor must have the same dimension"));
-       if (!ex_to<idx>(i1).get_dim().is_equal(_ex3()))
+       if (!ex_to<idx>(i1).get_dim().is_equal(_ex3))
                throw(std::runtime_error("index dimension of epsilon tensor must match number of indices"));
 
        return indexed(tensepsilon(), sy_anti(), i1, i2, i3);
@@ -636,7 +624,7 @@ ex lorentz_eps(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool
        ex dim = ex_to<idx>(i1).get_dim();
        if (!dim.is_equal(ex_to<idx>(i2).get_dim()) || !dim.is_equal(ex_to<idx>(i3).get_dim()) || !dim.is_equal(ex_to<idx>(i4).get_dim()))
                throw(std::invalid_argument("all indices of epsilon tensor must have the same dimension"));
-       if (!ex_to<idx>(i1).get_dim().is_equal(_ex4()))
+       if (!ex_to<idx>(i1).get_dim().is_equal(_ex4))
                throw(std::runtime_error("index dimension of epsilon tensor must match number of indices"));
 
        return indexed(tensepsilon(true, pos_sig), sy_anti(), i1, i2, i3, i4);