- Overwritten: pseries::printtree().

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 0fd9989092e84ed341f04590139e70681b0354f1..9346c2556f8de5291d1aa3b040a3b8cccfac1edf 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
@@ -50,24 +50,28 @@ protected:
 
     // other constructors
 public:
-    pseries(const ex &var_, const ex &point_, const epvector &ops_);
+    pseries(const ex &rel_, const epvector &ops_);
 
     // 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 printtree(ostream & os, unsigned indent) const;
     unsigned nops(void) const;
     ex op(int i) const;
     ex &let_op(int i);
     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 relational & r, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex diff(const symbol & s) const;
     ex subs(const lst & ls, const lst & lr) const;
+protected:
+    ex derivative(const symbol & s) const;
 
     // non-virtual functions in this class
 public:
@@ -119,8 +123,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__