X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpseries.h;h=26c27306250a03a03177764962efc32734349cfc;hb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;hp=20005473baada848c5e8306a85bd4bb450bc0639;hpb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac;p=ginac.git

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 20005473..26c27306 100644
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -3,7 +3,7 @@
  *  Interface to class for extended truncated power series. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -42,20 +42,19 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	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 precedence(void) const {return 38;} // for clarity just below add::precedence
 	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, bool distributed = false) 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 subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
 	ex expand(unsigned options = 0) const;
 protected:
@@ -63,10 +62,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;
@@ -82,20 +99,15 @@ protected:
 
 	/** Expansion point */
 	ex point;
-
-	static unsigned precedence;
 };
 
-/** Return a reference to the pseries object embedded in an expression.
- *  The result is undefined if the expression does not contain a pseries
- *  object at its top level.
- *
- *  @param e expression
- *  @return reference to pseries object
- *  @see is_ex_of_type */
-inline const pseries &ex_to_pseries(const ex &e)
+
+// utility functions
+
+/** Specialization of is_exactly_a<pseries>(obj) for pseries objects. */
+template<> inline bool is_exactly_a<pseries>(const basic & obj)
 {
-	return static_cast<const pseries &>(*e.bp);
+	return obj.tinfo()==TINFO_pseries;
 }
 
 /** Convert the pseries object embedded in an expression to an ordinary
@@ -104,11 +116,11 @@ inline const pseries &ex_to_pseries(const ex &e)
  *
  *  @param e expression
  *  @return polynomial expression
- *  @see is_ex_of_type
+ *  @see is_a<>
  *  @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 (ex_to<pseries>(e).convert_to_poly(true));
 }
 
 inline bool is_terminating(const pseries & s)