X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.h;h=e2b0a945fa983ca8dd828425389cbe9eb5857602;hp=c13459492a201baa0b45b9817899e5aa1a58496b;hb=073bf40a73e419a3dbcb6dfa190947ce2cc3bdce;hpb=d327f3f00c66a79d42855939866047b3e8caa630

diff --git a/ginac/container.h b/ginac/container.h
index c1345949..e2b0a945 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-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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,23 +20,22 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_CONTAINER_H__
-#define __GINAC_CONTAINER_H__
-
-#include <iterator>
-#include <stdexcept>
-#include <algorithm>
-#include <vector>
-#include <list>
-#include <memory>
+#ifndef GINAC_CONTAINER_H
+#define GINAC_CONTAINER_H
 
 #include "ex.h"
 #include "print.h"
 #include "archive.h"
 #include "assertion.h"
 
-namespace GiNaC {
+#include <algorithm>
+#include <iterator>
+#include <list>
+#include <memory>
+#include <stdexcept>
+#include <vector>
 
+namespace GiNaC {
 
 /** Helper template for encapsulating the reserve() mechanics of STL containers. */
 template <template <class T, class = std::allocator<T> > class C>
@@ -174,14 +173,14 @@ public:
 	container(const ex & p1, const ex & p2)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 2);
+		this->reserve(this->seq, 2);
 		this->seq.push_back(p1); this->seq.push_back(p2);
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 3);
+		this->reserve(this->seq, 3);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 	}
 
@@ -189,7 +188,7 @@ public:
 	          const ex & p4)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 4);
+		this->reserve(this->seq, 4);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4);
 	}
@@ -198,7 +197,7 @@ public:
 	          const ex & p4, const ex & p5)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 5);
+		this->reserve(this->seq, 5);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5);
 	}
@@ -207,7 +206,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 6);
+		this->reserve(this->seq, 6);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 	}
@@ -217,7 +216,7 @@ public:
 	          const ex & p7)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 7);
+		this->reserve(this->seq, 7);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7);
@@ -228,7 +227,7 @@ public:
 	          const ex & p7, const ex & p8)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 8);
+		this->reserve(this->seq, 8);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8);
@@ -239,7 +238,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 9);
+		this->reserve(this->seq, 9);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -251,7 +250,7 @@ public:
 	          const ex & p10)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 10);
+		this->reserve(this->seq, 10);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -264,7 +263,7 @@ public:
 	          const ex & p10, const ex & p11)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 11);
+		this->reserve(this->seq, 11);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -277,7 +276,7 @@ public:
 	          const ex & p10, const ex & p11, const ex & p12)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 12);
+		this->reserve(this->seq, 12);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -291,7 +290,7 @@ public:
 	          const ex & p13)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 13);
+		this->reserve(this->seq, 13);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -306,7 +305,7 @@ public:
 	          const ex & p13, const ex & p14)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 14);
+		this->reserve(this->seq, 14);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -321,7 +320,7 @@ public:
 	          const ex & p13, const ex & p14, const ex & p15)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 15);
+		this->reserve(this->seq, 15);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -337,7 +336,7 @@ public:
 	          const ex & p16)
 	{
 		setflag(get_default_flags());
-		reserve(this->seq, 16);
+		this->reserve(this->seq, 16);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
 		this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
@@ -373,7 +372,7 @@ public:
 		archive_node::archive_node_cit first = n.find_first("seq");
 		archive_node::archive_node_cit last = n.find_last("seq");
 		++last;
-		reserve(this->seq, last - first);
+		this->reserve(this->seq, last - first);
 		for (archive_node::archive_node_cit i=first; i<last; ++i) {
 			ex e;
 			n.find_ex_by_loc(i, e, sym_lst);
@@ -406,7 +405,7 @@ protected:
 				continue;
 			}
 			newcont = new STLT;
-			reserve(*newcont, this->seq.size());
+			this->reserve(*newcont, this->seq.size());
 			for (const_iterator j=this->seq.begin(); j!=i; ++j) {
 				newcont->push_back(*j);
 			}
@@ -423,7 +422,7 @@ protected:
 	ex real_part() const
 	{
 		STLT cont;
-		reserve(cont, nops());
+		this->reserve(cont, nops());
 		const_iterator b = begin();
 		const_iterator e = end();
 		for(const_iterator i=b; i!=e; ++i)
@@ -434,7 +433,7 @@ protected:
 	ex imag_part() const
 	{
 		STLT cont;
-		reserve(cont, nops());
+		this->reserve(cont, nops());
 		const_iterator b = begin();
 		const_iterator e = end();
 		for(const_iterator i=b; i!=e; ++i)
@@ -575,11 +574,27 @@ ex container<C>::eval(int level) const
 template <template <class T, class = std::allocator<T> > class C>
 ex container<C>::subs(const exmap & m, unsigned options) const
 {
+	// After having subs'ed all children, this method subs'es one final
+	// level, but only if the intermediate result is a container! This is
+	// because if the intermediate result has eval'ed to a non-container a
+	// last level substitution would be wrong, as this example involving a
+	// function f and its inverse f^-1 shows:
+	// f(x).subs(x==f^-1(x))
+	//   -> f(f^-1(x))  [subschildren]
+	//   -> x           [eval]   /* must not subs(x==f^-1(x))! */
 	std::auto_ptr<STLT> vp = subschildren(m, options);
-	if (vp.get())
-		return ex_to<basic>(thiscontainer(vp)).subs_one_level(m, options);
-	else
-		return subs_one_level(m, options);
+	if (vp.get()) {
+		ex result(thiscontainer(vp));
+		if (is_a<container<C> >(result))
+			return ex_to<basic>(result).subs_one_level(m, options);
+		else
+			return result;
+	} else {
+		if (is_a<container<C> >(*this))
+			return subs_one_level(m, options);
+		else
+			return *this;
+	}
 }
 
 /** Compare two containers of the same type. */
@@ -723,7 +738,7 @@ typename container<C>::STLT container<C>::evalchildren(int level) const
 		throw std::runtime_error("max recursion level reached");
 
 	STLT s;
-	reserve(s, this->seq.size());
+	this->reserve(s, this->seq.size());
 
 	--level;
 	const_iterator it = this->seq.begin(), itend = this->seq.end();
@@ -749,7 +764,7 @@ std::auto_ptr<typename container<C>::STLT> container<C>::subschildren(const exma
 
 			// copy first part of seq which hasn't changed
 			std::auto_ptr<STLT> s(new STLT(this->seq.begin(), cit));
-			reserve(*s, this->seq.size());
+			this->reserve(*s, this->seq.size());
 
 			// insert changed element
 			s->push_back(subsed_ex);
@@ -772,4 +787,4 @@ std::auto_ptr<typename container<C>::STLT> container<C>::subschildren(const exma
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_CONTAINER_H__
+#endif // ndef GINAC_CONTAINER_H