A better return_type_tinfo() mechanism.

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index d24d37edd8c273e23a65e81c2fc358b3865db993..a11b29b5fd0f3e39ce8966bc400ef880c8a9ee10 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-2001 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
  */
 
 #ifndef __GINAC_MUL_H__
@@ -36,74 +36,69 @@ class mul : public expairseq
        friend class ncmul;
        friend class power;
        
-       // other ctors
+       // other constructors
 public:
        mul(const ex & lh, const ex & rh);
        mul(const exvector & v);
        mul(const epvector & v);
-       mul(const epvector & v, const ex & oc);
-       mul(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 bases classes
+       // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
-       unsigned precedence(void) const {return 50;}
+       unsigned precedence() const {return 50;}
        bool info(unsigned inf) const;
        int degree(const ex & s) const;
        int ldegree(const ex & s) const;
        ex coeff(const ex & s, int n = 1) const;
+       bool has(const ex & other, unsigned options = 0) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
-       ex evalm(void) 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(lst &sym_lst, lst &repl_lst, int level = 0) const;
-       numeric integer_content(void) const;
+       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
+       numeric integer_content() const;
        ex smod(const numeric &xi) const;
-       numeric max_coefficient(void) const;
-       exvector get_free_indices(void) const;
-       ex simplify_ncmul(const exvector & v) const;
+       numeric max_coefficient() const;
+       exvector get_free_indices() const;
 protected:
        ex derivative(const symbol & s) const;
-       bool is_equal_same_type(const basic & other) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
-       ex thisexpairseq(const epvector & v, const ex & oc) const;
-       ex thisexpairseq(epvector * vp, const ex & oc) const;
+       ex eval_ncmul(const exvector & v) const;
+       unsigned return_type() 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;
        ex recombine_pair_to_ex(const expair & p) const;
        bool expair_needs_further_processing(epp it);
-       ex default_overall_coeff(void) const;
+       ex default_overall_coeff() const;
        void combine_overall_coeff(const ex & c);
        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
        
        // non-virtual functions in this class
+public:
+       ex algebraic_subs_mul(const exmap & m, unsigned options) const;
 protected:
-       epvector * expandchildren(unsigned options) const;
+       void print_overall_coeff(const print_context & c, const char *mul_sym) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_csrc(const print_csrc & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+       static bool can_be_further_expanded(const ex & e);
+       std::auto_ptr<epvector> expandchildren(unsigned options) const;
 };
 
-// utility functions
-
-/** Return the mul object handled by an ex.  Deprecated: use ex_to<mul>().
- *  This is unsafe: you need to check the type first. */
-inline const mul &ex_to_mul(const ex &e)
-{
-       return static_cast<const mul &>(*e.bp);
-}
-
-/** Specialization of is_exactly_a<mul>(obj) for mul objects. */
-template<> inline bool is_exactly_a<mul>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_mul;
-}
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_MUL_H__