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 51cb4f104eba044a8c2f5bc458a56c5946792961..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-2000 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
@@ -23,101 +23,66 @@
 #ifndef __GINAC_ADD_H__
 #define __GINAC_ADD_H__
 
-#include <ginac/expairseq.h>
+#include "expairseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
 
 /** Sum of expressions. */
 class add : public expairseq
 {
-    GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
-
-    friend class mul;
-    friend class ncmul;
-    friend class power;
-
-// member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
+       
+       friend class mul;
+       friend class power;
+       
+       // other constructors
 public:
-    add();
-    ~add();
-    add(const add & other);
-    const add & operator=(const add & other);
-protected:
-    void copy(const add & other);
-    void destroy(bool call_parent);
-
-    // other constructors
-public:
-    add(const ex & lh, const ex & rh);
-    add(const exvector & v);
-    add(const epvector & v);
-    //add(const epvector & v, bool do_not_canonicalize=0);
-    add(const epvector & v, const ex & oc);
-    add(epvector * vp, const ex & oc);
-
-    // functions overriding virtual functions from bases classes
+       add(const ex & lh, const ex & rh);
+       add(const exvector & v);
+       add(const epvector & v);
+       add(const epvector & v, const ex & oc);
+       add(epvector * vp, const ex & oc);
+       
+       // functions overriding virtual functions from base classes
 public:
-    basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) 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;
-    ex eval(int level=0) const;
-    ex diff(const symbol & s) const;
-    ex series(const symbol & s, const ex & point, int order) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    numeric integer_content(void) const;
-    ex smod(const numeric &xi) const;
-    numeric max_coefficient(void) const;
-    exvector get_indices(void) const;
-    ex simplify_ncmul(const exvector & v) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       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() const;
+       ex series(const relational & r, int order, unsigned options = 0) const;
+       ex normal(exmap & repl, int level=0) const;
+       numeric integer_content() const;
+       ex smod(const numeric &xi) const;
+       numeric max_coefficient() const;
+       exvector get_free_indices() const;
+       ex eval_ncmul(const exvector & v) const;
 protected:
-    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 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;
-    ex recombine_pair_to_ex(const expair & p) const;
-    ex expand(unsigned options=0) const;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
-    // none
-
-// member variables
-
-protected:
-    static unsigned precedence;
+       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;
+       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;
+       ex expand(unsigned options=0) const;
 };
 
-// global constants
-
-extern const add some_add;
-extern const type_info & typeid_add;
-
 // utility functions
-inline const add &ex_to_add(const ex &e)
+
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
 {
-       return static_cast<const add &>(*e.bp);
+       return obj.tinfo()==TINFO_add;
 }
 
-#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_ADD_H__