- Fixed the bug that broke xloop's po_redux.

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 6e261d72b7718f158c42b725ad6079341d8277ff..489757244f98c1e11325d4c2f9fc93254091d3fb 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,42 +42,49 @@ 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 &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 print(std::ostream &os, unsigned upper_precedence = 0) const;
+    void printraw(std::ostream &os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
     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 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 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 expand(unsigned options = 0) const;
+protected:
+    ex derivative(const symbol & s) const;
 
     // non-virtual functions in this class
 public:
     ex convert_to_poly(bool no_order = false) const;
     bool is_compatible_to(const pseries &other) const {return var.compare(other.var) == 0 && point.compare(other.point) == 0;}
     bool is_zero(void) const {return seq.size() == 0;}
+    bool is_terminating(void) const;
     ex add_series(const pseries &other) const;
     ex mul_const(const numeric &other) const;
     ex mul_series(const pseries &other) const;
     ex power_const(const numeric &p, int deg) const;
+    pseries shift_exponents(int deg) const;
 
 protected:
     /** Vector of {coefficient, power} pairs */
@@ -92,7 +99,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
@@ -103,7 +110,7 @@ extern type_info const & typeid_pseries;
  *  @see is_ex_of_type */
 inline const pseries &ex_to_pseries(const ex &e)
 {
-       return static_cast<const pseries &>(*e.bp);
+    return static_cast<const pseries &>(*e.bp);
 }
 
 /** Convert the pseries object embedded in an expression to an ordinary
@@ -116,11 +123,16 @@ inline const pseries &ex_to_pseries(const ex &e)
  *  @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 (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
+}
+
+inline bool is_terminating(const pseries & s)
+{
+    return s.is_terminating();
 }
 
-#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__