X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpseries.h;h=db79e141cddf55f2e727761ee7e5a15d50ebdd3e;hb=f293ecba8b6026a7754795256b2f23910bf70507;hp=aed1e99ab336be0110fbbea413e933ed35de441c;hpb=dbb36db8d02b2c25af6bbfff8135112637936e1f;p=ginac.git

diff --git a/ginac/pseries.h b/ginac/pseries.h
index aed1e99a..db79e141 100644
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -26,9 +26,9 @@
 #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,7 +50,7 @@ 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:
@@ -63,11 +63,14 @@ public:
     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 +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__