- pseries::print(): did not insert parenthesis when needed for precedence.

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 8f041d38d0ec6f08a0732859b7830f93b952f0d2..0ddb590f1e6d4d6c7d20bc12fb0dba02473c59e6 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
@@ -36,60 +36,71 @@ namespace GiNaC {
  *  Other classes must provide members to convert into this type. */
 class pseries : public basic
 {
-    GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
+       GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-    // default constructor, destructor, copy constructor, assignment operator and helpers
+       // default constructor, destructor, copy constructor, assignment operator and helpers
 public:
-    pseries();
-    ~pseries();
-    pseries(pseries const &other);
-    pseries const &operator=(pseries const &other);
+       pseries();
+       ~pseries();
+       pseries(const pseries &other);
+       const pseries &operator=(const pseries &other);
 protected:
-    void copy(pseries const &other);
-    void destroy(bool call_parent);
+       void copy(const pseries &other);
+       void destroy(bool call_parent);
 
-    // other constructors
+       // 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
+       // 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;
-    int degree(symbol const &s) const;
-    int ldegree(symbol const &s) const;
-    ex coeff(symbol const &s, int const n=1) 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;
-
-    // non-virtual functions in this class
+       basic *duplicate() 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(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, 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;}
-    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;
+       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 */
-    epvector seq;
+       /** Vector of {coefficient, power} pairs */
+       epvector seq;
 
-    /** Series variable (holds a symbol) */
-    ex var;
+       /** Series variable (holds a symbol) */
+       ex var;
 
-    /** Expansion point */
-    ex point;
+       /** Expansion point */
+       ex point;
+       static unsigned precedence;
 };
 
 // global constants
 extern const pseries some_pseries;
-extern type_info const & typeid_pseries;
+extern const std::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
@@ -116,8 +127,13 @@ inline ex series_to_poly(const ex &e)
        return (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
 }
 
-#ifndef NO_GINAC_NAMESPACE
+inline bool is_terminating(const pseries & s)
+{
+       return s.is_terminating();
+}
+
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SERIES_H__