Fix mul::conjugate().

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 7730bad07deb6ed8fb90eb8ab6b12a4d1f67d7b6..65f59bde36469ebc902e2af5004500f70310b71b 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_MUL_H__
-#define __GINAC_MUL_H__
+#ifndef GINAC_MUL_H
+#define GINAC_MUL_H
 
 #include "expairseq.h"
 
@@ -41,8 +41,8 @@ public:
        mul(const ex & lh, const ex & rh);
        mul(const exvector & v);
        mul(const epvector & v);
-       mul(const epvector & v, const ex & oc);
-       mul(std::auto_ptr<epvector> vp, const ex & oc);
+       mul(const epvector & v, const ex & oc, bool do_index_renaming = false);
+       mul(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false);
        mul(const ex & lh, const ex & mh, const ex & rh);
        
        // functions overriding virtual functions from base classes
@@ -55,6 +55,8 @@ public:
        bool has(const ex & other, unsigned options = 0) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
+       ex real_part() const;
+       ex imag_part() const;
        ex evalm() const;
        ex series(const relational & s, int order, unsigned options = 0) const;
        ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
@@ -62,13 +64,14 @@ public:
        ex smod(const numeric &xi) const;
        numeric max_coefficient() const;
        exvector get_free_indices() const;
+       ex conjugate() const;
 protected:
        ex derivative(const symbol & s) const;
        ex eval_ncmul(const exvector & v) const;
        unsigned return_type() const;
-       tinfo_t 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;
        expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
@@ -79,6 +82,7 @@ protected:
        void combine_overall_coeff(const ex & c1, const ex & c2);
        bool can_make_flat(const expair & p) const;
        ex expand(unsigned options=0) const;
+       void find_real_imag(ex&, ex&) const;
        
        // new virtual functions which can be overridden by derived classes
        // none
@@ -95,7 +99,8 @@ protected:
        static bool can_be_further_expanded(const ex & e);
        std::auto_ptr<epvector> expandchildren(unsigned options) const;
 };
+GINAC_DECLARE_UNARCHIVER(mul);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_MUL_H__
+#endif // ndef GINAC_MUL_H