X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=353b4a7744079ec1d73549454746a5a36eaf632f;hp=6e068af8dcbaaac8a2aa8224bbc47a6ca563ef85;hb=1531cd76f7b2159647bfddb0d9e9cc9b2a98b94e;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 6e068af8..353b4a77 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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>
@@ -29,6 +29,8 @@
 #include "operators.h"
 #include "matrix.h"
 #include "utils.h"
+#include "clifford.h"
+#include "ncmul.h"
 
 namespace GiNaC {
 
@@ -36,7 +38,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
   print_func<print_context>(&add::do_print).
   print_func<print_latex>(&add::do_print_latex).
   print_func<print_csrc>(&add::do_print_csrc).
-  print_func<print_tree>(&inherited::do_print_tree).
+  print_func<print_tree>(&add::do_print_tree).
   print_func<print_python_repr>(&add::do_print_python_repr))
 
 //////////
@@ -45,7 +47,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
 
 add::add()
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 }
 
 //////////
@@ -56,7 +58,7 @@ add::add()
 
 add::add(const ex & lh, const ex & rh)
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_2_ex(lh,rh);
 	GINAC_ASSERT(is_canonical());
@@ -64,7 +66,7 @@ add::add(const ex & lh, const ex & rh)
 
 add::add(const exvector & v)
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_exvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -72,7 +74,7 @@ add::add(const exvector & v)
 
 add::add(const epvector & v)
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 	overall_coeff = _ex0;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -80,7 +82,7 @@ add::add(const epvector & v)
 
 add::add(const epvector & v, const ex & oc)
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 	overall_coeff = oc;
 	construct_from_epvector(v);
 	GINAC_ASSERT(is_canonical());
@@ -88,8 +90,8 @@ add::add(const epvector & v, const ex & oc)
 
 add::add(std::auto_ptr<epvector> vp, const ex & oc)
 {
-	tinfo_key = TINFO_add;
-	GINAC_ASSERT(vp!=0);
+	tinfo_key = &add::tinfo_static;
+	GINAC_ASSERT(vp.get()!=0);
 	overall_coeff = oc;
 	construct_from_epvector(*vp);
 	GINAC_ASSERT(is_canonical());
@@ -131,8 +133,8 @@ void add::print_add(const print_context & c, const char *openbrace, const char *
 			if (coeff.csgn() == -1) c.s << '-';
 			first = false;
 		}
-		if (!coeff.is_equal(_num1) &&
-		    !coeff.is_equal(_num_1)) {
+		if (!coeff.is_equal(*_num1_p) &&
+		    !coeff.is_equal(*_num_1_p)) {
 			if (coeff.is_rational()) {
 				if (coeff.is_negative())
 					(-coeff).print(c);
@@ -179,11 +181,11 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
 		} else if (it->coeff.is_equal(_ex_1)) {
 			c.s << "-";
 			it->rest.print(c, precedence());
-		} else if (ex_to<numeric>(it->coeff).numer().is_equal(_num1)) {
+		} else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
 			it->rest.print(c, precedence());
 			c.s << "/";
 			ex_to<numeric>(it->coeff).denom().print(c, precedence());
-		} else if (ex_to<numeric>(it->coeff).numer().is_equal(_num_1)) {
+		} else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
 			c.s << "-";
 			it->rest.print(c, precedence());
 			c.s << "/";
@@ -198,7 +200,7 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
 		++it;
 		if (it != itend
 		 && (is_a<print_csrc_cl_N>(c) || !it->coeff.info(info_flags::real)  // sign inside ctor arguments
-		  || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
+		  || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(*_num1_p) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
 			c.s << "+";
 	}
 	
@@ -291,17 +293,31 @@ int add::ldegree(const ex & s) const
 ex add::coeff(const ex & s, int n) const
 {
 	std::auto_ptr<epvector> coeffseq(new epvector);
+	std::auto_ptr<epvector> coeffseq_cliff(new epvector);
+	char rl = clifford_max_label(s);
+	bool do_clifford = (rl != -1);
+	bool nonscalar = false;
 
 	// Calculate sum of coefficients in each term
 	epvector::const_iterator i = seq.begin(), end = seq.end();
 	while (i != end) {
 		ex restcoeff = i->rest.coeff(s, n);
-		if (!restcoeff.is_zero())
+ 		if (!restcoeff.is_zero()) {
+ 			if (do_clifford) {
+ 				if (clifford_max_label(restcoeff) == -1) {
+ 					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i->coeff));
+				} else {
+ 					coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+					nonscalar = true;
+ 				}
+			}
 			coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+		}
 		++i;
 	}
 
-	return (new add(coeffseq, n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
+	return (new add(nonscalar ? coeffseq_cliff : coeffseq,
+	                n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
 }
 
 /** Perform automatic term rewriting rules in this class.  In the following
@@ -382,6 +398,68 @@ ex add::evalm() const
 		return (new add(s, overall_coeff))->setflag(status_flags::dynallocated);
 }
 
+ex add::conjugate() const
+{
+	exvector *v = 0;
+	for (size_t i=0; i<nops(); ++i) {
+		if (v) {
+			v->push_back(op(i).conjugate());
+			continue;
+		}
+		ex term = op(i);
+		ex ccterm = term.conjugate();
+		if (are_ex_trivially_equal(term, ccterm))
+			continue;
+		v = new exvector;
+		v->reserve(nops());
+		for (size_t j=0; j<i; ++j)
+			v->push_back(op(j));
+		v->push_back(ccterm);
+	}
+	if (v) {
+		ex result = add(*v);
+		delete v;
+		return result;
+	}
+	return *this;
+}
+
+ex add::real_part() const
+{
+	epvector v;
+	v.reserve(seq.size());
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+		if ((i->coeff).info(info_flags::real)) {
+			ex rp = (i->rest).real_part();
+			if (!rp.is_zero())
+				v.push_back(expair(rp, i->coeff));
+		} else {
+			ex rp=recombine_pair_to_ex(*i).real_part();
+			if (!rp.is_zero())
+				v.push_back(split_ex_to_pair(rp));
+		}
+	return (new add(v, overall_coeff.real_part()))
+		-> setflag(status_flags::dynallocated);
+}
+
+ex add::imag_part() const
+{
+	epvector v;
+	v.reserve(seq.size());
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+		if ((i->coeff).info(info_flags::real)) {
+			ex ip = (i->rest).imag_part();
+			if (!ip.is_zero())
+				v.push_back(expair(ip, i->coeff));
+		} else {
+			ex ip=recombine_pair_to_ex(*i).imag_part();
+			if (!ip.is_zero())
+				v.push_back(split_ex_to_pair(ip));
+		}
+	return (new add(v, overall_coeff.imag_part()))
+		-> setflag(status_flags::dynallocated);
+}
+
 ex add::eval_ncmul(const exvector & v) const
 {
 	if (seq.empty())
@@ -422,21 +500,23 @@ unsigned add::return_type() const
 	else
 		return seq.begin()->rest.return_type();
 }
-   
-unsigned add::return_type_tinfo() const
+
+tinfo_t add::return_type_tinfo() const
 {
 	if (seq.empty())
-		return tinfo_key;
+		return this;
 	else
 		return seq.begin()->rest.return_type_tinfo();
 }
 
-ex add::thisexpairseq(const epvector & v, const ex & oc) const
+// Note: do_index_renaming is ignored because it makes no sense for an add.
+ex add::thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming) const
 {
 	return (new add(v,oc))->setflag(status_flags::dynallocated);
 }
 
-ex add::thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const
+// Note: do_index_renaming is ignored because it makes no sense for an add.
+ex add::thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming) const
 {
 	return (new add(vp,oc))->setflag(status_flags::dynallocated);
 }
@@ -489,7 +569,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
 	GINAC_ASSERT(is_exactly_a<numeric>(c));
 
 	if (is_exactly_a<numeric>(p.rest)) {
-		GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(_num1)); // should be normalized
+		GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(*_num1_p)); // should be normalized
 		return expair(ex_to<numeric>(p.rest).mul_dyn(ex_to<numeric>(c)),_ex1);
 	}
 
@@ -498,7 +578,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
 	
 ex add::recombine_pair_to_ex(const expair & p) const
 {
-	if (ex_to<numeric>(p.coeff).is_equal(_num1))
+	if (ex_to<numeric>(p.coeff).is_equal(*_num1_p))
 		return p.rest;
 	else
 		return (new mul(p.rest,p.coeff))->setflag(status_flags::dynallocated);