X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.h;h=c0f4c33e9a1763e8f0a3b0214c362e624236a6f7;hp=f1086353a5fb07b1b9bf848c54633d76ad81660a;hb=8964b3c406d085257905a23744271b6c4ebfbfb4;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index f1086353..c0f4c33e 100644
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -3,7 +3,7 @@
  *  Interface to sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -25,6 +25,7 @@
 
 #include <vector>
 #include <list>
+#include <memory>
 // CINT needs <algorithm> to work properly with <vector> and <list>
 #include <algorithm>
 
@@ -48,6 +49,10 @@ typedef epvector::iterator epp;             ///< expair-vector pointer
 typedef std::list<epp> epplist;             ///< list of expair-vector pointers
 typedef std::vector<epplist> epplistvector; ///< vector of epplist
 
+/** Complex conjugate every element of an epvector. Returns zero if this
+ *  does not change anything. */
+epvector* conjugateepvector(const epvector&);
+
 /** A sequence of class expair.
  *  This is used for time-critical classes like sums and products of terms
  *  since handling a list of coeff and rest is much faster than handling a
@@ -66,21 +71,21 @@ public:
 	expairseq(const ex & lh, const ex & rh);
 	expairseq(const exvector & v);
 	expairseq(const epvector & v, const ex & oc);
-	expairseq(epvector * vp, const ex & oc); // vp will be deleted
+	expairseq(std::auto_ptr<epvector>, 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 10;}
 	bool info(unsigned inf) const;
 	size_t nops() const;
 	ex op(size_t i) const;
 	ex map(map_function & f) const;
 	ex eval(int level=0) const;
-	ex to_rational(lst &repl_lst) const;
-	ex to_polynomial(lst &repl_lst) const;
+	ex to_rational(exmap & repl) const;
+	ex to_polynomial(exmap & repl) const;
 	bool match(const ex & pattern, lst & repl_lst) const;
-	ex subs(const lst & ls, const lst & lr, unsigned options = 0) const;
+	ex subs(const exmap & m, unsigned options = 0) const;
+	ex conjugate() const;
 protected:
 	bool is_equal_same_type(const basic & other) const;
 	unsigned return_type() const;
@@ -90,7 +95,7 @@ protected:
 	// new virtual functions which can be overridden by derived classes
 protected:
 	virtual ex thisexpairseq(const epvector & v, const ex & oc) const;
-	virtual ex thisexpairseq(epvector * vp, const ex & oc) const;
+	virtual ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
 	virtual void printseq(const print_context & c, char delim,
 	                      unsigned this_precedence,
 	                      unsigned upper_precedence) const;
@@ -110,6 +115,8 @@ protected:
 	
 	// non-virtual functions in this class
 protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
 	void construct_from_2_ex_via_exvector(const ex & lh, const ex & rh);
 	void construct_from_2_ex(const ex & lh, const ex & rh);
 	void construct_from_2_expairseq(const expairseq & s1,
@@ -144,9 +151,9 @@ protected:
 	                             epvector::const_iterator last_non_zero);
 #endif // EXPAIRSEQ_USE_HASHTAB
 	bool is_canonical() const;
-	epvector * expandchildren(unsigned options) const;
-	epvector * evalchildren(int level) const;
-	epvector * subschildren(const lst & ls, const lst & lr, unsigned options = 0) const;
+	std::auto_ptr<epvector> expandchildren(unsigned options) const;
+	std::auto_ptr<epvector> evalchildren(int level) const;
+	std::auto_ptr<epvector> subschildren(const exmap & m, unsigned options = 0) const;
 	
 // member variables