X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.h;h=6161a20b9504c50b6997d78ea313fbd6faaf8d22;hp=fb929f2fdf6f1dd1196720b46e3e4d336d0bc0c6;hb=fe05a95540836868b2c0e57c6e61de59bc84a65d;hpb=6d1e12e7c09d1e70d6c76b57aafb213cbcfba6eb

diff --git a/ginac/container.h b/ginac/container.h
index fb929f2f..6161a20b 100644
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -3,7 +3,7 @@
  *  Wrapper template for making GiNaC classes out of STL containers. */
 
 /*
- *  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
@@ -124,7 +124,6 @@ private:
 	STLT & stlt;
 };
 
-
 /** Wrapper template for making GiNaC classes out of STL containers. */
 template <template <class> class C>
 class container : public basic, public container_storage<C> {
@@ -354,7 +353,7 @@ public:
 	container_init<ex, STLT> operator=(const ex & x)
 	{
 		this->seq.push_back(x);
-		return container_init<ex, STLT>(seq);
+		return container_init<ex, STLT>(this->seq);
 	}
 
 	// functions overriding virtual functions from base classes
@@ -368,6 +367,33 @@ public:
 	ex subs(const exmap & m, unsigned options = 0) const;
 
 protected:
+	ex conjugate() const
+	{
+		STLT *newcont = NULL;
+		for (const_iterator i=this->seq.begin(); i!=this->seq.end(); ++i) {
+			if (newcont) {
+				newcont->push_back(i->conjugate());
+				continue;
+			}
+			ex x = i->conjugate();
+			if (are_ex_trivially_equal(x, *i)) {
+				continue;
+			}
+			newcont = new STLT;
+			reserve(*newcont, this->seq.size());
+			for (const_iterator j=this->seq.begin(); j!=i; ++j) {
+				newcont->push_back(*j);
+			}
+			newcont->push_back(x);
+		}
+		if (newcont) {
+			ex result = thiscontainer(*newcont);
+			delete newcont;
+			return result;
+		}
+		return *this;
+	}
+
 	bool is_equal_same_type(const basic & other) const;
 
 	// new virtual functions which can be overridden by derived classes
@@ -476,7 +502,7 @@ void container<C>::do_print(const print_context & c, unsigned level) const
 template <template <class> class C>
 void container<C>::do_print_tree(const print_tree & c, unsigned level) const
 {
-	c.s << std::string(level, ' ') << class_name()
+	c.s << std::string(level, ' ') << class_name() << " @" << this
 	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
 	    << ", nops=" << nops()
 	    << std::endl;
@@ -635,7 +661,7 @@ container<C> & container<C>::sort()
 }
 
 /** Specialization of container::unique_() for std::list. */
-inline void container<std::list>::unique_()
+template<> inline void container<std::list>::unique_()
 {
 	this->seq.unique(ex_is_equal());
 }
@@ -698,8 +724,8 @@ template <template <class> class C>
 std::auto_ptr<typename container<C>::STLT> container<C>::subschildren(const exmap & m, unsigned options) const
 {
 	// returns a NULL pointer if nothing had to be substituted
-	// returns a pointer to a newly created epvector otherwise
-	// (and relinquishes responsibility for the epvector)
+	// returns a pointer to a newly created STLT otherwise
+	// (and relinquishes responsibility for the STLT)
 
 	const_iterator cit = this->seq.begin(), end = this->seq.end();
 	while (cit != end) {