X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fintegral.h;h=ac246074f03bf6e7e980da8fee25d6bfc495f3d4;hp=ef2e66269cb212c9219c023ade51d2e41719337d;hb=d8b5a1f3ff5a6b7e89f4dd00b92779f178089299;hpb=c0ba2b239690e1b97aaecb860930b170a2bc1df2

diff --git a/ginac/integral.h b/ginac/integral.h
index ef2e6626..ac246074 100644
--- 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-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,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)
@@ -51,11 +52,16 @@ public:
 	ex expand(unsigned options = 0) const;
 	exvector get_free_indices() const;
 	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
+	return_type_t return_type_tinfo() const;
 	ex conjugate() const;
 	ex eval_integ() 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;
+	ex series(const relational & r, int order, unsigned options = 0) const;
 
 	// new virtual functions which can be overridden by derived classes
 	// none
@@ -73,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,
@@ -93,4 +93,4 @@ GiNaC::ex adaptivesimpson(
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_INTEGRAL_H__
+#endif // ndef GINAC_INTEGRAL_H