X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.h;h=2857bb7e7cfc0fcaca4ac39c35a112fdca1c7da4;hp=2ab9bfc9895286842ac3209fea141091a5ce96c4;hb=9d9503cff68b40c4c5f6a2f9eb7ae9b32c53a486;hpb=d448856f20cb58f939ddbf636e7f72e3599b1468

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 2ab9bfc9..2857bb7e 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-2020 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"
@@ -36,37 +36,45 @@ class pseries : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-	// other ctors
+	// other constructors
 public:
 	pseries(const ex &rel_, const epvector &ops_);
+	pseries(const ex &rel_, epvector &&ops_);
 
 	// functions overriding virtual functions from base classes
 public:
-	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 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, bool no_pattern = false) const;
-	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-	ex expand(unsigned options = 0) const;
+	unsigned precedence() const override {return 38;} // for clarity just below add::precedence
+	size_t nops() const override;
+	ex op(size_t i) const override;
+	int degree(const ex &s) const override;
+	int ldegree(const ex &s) const override;
+	ex coeff(const ex &s, int n = 1) const override;
+	ex collect(const ex &s, bool distributed = false) const override;
+	ex eval() const override;
+	ex evalf() const override;
+	ex series(const relational & r, int order, unsigned options = 0) const override;
+	ex subs(const exmap & m, unsigned options = 0) const override;
+	ex normal(exmap & repl, exmap & rev_lookup, lst & modifier) const override;
+	ex expand(unsigned options = 0) const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+	ex eval_integ() const override;
+	ex evalm() const override;
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const override;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	ex derivative(const symbol & s) const;
+	ex derivative(const symbol & s) const override;
 
 	// non-virtual functions in this class
 public:
 	/** Get the expansion variable. */
-	ex get_var(void) const {return var;}
+	ex get_var() const {return var;}
 
 	/** Get the expansion point. */
-	ex get_point(void) const {return point;}
+	ex get_point() const {return point;}
 
 	/** Convert the pseries object to an ordinary polynomial.
 	 *
@@ -78,11 +86,15 @@ public:
 	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;}
+	bool is_zero() 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;
+	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;
@@ -90,6 +102,14 @@ public:
 	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;
@@ -100,16 +120,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.
@@ -130,4 +145,4 @@ inline bool is_terminating(const pseries & s)
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_SERIES_H__
+#endif // ndef GINAC_SERIES_H