X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.h;h=02ef9b652f58595c7368fbcdd32e57c3f594fe4a;hp=370c1f90a44be686fadaae81415c83204e2ee4ec;hb=e45f9fca76b81e01ffa5edc417c29538fa05147b;hpb=0f7b8280ad89fa88a0cbaab7785a4b7cb06e6a63

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 370c1f90..02ef9b65 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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
@@ -17,11 +17,11 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_SERIES_H__
-#define __GINAC_SERIES_H__
+#ifndef GINAC_SERIES_H
+#define GINAC_SERIES_H
 
 #include "basic.h"
 #include "expairseq.h"
@@ -42,7 +42,6 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	unsigned precedence() const {return 38;} // for clarity just below add::precedence
 	size_t nops() const;
 	ex op(size_t i) const;
@@ -56,6 +55,15 @@ public:
 	ex subs(const exmap & m, unsigned options = 0) const;
 	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
 	ex expand(unsigned options = 0) const;
+	ex conjugate() const;
+	ex real_part() const;
+	ex imag_part() const;
+	ex eval_integ() const;
+	ex evalm() const;
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms);
 protected:
 	ex derivative(const symbol & s) const;
 
@@ -83,12 +91,24 @@ public:
 	 *  false otherwise. */
 	bool is_terminating() const;
 
+	/** Get coefficients and exponents. */
+	ex coeffop(size_t i) const;
+	ex exponop(size_t i) 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:
+	void print_series(const print_context & c, const char *openbrace, const char *closebrace, const char *mul_sym, const char *pow_sym, unsigned level) const;
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+	void do_print_python(const print_python & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+
 protected:
 	/** Vector of {coefficient, power} pairs */
 	epvector seq;
@@ -99,16 +119,11 @@ protected:
 	/** Expansion point */
 	ex point;
 };
+GINAC_DECLARE_UNARCHIVER(pseries); 
 
 
 // utility functions
 
-/** Specialization of is_exactly_a<pseries>(obj) for pseries objects. */
-template<> inline bool is_exactly_a<pseries>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_pseries;
-}
-
 /** Convert the pseries object embedded in an expression to an ordinary
  *  polynomial in the expansion variable. The result is undefined if the
  *  expression does not contain a pseries object at its top level.
@@ -129,4 +144,4 @@ inline bool is_terminating(const pseries & s)
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_SERIES_H__
+#endif // ndef GINAC_SERIES_H