Remove 'level' argument of evalf().

[ginac.git] / ginac / integral.h

diff --git a/ginac/integral.h b/ginac/integral.h
index 22f3ad1c4002a2a37f1aa7e5b30e34f7720ba851..056c4b438bb90a33209303fc193106ec6664bcfa 100644 (file)
--- a/ginac/integral.h
+++ b/ginac/integral.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic  integral. */
 
 /*
- *  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,18 +17,19 @@
  *
  *  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_INTEGRAL_H__
-#define __GINAC_INTEGRAL_H__
+#ifndef GINAC_INTEGRAL_H
+#define GINAC_INTEGRAL_H
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
-/** Product of expressions. */
+/** Symbolic integral. */
 class integral : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(integral, basic)
@@ -39,24 +40,28 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
-       unsigned precedence() const {return 45;}
-       ex eval(int level=0) const;
-       ex evalf(int level=0) const;
-       int degree(const ex & s) const;
-       int ldegree(const ex & s) const;
-       ex eval_ncmul(const exvector & v) const;
-       size_t nops() const;
-       ex op(size_t i) const;
-       ex & let_op(size_t i);
-       ex expand(unsigned options = 0) const;
-       exvector get_free_indices() const;
-       unsigned return_type() const;
-       unsigned return_type_tinfo() const;
-       ex conjugate() const;
-       ex eval_integ() const;
+       unsigned precedence() const override {return 45;}
+       ex eval() const override;
+       ex evalf() const override;
+       int degree(const ex & s) const override;
+       int ldegree(const ex & s) const override;
+       ex eval_ncmul(const exvector & v) const override;
+       size_t nops() const override;
+       ex op(size_t i) const override;
+       ex & let_op(size_t i) override;
+       ex expand(unsigned options = 0) const override;
+       exvector get_free_indices() const override;
+       unsigned return_type() const override;
+       return_type_t return_type_tinfo() const override;
+       ex conjugate() const override;
+       ex eval_integ() 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 series(const relational & r, int order, unsigned options = 0) const;
+       ex derivative(const symbol & s) const override;
+       ex series(const relational & r, int order, unsigned options = 0) const override;
 
        // new virtual functions which can be overridden by derived classes
        // none
@@ -74,16 +79,10 @@ private:
        ex b;
        ex f;
 };
+GINAC_DECLARE_UNARCHIVER(integral); 
 
 // utility functions
 
-/** Specialization of is_exactly_a<integral>(obj) for integral objects. */
-template<> inline bool is_exactly_a<integral>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_integral;
-}
-
-
 GiNaC::ex adaptivesimpson(
        const GiNaC::ex &x,
        const GiNaC::ex &a,
@@ -94,4 +93,4 @@ GiNaC::ex adaptivesimpson(
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_INTEGRAL_H__
+#endif // ndef GINAC_INTEGRAL_H