Improved dummy index renaming.

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index d636d0ad1026f272c8721443a9d2e9cad7cc9627..ed989f4f85a6a1776232e83d65a59f0e8441b475 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2006 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
  */
 
 #ifndef __GINAC_ADD_H__
@@ -41,7 +41,7 @@ public:
        add(const exvector & v);
        add(const epvector & v);
        add(const epvector & v, const ex & oc);
-       add(epvector * vp, const ex & oc);
+       add(std::auto_ptr<epvector> vp, const ex & oc);
        
        // functions overriding virtual functions from base classes
 public:
@@ -57,14 +57,17 @@ public:
        numeric integer_content() const;
        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(epvector * vp, const ex & oc) const;
+       tinfo_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,14 +85,6 @@ protected:
        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;
-}
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_ADD_H__