X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpseries.h;h=94646cb6ba0d5729d52b4fc562b863d8ba8cebf4;hb=3a2acdc59138bbe78749f47bf0ccbc585ac2fb87;hp=0b0d92f1fb7466cc6a0840879e9bb93a25e1db5b;hpb=e58227e1112f989f3b5417e497a61d53fc2971fa;p=ginac.git

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 0b0d92f1..94646cb6 100644
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -26,9 +26,7 @@
 #include "basic.h"
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#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
@@ -38,33 +36,20 @@ class pseries : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-	// default constructor, destructor, copy constructor, assignment operator and helpers
-public:
-	pseries();
-	~pseries();
-	pseries(const pseries &other);
-	const pseries &operator=(const pseries &other);
-protected:
-	void copy(const pseries &other);
-	void destroy(bool call_parent);
-
-	// other constructors
+	// other ctors
 public:
 	pseries(const ex &rel_, const epvector &ops_);
 
 	// functions overriding virtual functions from base classes
 public:
-	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;
+	void print(const print_context & c, unsigned level = 0) 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;
+	int degree(const ex &s) const;
+	int ldegree(const ex &s) const;
+	ex coeff(const ex &s, int n = 1) const;
+	ex collect(const ex &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;
@@ -76,10 +61,28 @@ protected:
 
 	// non-virtual functions in this class
 public:
+	/** Get the expansion variable. */
+	ex get_var(void) const {return var;}
+
+	/** Get the expansion point. */
+	ex get_point(void) const {return point;}
+
+	/** Convert the pseries object to an ordinary polynomial.
+	 *
+	 *  @param no_order flag: discard higher order terms */
 	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;}
+
+	/** Check whether series is compatible to another series (expansion
+	 *  variable and point are the same. */
+	bool is_compatible_to(const pseries &other) const {return var.is_equal(other.var) && point.is_equal(other.point);}
+
+	/** Check whether series has the value zero. */
 	bool is_zero(void) const {return seq.size() == 0;}
+
+	/** Returns true if there is no order term, i.e. the series terminates and
+	 *  false otherwise. */
 	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;
@@ -95,6 +98,7 @@ protected:
 
 	/** Expansion point */
 	ex point;
+
 	static unsigned precedence;
 };
 
@@ -128,8 +132,6 @@ inline bool is_terminating(const pseries & s)
 	return s.is_terminating();
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SERIES_H__