- collect() works better

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 6e261d72b7718f158c42b725ad6079341d8277ff..bf05af9b26b5a14175b33a10e15b6a146743f6bf 100644 (file)
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -23,12 +23,12 @@
 #ifndef __GINAC_SERIES_H__
 #define __GINAC_SERIES_H__
 
-#include <ginac/basic.h>
-#include <ginac/expairseq.h>
+#include "basic.h"
+#include "expairseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** This class holds a extended truncated power series (positive and negative
  *  integer powers). It consists of expression coefficients (only non-zero
@@ -42,15 +42,15 @@ class pseries : public basic
 public:
     pseries();
     ~pseries();
-    pseries(pseries const &other);
-    pseries const &operator=(pseries const &other);
+    pseries(const pseries &other);
+    const pseries &operator=(const pseries &other);
 protected:
-    void copy(pseries const &other);
+    void copy(const pseries &other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    pseries(ex const &var_, ex const &point_, epvector const &ops_);
+    pseries(const ex &var_, const ex &point_, const epvector &ops_);
 
     // functions overriding virtual functions from base classes
 public:
@@ -60,14 +60,17 @@ public:
     unsigned nops(void) const;
     ex op(int i) const;
     ex &let_op(int i);
-    int degree(symbol const &s) const;
-    int ldegree(symbol const &s) const;
-    ex coeff(symbol const &s, int const n=1) const;
+    int degree(const symbol &s) const;
+    int ldegree(const symbol &s) const;
+    ex coeff(const symbol &s, int n=1) const;
+    ex collect(const symbol &s) const;
     ex eval(int level=0) const;
     ex evalf(int level=0) const;
+    ex series(const symbol & s, const ex & p, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex diff(symbol const & s) const;
-    ex subs(lst const & ls, lst const & lr) const;
+    ex subs(const lst & ls, const lst & lr) const;
+protected:
+    ex derivative(const symbol & s) const;
 
     // non-virtual functions in this class
 public:
@@ -92,7 +95,7 @@ protected:
 
 // global constants
 extern const pseries some_pseries;
-extern type_info const & typeid_pseries;
+extern const type_info & typeid_pseries;
 
 /** Return a reference to the pseries object embedded in an expression.
  *  The result is undefined if the expression does not contain a pseries
@@ -119,8 +122,8 @@ inline ex series_to_poly(const ex &e)
        return (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SERIES_H__