X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.h;h=cdac31da1395e4e7a11c32fbcf159adde8830d1b;hp=fe88508cd7668e928c39a817b94d446edcb05739;hb=ac8c33efafa1c9f62db040db0d974f47229960b8;hpb=3ac17e18ada69428fe170c10abcc5f33a30f0676 diff --git a/ginac/pseries.h b/ginac/pseries.h index fe88508c..cdac31da 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-2006 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2015 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 @@ -20,8 +20,8 @@ * 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" @@ -39,6 +39,7 @@ class pseries : public basic // other constructors public: pseries(const ex &rel_, const epvector &ops_); + pseries(const ex &rel_, epvector &&ops_); // functions overriding virtual functions from base classes public: @@ -56,7 +57,14 @@ public: 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; @@ -112,6 +120,7 @@ protected: /** Expansion point */ ex point; }; +GINAC_DECLARE_UNARCHIVER(pseries); // utility functions @@ -136,4 +145,4 @@ inline bool is_terminating(const pseries & s) } // namespace GiNaC -#endif // ndef __GINAC_SERIES_H__ +#endif // ndef GINAC_SERIES_H