Remove 'level' argument of normal().

[ginac.git] / ginac / pseries.h

diff --git a/ginac/pseries.h b/ginac/pseries.h
index fd2a0428d6c928dadf6633c4ee3635f62839476e..953c71a531d1729a683ff7ff7105d8eb93a84732 100644 (file)
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -3,7 +3,7 @@
  *  Interface to class for extended truncated power series. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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"
@@ -39,25 +39,34 @@ 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:
-       unsigned precedence() const {return 38;} // for clarity just below add::precedence
-       size_t nops() const;
-       ex op(size_t i) 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 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;
+       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) 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:
@@ -83,6 +92,10 @@ 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;
@@ -107,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.
@@ -137,4 +145,4 @@ inline bool is_terminating(const pseries & s)
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_SERIES_H__
+#endif // ndef GINAC_SERIES_H