X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Ftensor.cpp;h=259af3e45d3a579639f1712e7b5100bf9123d9e7;hb=e342f91c239e89839fdbe643957595b5f598c628;hp=a682f2ddc8b50812de2d6daa3b4f241bbb9b2704;hpb=488cad4c124885230154720041bd51fa4d983a8b;p=ginac.git

diff --git a/ginac/tensor.cpp b/ginac/tensor.cpp
index a682f2dd..259af3e4 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-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
  */
 
 #include <iostream>
@@ -33,7 +33,6 @@
 #include "lst.h"
 #include "numeric.h"
 #include "matrix.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
 
@@ -65,7 +64,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(tensepsilon, tensor,
 // constructors
 //////////
 
-tensor::tensor() : inherited(TINFO_tensor)
+tensor::tensor()
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -75,44 +74,34 @@ DEFAULT_CTOR(tensmetric)
 
 minkmetric::minkmetric() : pos_sig(false)
 {
-	tinfo_key = TINFO_minkmetric;
 }
 
 spinmetric::spinmetric()
 {
-	tinfo_key = TINFO_spinmetric;
 }
 
 minkmetric::minkmetric(bool ps) : pos_sig(ps)
 {
-	tinfo_key = TINFO_minkmetric;
 }
 
 tensepsilon::tensepsilon() : minkowski(false), pos_sig(false)
 {
-	tinfo_key = TINFO_tensepsilon;
 }
 
 tensepsilon::tensepsilon(bool mink, bool ps) : minkowski(mink), pos_sig(ps)
 {
-	tinfo_key = TINFO_tensepsilon;
 }
 
 //////////
 // archiving
 //////////
 
-DEFAULT_ARCHIVING(tensor)
-DEFAULT_ARCHIVING(tensdelta)
-DEFAULT_ARCHIVING(tensmetric)
-DEFAULT_ARCHIVING(spinmetric)
-DEFAULT_UNARCHIVE(minkmetric)
-DEFAULT_UNARCHIVE(tensepsilon)
-
-minkmetric::minkmetric(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void minkmetric::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	n.find_bool("pos_sig", pos_sig);
 }
+GINAC_BIND_UNARCHIVER(minkmetric);
 
 void minkmetric::archive(archive_node &n) const
 {
@@ -120,11 +109,13 @@ void minkmetric::archive(archive_node &n) const
 	n.add_bool("pos_sig", pos_sig);
 }
 
-tensepsilon::tensepsilon(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void tensepsilon::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	n.find_bool("minkowski", minkowski);
 	n.find_bool("pos_sig", pos_sig);
 }
+GINAC_BIND_UNARCHIVER(tensepsilon);
 
 void tensepsilon::archive(archive_node &n) const
 {
@@ -133,6 +124,10 @@ void tensepsilon::archive(archive_node &n) const
 	n.add_bool("pos_sig", pos_sig);
 }
 
+GINAC_BIND_UNARCHIVER(tensdelta);
+GINAC_BIND_UNARCHIVER(tensmetric);
+GINAC_BIND_UNARCHIVER(spinmetric);
+
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -142,6 +137,22 @@ DEFAULT_COMPARE(tensdelta)
 DEFAULT_COMPARE(tensmetric)
 DEFAULT_COMPARE(spinmetric)
 
+bool tensdelta::info(unsigned inf) const
+{
+	if(inf == info_flags::real)
+		return true;
+
+	return false;
+}
+
+bool tensmetric::info(unsigned inf) const
+{
+	if(inf == info_flags::real)
+		return true;
+
+	return false;
+}
+
 int minkmetric::compare_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_a<minkmetric>(other));
@@ -153,6 +164,14 @@ int minkmetric::compare_same_type(const basic & other) const
 		return inherited::compare_same_type(other);
 }
 
+bool minkmetric::info(unsigned inf) const
+{
+	if(inf == info_flags::real)
+		return true;
+
+	return false;
+}
+
 int tensepsilon::compare_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_a<tensepsilon>(other));
@@ -166,6 +185,22 @@ int tensepsilon::compare_same_type(const basic & other) const
 		return inherited::compare_same_type(other);
 }
 
+bool tensepsilon::info(unsigned inf) const
+{
+	if(inf == info_flags::real)
+		return true;
+
+	return false;
+}
+
+bool spinmetric::info(unsigned inf) const
+{
+	if(inf == info_flags::real)
+		return true;
+
+	return false;
+}
+
 DEFAULT_PRINT_LATEX(tensdelta, "delta", "\\delta")
 DEFAULT_PRINT(tensmetric, "g")
 DEFAULT_PRINT_LATEX(minkmetric, "eta", "\\eta")
@@ -356,6 +391,8 @@ bool tensor::replace_contr_index(exvector::iterator self, exvector::iterator oth
 again:
 	if (self_idx->is_symbolic()) {
 		for (size_t i=1; i<other->nops(); i++) {
+			if (! is_a<idx>(other->op(i)))
+				continue;
 			const idx &other_idx = ex_to<idx>(other->op(i));
 			if (is_dummy_pair(*self_idx, other_idx)) {
 
@@ -535,40 +572,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"));
 
@@ -578,11 +626,16 @@ 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);
+	if(is_a<wildcard>(i1.op(0))||is_a<wildcard>(i2.op(0)))
+		return indexed(epsilon, antisymmetric2(), i1, i2).hold();
+
+	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"));
 
@@ -592,11 +645,17 @@ 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);
+	if(is_a<wildcard>(i1.op(0))||is_a<wildcard>(i2.op(0))||is_a<wildcard>(i3.op(0)))
+		return indexed(epsilon, antisymmetric3(), i1, i2, i3).hold();
+
+	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"));
 
@@ -606,7 +665,10 @@ 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);
+	if(is_a<wildcard>(i1.op(0))||is_a<wildcard>(i2.op(0))||is_a<wildcard>(i3.op(0))||is_a<wildcard>(i4.op(0)))
+		return indexed(pos_sig ? epsilon_pos : epsilon_neg, antisymmetric4(), i1, i2, i3, i4).hold();
+
+	return indexed(pos_sig ? epsilon_pos : epsilon_neg, antisymmetric4(), i1, i2, i3, i4);
 }
 
 } // namespace GiNaC