X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=081af04a33106f3ef8a7d0669a1e8a70686204b5;hp=f4862c58cfeb6c3375e0795a52c816a93dd1df4e;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=6d7bf9ee5a7ce05cb3a23dae664e781d7325d7b8

diff --git a/ginac/add.h b/ginac/add.h
index f4862c58..081af04a 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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_ADD_H__
-#define __GINAC_ADD_H__
+#ifndef GINAC_ADD_H
+#define GINAC_ADD_H
 
 #include "expairseq.h"
 
@@ -41,37 +41,42 @@ public:
 	add(const exvector & v);
 	add(const epvector & v);
 	add(const epvector & v, const ex & oc);
-	add(std::auto_ptr<epvector> vp, const ex & oc);
+	add(epvector && v);
+	add(epvector && v, const ex & oc);
 	
 	// functions overriding virtual functions from base classes
 public:
-	unsigned precedence() const {return 40;}
-	bool info(unsigned inf) const;
-	int degree(const ex & s) const;
-	int ldegree(const ex & s) const;
-	ex coeff(const ex & s, int n=1) const;
-	ex eval(int level=0) const;
-	ex evalm() const;
-	ex series(const relational & r, int order, unsigned options = 0) const;
-	ex normal(exmap & repl, exmap & rev_lookup, int level=0) const;
-	numeric integer_content() const;
-	ex smod(const numeric &xi) const;
-	numeric max_coefficient() const;
-	exvector get_free_indices() const;
-	ex eval_ncmul(const exvector & v) const;
+	unsigned precedence() const override {return 40;}
+	bool info(unsigned inf) const override;
+	bool is_polynomial(const ex & var) 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 eval() const override;
+	ex evalm() const override;
+	ex series(const relational & r, int order, unsigned options = 0) const override;
+	ex normal(exmap & repl, exmap & rev_lookup) const override;
+	numeric integer_content() const override;
+	ex smod(const numeric &xi) const override;
+	numeric max_coefficient() const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+	exvector get_free_indices() const override;
+	ex eval_ncmul(const exvector & v) const override;
 protected:
-	ex derivative(const symbol & s) const;
-	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
-	ex thisexpairseq(const epvector & v, const ex & oc) const;
-	ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
-	expair split_ex_to_pair(const ex & e) const;
+	ex derivative(const symbol & s) const override;
+	unsigned return_type() const override;
+	return_type_t return_type_tinfo() const override;
+	ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const override;
+	ex thisexpairseq(epvector && vp, const ex & oc, bool do_index_renaming = false) const override;
+	expair split_ex_to_pair(const ex & e) const override;
 	expair combine_ex_with_coeff_to_pair(const ex & e,
-	                                     const ex & c) const;
+	                                     const ex & c) const override;
 	expair combine_pair_with_coeff_to_pair(const expair & p,
-	                                       const ex & c) const;
-	ex recombine_pair_to_ex(const expair & p) const;
-	ex expand(unsigned options=0) const;
+	                                       const ex & c) const override;
+	ex recombine_pair_to_ex(const expair & p) const override;
+	ex expand(unsigned options=0) const override;
 
 	// non-virtual functions in this class
 protected:
@@ -81,15 +86,8 @@ protected:
 	void do_print_csrc(const print_csrc & c, unsigned level) const;
 	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 };
-
-// utility functions
-
-/** Specialization of is_exactly_a<add>(obj) for add objects. */
-template<> inline bool is_exactly_a<add>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_add;
-}
+GINAC_DECLARE_UNARCHIVER(add);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_ADD_H__
+#endif // ndef GINAC_ADD_H