- Added warning about too much optimism for Bernoulli numbers.

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index aed1e99ab336be0110fbbea413e933ed35de441c..bf05af9b26b5a14175b33a10e15b6a146743f6bf 100644 (file)
--- 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
@@ -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 symbol & s, const ex & p, 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__