X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fadd.h;h=ca7b9d57d706c61cca10556be7644af8a206c831;hb=6ff0e774b835301799d3f4618566759d562a17cb;hp=f2a94ed416db167f881c8cd258b21621c2bdc80d;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;p=ginac.git

diff --git a/ginac/add.h b/ginac/add.h
index f2a94ed4..ca7b9d57 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-2005 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,7 +17,7 @@
  *
  *  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__
@@ -41,11 +41,10 @@ public:
 	add(const exvector & v);
 	add(const epvector & v);
 	add(const epvector & v, const ex & oc);
-	add(epvector * vp, const ex & oc);
+	add(std::auto_ptr<epvector> vp, const ex & oc);
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	unsigned precedence() const {return 40;}
 	bool info(unsigned inf) const;
 	int degree(const ex & s) const;
@@ -54,10 +53,11 @@ public:
 	ex eval(int level=0) const;
 	ex evalm() const;
 	ex series(const relational & r, int order, unsigned options = 0) const;
-	ex normal(lst &sym_lst, lst &repl_lst, int level=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;
+	ex conjugate() const;
 	exvector get_free_indices() const;
 	ex eval_ncmul(const exvector & v) const;
 protected:
@@ -65,7 +65,7 @@ protected:
 	unsigned return_type() const;
 	unsigned return_type_tinfo() const;
 	ex thisexpairseq(const epvector & v, const ex & oc) const;
-	ex thisexpairseq(epvector * vp, const ex & oc) const;
+	ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
 	expair split_ex_to_pair(const ex & e) const;
 	expair combine_ex_with_coeff_to_pair(const ex & e,
 	                                     const ex & c) const;
@@ -73,6 +73,14 @@ protected:
 	                                       const ex & c) const;
 	ex recombine_pair_to_ex(const expair & p) const;
 	ex expand(unsigned options=0) const;
+
+	// non-virtual functions in this class
+protected:
+	void print_add(const print_context & c, const char *openbrace, const char *closebrace, const char *mul_sym, unsigned level) const;
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	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