X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ftensor.cpp;h=a8c83b65ab20edeb18258411bd1e42dfa434788d;hp=d78eff6604078ebf1b913e63d4682bba54c7c20f;hb=ff96974562b86f5c04f82ecd91b2cdb97f6bd990;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/tensor.cpp b/ginac/tensor.cpp
index d78eff66..a8c83b65 100644
--- a/ginac/tensor.cpp
+++ b/ginac/tensor.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's special tensors. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
@@ -33,18 +33,32 @@
 #include "lst.h"
 #include "numeric.h"
 #include "matrix.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(tensor, basic)
-GINAC_IMPLEMENT_REGISTERED_CLASS(tensdelta, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(tensmetric, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(minkmetric, tensmetric)
-GINAC_IMPLEMENT_REGISTERED_CLASS(spinmetric, tensmetric)
-GINAC_IMPLEMENT_REGISTERED_CLASS(tensepsilon, tensor)
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(tensdelta, tensor,
+  print_func<print_dflt>(&tensdelta::do_print).
+  print_func<print_latex>(&tensdelta::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(tensmetric, tensor,
+  print_func<print_dflt>(&tensmetric::do_print).
+  print_func<print_latex>(&tensmetric::do_print))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(minkmetric, tensmetric,
+  print_func<print_dflt>(&minkmetric::do_print).
+  print_func<print_latex>(&minkmetric::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(spinmetric, tensmetric,
+  print_func<print_dflt>(&spinmetric::do_print).
+  print_func<print_latex>(&spinmetric::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(tensepsilon, tensor,
+  print_func<print_dflt>(&tensepsilon::do_print).
+  print_func<print_latex>(&tensepsilon::do_print_latex))
 
 //////////
 // constructors
@@ -171,7 +185,10 @@ ex tensdelta::eval_indexed(const basic & i) const
 	// dimension
 	if (!i1.get_dim().is_equal(i2.get_dim())) {
 		ex min_dim = i1.minimal_dim(i2);
-		return i.subs(lst(i1 == i1.replace_dim(min_dim), i2 == i2.replace_dim(min_dim)));
+		exmap m;
+		m[i1] = i1.replace_dim(min_dim);
+		m[i2] = i2.replace_dim(min_dim);
+		return i.subs(m, subs_options::no_pattern);
 	}
 
 	// Trace of delta tensor is the (effective) dimension of the space
@@ -212,7 +229,10 @@ ex tensmetric::eval_indexed(const basic & i) const
 	// dimension
 	if (!i1.get_dim().is_equal(i2.get_dim())) {
 		ex min_dim = i1.minimal_dim(i2);
-		return i.subs(lst(i1 == i1.replace_dim(min_dim), i2 == i2.replace_dim(min_dim)));
+		exmap m;
+		m[i1] = i1.replace_dim(min_dim);
+		m[i2] = i2.replace_dim(min_dim);
+		return i.subs(m, subs_options::no_pattern);
 	}
 
 	// A metric tensor with one covariant and one contravariant index gets
@@ -514,40 +534,51 @@ bool tensepsilon::contract_with(exvector::iterator self, exvector::iterator othe
 
 ex delta_tensor(const ex & i1, const ex & i2)
 {
+	static ex delta = (new tensdelta)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(i1) || !is_a<idx>(i2))
 		throw(std::invalid_argument("indices of delta tensor must be of type idx"));
 
-	return indexed(tensdelta(), sy_symm(), i1, i2);
+	return indexed(delta, symmetric2(), i1, i2);
 }
 
 ex metric_tensor(const ex & i1, const ex & i2)
 {
+	static ex metric = (new tensmetric)->setflag(status_flags::dynallocated);
+
 	if (!is_a<varidx>(i1) || !is_a<varidx>(i2))
 		throw(std::invalid_argument("indices of metric tensor must be of type varidx"));
 
-	return indexed(tensmetric(), sy_symm(), i1, i2);
+	return indexed(metric, symmetric2(), i1, i2);
 }
 
 ex lorentz_g(const ex & i1, const ex & i2, bool pos_sig)
 {
+	static ex metric_neg = (new minkmetric(false))->setflag(status_flags::dynallocated);
+	static ex metric_pos = (new minkmetric(true))->setflag(status_flags::dynallocated);
+
 	if (!is_a<varidx>(i1) || !is_a<varidx>(i2))
 		throw(std::invalid_argument("indices of metric tensor must be of type varidx"));
 
-	return indexed(minkmetric(pos_sig), sy_symm(), i1, i2);
+	return indexed(pos_sig ? metric_pos : metric_neg, symmetric2(), i1, i2);
 }
 
 ex spinor_metric(const ex & i1, const ex & i2)
 {
+	static ex metric = (new spinmetric)->setflag(status_flags::dynallocated);
+
 	if (!is_a<spinidx>(i1) || !is_a<spinidx>(i2))
 		throw(std::invalid_argument("indices of spinor metric must be of type spinidx"));
 	if (!ex_to<idx>(i1).get_dim().is_equal(2) || !ex_to<idx>(i2).get_dim().is_equal(2))
 		throw(std::runtime_error("index dimension for spinor metric must be 2"));
 
-	return indexed(spinmetric(), sy_anti(), i1, i2);
+	return indexed(metric, antisymmetric2(), i1, i2);
 }
 
 ex epsilon_tensor(const ex & i1, const ex & i2)
 {
+	static ex epsilon = (new tensepsilon)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(i1) || !is_a<idx>(i2))
 		throw(std::invalid_argument("indices of epsilon tensor must be of type idx"));
 
@@ -557,11 +588,13 @@ ex epsilon_tensor(const ex & i1, const ex & i2)
 	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);
+	return indexed(epsilon, antisymmetric2(), i1, i2);
 }
 
 ex epsilon_tensor(const ex & i1, const ex & i2, const ex & i3)
 {
+	static ex epsilon = (new tensepsilon)->setflag(status_flags::dynallocated);
+
 	if (!is_a<idx>(i1) || !is_a<idx>(i2) || !is_a<idx>(i3))
 		throw(std::invalid_argument("indices of epsilon tensor must be of type idx"));
 
@@ -571,11 +604,14 @@ ex epsilon_tensor(const ex & i1, const ex & i2, const ex & i3)
 	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);
+	return indexed(epsilon, antisymmetric3(), i1, i2, i3);
 }
 
 ex lorentz_eps(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool pos_sig)
 {
+	static ex epsilon_neg = (new tensepsilon(true, false))->setflag(status_flags::dynallocated);
+	static ex epsilon_pos = (new tensepsilon(true, true))->setflag(status_flags::dynallocated);
+
 	if (!is_a<varidx>(i1) || !is_a<varidx>(i2) || !is_a<varidx>(i3) || !is_a<varidx>(i4))
 		throw(std::invalid_argument("indices of Lorentz epsilon tensor must be of type varidx"));
 
@@ -585,7 +621,7 @@ ex lorentz_eps(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool
 	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);
+	return indexed(pos_sig ? epsilon_pos : epsilon_neg, antisymmetric4(), i1, i2, i3, i4);
 }
 
 } // namespace GiNaC