X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=a8b5da110ecf13c93ff71a715b7e72a5f6082ed0;hp=274658e36eaf23aaa01d448a4197e975dae7df4a;hb=ff8b400eb500618644231ed9e6f199c3b0b25135;hpb=695f6ae955ec530cded8f21efd5569df39447f76

diff --git a/ginac/add.h b/ginac/add.h
index 274658e3..a8b5da11 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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,11 +17,11 @@
  *
  *  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_ADD_H__
-#define __GINAC_ADD_H__
+#ifndef GINAC_ADD_H
+#define GINAC_ADD_H
 
 #include "expairseq.h"
 
@@ -58,14 +58,16 @@ public:
 	ex smod(const numeric &xi) const;
 	numeric max_coefficient() const;
 	ex conjugate() const;
+	ex real_part() const;
+	ex imag_part() const;
 	exvector get_free_indices() const;
 	ex eval_ncmul(const exvector & v) const;
 protected:
 	ex derivative(const symbol & s) const;
 	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
-	ex thisexpairseq(const epvector & v, const ex & oc) const;
-	ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
+	return_type_t return_type_tinfo() const;
+	ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const;
+	ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false) const;
 	expair split_ex_to_pair(const ex & e) const;
 	expair combine_ex_with_coeff_to_pair(const ex & e,
 	                                     const ex & c) const;
@@ -82,15 +84,8 @@ protected:
 	void do_print_csrc(const print_csrc & c, unsigned level) const;
 	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 };
-
-// utility functions
-
-/** Specialization of is_exactly_a<add>(obj) for add objects. */
-template<> inline bool is_exactly_a<add>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_add;
-}
+GINAC_DECLARE_UNARCHIVER(add);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_ADD_H__
+#endif // ndef GINAC_ADD_H