Make (a+b+c+...)^n work for huuuge terms.

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index a13f7fcfd211ba3344639b9e280e2d1084bb1b64..9877ef57a74173bb5246c6b440aa9b0362885808 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 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,11 +20,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_POWER_H__
-#define __GINAC_POWER_H__
+#ifndef GINAC_POWER_H
+#define GINAC_POWER_H
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -44,8 +45,8 @@ class power : public basic
        
        // other constructors
 public:
-       power(const ex & lh, const ex & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
-       template<typename T> power(const ex & lh, const T & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
+       power(const ex & lh, const ex & rh) :  basis(lh), exponent(rh) {}
+       template<typename T> power(const ex & lh, const T & rh) :  basis(lh), exponent(rh) {}
        
        // functions overriding virtual functions from base classes
 public:
@@ -70,6 +71,10 @@ public:
        ex conjugate() const;
        ex real_part() const;
        ex imag_part() 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 eval_ncmul(const exvector & v) const;
@@ -90,7 +95,7 @@ protected:
        void do_print_python_repr(const print_python_repr & c, unsigned level) const;
        void do_print_csrc_cl_N(const print_csrc_cl_N & c, unsigned level) const;
 
-       ex expand_add(const add & a, int n, unsigned options) const;
+       ex expand_add(const add & a, long n, unsigned options) const;
        ex expand_add_2(const add & a, unsigned options) const;
        ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false) const;
        
@@ -100,6 +105,7 @@ protected:
        ex basis;
        ex exponent;
 };
+GINAC_DECLARE_UNARCHIVER(power); 
 
 // wrapper functions
 
@@ -126,4 +132,4 @@ inline ex sqrt(const ex & a)
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_POWER_H__
+#endif // ndef GINAC_POWER_H