normal() uses an additional reverse lookup map

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index c6d607dbeb844a71cbd0fd2ce98aa20267db0d1d..12e7e48d8809fa8fbc2daa303cbd9f32d73aa988 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
  *  Interface to GiNaC's products of expressions. */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
  *
  *  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


@@ -25,19 +25,17 @@
 
 #include "expairseq.h"
 
 
 #include "expairseq.h"
 

-#ifndef NO_NAMESPACE_GINAC

 namespace GiNaC {
 namespace GiNaC {

-#endif // ndef NO_NAMESPACE_GINAC

 
 /** Product of expressions. */
 class mul : public expairseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(mul, expairseq)
 
 /** Product of expressions. */
 class mul : public expairseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(mul, expairseq)

-
+       

        friend class add;
        friend class ncmul;
        friend class power;
        friend class add;
        friend class ncmul;
        friend class power;

-
+       

        // other constructors
 public:
        mul(const ex & lh, const ex & rh);
        // other constructors
 public:
        mul(const ex & lh, const ex & rh);


@@ -46,42 +44,37 @@ public:
        mul(const epvector & v, const ex & oc);
        mul(epvector * vp, const ex & oc);
        mul(const ex & lh, const ex & mh, const ex & rh);
        mul(const epvector & v, const ex & oc);
        mul(epvector * vp, const ex & oc);
        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:
 public:

-       basic * duplicate() const;
-       void print(std::ostream & os, unsigned upper_precedence) const;
-       void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       unsigned precedence() const {return 50;}

        bool info(unsigned inf) const;
        bool info(unsigned inf) const;

-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
-       ex coeff(const symbol & s, int n = 1) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
+       ex coeff(const ex & s, int n = 1) const;

        ex eval(int level=0) const;
        ex evalf(int level=0) const;
        ex eval(int level=0) const;
        ex evalf(int level=0) const;

+       ex evalm() const;

        ex series(const relational & s, int order, unsigned options = 0) 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;
        ex smod(const numeric &xi) const;

-       numeric max_coefficient(void) const;
-       exvector get_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;
 protected:
        ex derivative(const symbol & s) const;

-       int compare_same_type(const basic & other) const;
-       bool is_equal_same_type(const basic & other) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
+       ex eval_ncmul(const exvector & v) 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;
        expair split_ex_to_pair(const ex & e) const;
        ex thisexpairseq(const epvector & v, const ex & oc) const;
        ex thisexpairseq(epvector * vp, const ex & oc) 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;
+       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 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;
        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;


@@ -89,25 +82,22 @@ protected:
        
        // new virtual functions which can be overridden by derived classes
        // none
        
        // new virtual functions which can be overridden by derived classes
        // none

-
+       

        // non-virtual functions in this class
        // non-virtual functions in this class

+public:
+       ex algebraic_subs_mul(const exmap & m, unsigned options) const;

 protected:
        epvector * expandchildren(unsigned options) const;
 protected:
        epvector * expandchildren(unsigned options) const;

-
-// member variables
-
-protected:
-       static unsigned precedence;

 };
 
 // utility functions
 };
 
 // utility functions

-inline const mul &ex_to_mul(const ex &e)
+
+/** Specialization of is_exactly_a<mul>(obj) for mul objects. */
+template<> inline bool is_exactly_a<mul>(const basic & obj)

 {
 {

-       return static_cast<const mul &>(*e.bp);
+       return obj.tinfo()==TINFO_mul;

 }
 
 }
 

-#ifndef NO_NAMESPACE_GINAC

 } // namespace GiNaC
 } // namespace GiNaC

-#endif // ndef NO_NAMESPACE_GINAC

 
 #endif // ndef __GINAC_MUL_H__
 
 #endif // ndef __GINAC_MUL_H__