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

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 18baed39f36461792a5849110762f46475a4cded..5dbdc66e245e31093e773ffbde870f008e3c08fd 100644 (file)
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -3,7 +3,7 @@
  *  Interface to class for extended truncated power series. */
 
 /*
- *  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
@@ -36,17 +36,16 @@ class pseries : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-       // other ctors
+       // other constructors
 public:
        pseries(const ex &rel_, const epvector &ops_);
 
        // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
-       unsigned precedence(void) const {return 38;} // for clarity just below add::precedence
-       unsigned nops(void) const;
-       ex op(int i) const;
-       ex &let_op(int i);
+       unsigned precedence() const {return 38;} // for clarity just below add::precedence
+       size_t nops() const;
+       ex op(size_t i) const;
        int degree(const ex &s) const;
        int ldegree(const ex &s) const;
        ex coeff(const ex &s, int n = 1) const;
@@ -54,8 +53,8 @@ public:
        ex eval(int level=0) const;
        ex evalf(int level=0) const;
        ex series(const relational & r, int order, unsigned options = 0) const;
-       ex subs(const lst & ls, const lst & lr) const;
-       ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
+       ex subs(const exmap & m, unsigned options = 0) const;
+       ex normal(exmap & repl, int level = 0) const;
        ex expand(unsigned options = 0) const;
 protected:
        ex derivative(const symbol & s) const;
@@ -63,10 +62,10 @@ protected:
        // non-virtual functions in this class
 public:
        /** Get the expansion variable. */
-       ex get_var(void) const {return var;}
+       ex get_var() const {return var;}
 
        /** Get the expansion point. */
-       ex get_point(void) const {return point;}
+       ex get_point() const {return point;}
 
        /** Convert the pseries object to an ordinary polynomial.
         *
@@ -78,11 +77,11 @@ public:
        bool is_compatible_to(const pseries &other) const {return var.is_equal(other.var) && point.is_equal(other.point);}
 
        /** Check whether series has the value zero. */
-       bool is_zero(void) const {return seq.size() == 0;}
+       bool is_zero() const {return seq.size() == 0;}
 
        /** Returns true if there is no order term, i.e. the series terminates and
         *  false otherwise. */
-       bool is_terminating(void) const;
+       bool is_terminating() const;
 
        ex add_series(const pseries &other) const;
        ex mul_const(const numeric &other) const;
@@ -101,16 +100,13 @@ protected:
        ex point;
 };
 
-/** Return a reference to the pseries object embedded in an expression.
- *  The result is undefined if the expression does not contain a pseries
- *  object at its top level.
- *
- *  @param e expression
- *  @return reference to pseries object
- *  @see is_ex_of_type */
-inline const pseries &ex_to_pseries(const ex &e)
+
+// utility functions
+
+/** Specialization of is_exactly_a<pseries>(obj) for pseries objects. */
+template<> inline bool is_exactly_a<pseries>(const basic & obj)
 {
-       return static_cast<const pseries &>(*e.bp);
+       return obj.tinfo()==TINFO_pseries;
 }
 
 /** Convert the pseries object embedded in an expression to an ordinary
@@ -119,11 +115,11 @@ inline const pseries &ex_to_pseries(const ex &e)
  *
  *  @param e expression
  *  @return polynomial expression
- *  @see is_ex_of_type
+ *  @see is_a<>
  *  @see pseries::convert_to_poly */
 inline ex series_to_poly(const ex &e)
 {
-       return (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
+       return (ex_to<pseries>(e).convert_to_poly(true));
 }
 
 inline bool is_terminating(const pseries & s)