subs() and normal() use maps instead of lists, resulting in a huge performance

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index e04474f23d1cff19e93daf530ac5a95c47fdb150..20faea8b8b35d476cba6e01b73759bd0167d3de5 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-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
@@ -33,7 +33,6 @@ class add : public expairseq
        GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
        
        friend class mul;
-       friend class ncmul;
        friend class power;
        
        // other constructors
@@ -44,28 +43,27 @@ public:
        add(const epvector & v, const ex & oc);
        add(epvector * vp, const ex & oc);
        
-       // 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 40;}
+       unsigned precedence() const {return 40;}
        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;
        ex eval(int level=0) const;
-       ex evalm(void) const;
+       ex evalm() const;
        ex series(const relational & r, 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, 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;
+       ex eval_ncmul(const exvector & v) 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;
+       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;
@@ -79,13 +77,6 @@ protected:
 
 // utility functions
 
-/** Return the add object handled by an ex.
- *  This is unsafe: you need to check the type first. */
-inline const add &ex_to_add(const ex &e)
-{
-       return static_cast<const add &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<add>(obj) for add objects. */
 template<> inline bool is_exactly_a<add>(const basic & obj)
 {