X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.h;h=456cf5c41b69a6005971e6d0680d81efa8d1f4eb;hp=7f9210027d9779c2974d794e9b0c6ee5c2779310;hb=3aec0ba298693329c1194e547043fef1a78b1b0d;hpb=ef2ed9a711c416722c34548015b4ae3621948c1c

diff --git a/ginac/container.h b/ginac/container.h
index 7f921002..456cf5c4 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-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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,26 +20,25 @@
  *  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> class C>
+template <template <class T, class = std::allocator<T> > class C>
 class container_storage {
 protected:
 	typedef C<ex> STLT;
@@ -125,10 +124,9 @@ private:
 };
 
 /** Wrapper template for making GiNaC classes out of STL containers. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 class container : public basic, public container_storage<C> {
 	GINAC_DECLARE_REGISTERED_CLASS(container, basic)
-
 protected:
 	typedef typename container_storage<C>::STLT STLT;
 
@@ -138,14 +136,13 @@ public:
 
 protected:
 	// helpers
-	static tinfo_t get_tinfo() { return NULL; }
 	static unsigned get_default_flags() { return 0; }
 	static char get_open_delim() { return '('; }
 	static char get_close_delim() { return ')'; }
 
 	// constructors
 public:
-	container(STLT const & s, bool discardable = false) : inherited(get_tinfo())
+	container(STLT const & s, bool discardable = false)
 	{
 		setflag(get_default_flags());
 
@@ -155,32 +152,32 @@ public:
 			this->seq = s;
 	}
 
-	explicit container(std::auto_ptr<STLT> vp) : inherited(get_tinfo())
+	explicit container(std::auto_ptr<STLT> vp)
 	{
 		setflag(get_default_flags());
 		this->seq.swap(*vp);
 	}
 
 	container(exvector::const_iterator b, exvector::const_iterator e)
-	 : inherited(get_tinfo()), container_storage<C>(b, e)
+	 : container_storage<C>(b, e)
 	{
 		setflag(get_default_flags());
 	}
 
 	explicit container(const ex & p1)
-	 : inherited(get_tinfo()), container_storage<C>(1, p1)
+	 : container_storage<C>(1, p1)
 	{
 		setflag(get_default_flags());
 	}
 
-	container(const ex & p1, const ex & p2) : inherited(get_tinfo())
+	container(const ex & p1, const ex & p2)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 2);
 		this->seq.push_back(p1); this->seq.push_back(p2);
 	}
 
-	container(const ex & p1, const ex & p2, const ex & p3) : inherited(get_tinfo())
+	container(const ex & p1, const ex & p2, const ex & p3)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 3);
@@ -188,7 +185,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4) : inherited(get_tinfo())
+	          const ex & p4)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 4);
@@ -197,7 +194,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4, const ex & p5) : inherited(get_tinfo())
+	          const ex & p4, const ex & p5)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 5);
@@ -206,7 +203,7 @@ public:
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3,
-	          const ex & p4, const ex & p5, const ex & p6) : inherited(get_tinfo())
+	          const ex & p4, const ex & p5, const ex & p6)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 6);
@@ -216,7 +213,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7) : inherited(get_tinfo())
+	          const ex & p7)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 7);
@@ -227,7 +224,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7, const ex & p8) : inherited(get_tinfo())
+	          const ex & p7, const ex & p8)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 8);
@@ -238,7 +235,7 @@ public:
 
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
-	          const ex & p7, const ex & p8, const ex & p9) : inherited(get_tinfo())
+	          const ex & p7, const ex & p8, const ex & p9)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 9);
@@ -250,7 +247,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10) : inherited(get_tinfo())
+	          const ex & p10)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 10);
@@ -263,7 +260,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10, const ex & p11) : inherited(get_tinfo())
+	          const ex & p10, const ex & p11)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 11);
@@ -276,7 +273,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
-	          const ex & p10, const ex & p11, const ex & p12) : inherited(get_tinfo())
+	          const ex & p10, const ex & p11, const ex & p12)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 12);
@@ -290,7 +287,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13) : inherited(get_tinfo())
+	          const ex & p13)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 13);
@@ -305,7 +302,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13, const ex & p14) : inherited(get_tinfo())
+	          const ex & p13, const ex & p14)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 14);
@@ -320,7 +317,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
-	          const ex & p13, const ex & p14, const ex & p15) : inherited(get_tinfo())
+	          const ex & p13, const ex & p14, const ex & p15)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 15);
@@ -336,7 +333,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12,
 	          const ex & p13, const ex & p14, const ex & p15,
-	          const ex & p16) : inherited(get_tinfo())
+	          const ex & p16)
 	{
 		setflag(get_default_flags());
 		reserve(this->seq, 16);
@@ -367,6 +364,33 @@ public:
 	ex eval(int level = 0) const;
 	ex subs(const exmap & m, unsigned options = 0) const;
 
+	void read_archive(const archive_node &n, lst &sym_lst) 
+	{
+		inherited::read_archive(n, sym_lst);
+		setflag(get_default_flags());
+
+		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);
+		for (archive_node::archive_node_cit i=first; i<last; ++i) {
+			ex e;
+			n.find_ex_by_loc(i, e, sym_lst);
+			this->seq.push_back(e);
+		}
+	}
+
+	/** Archive the object. */
+	void archive(archive_node &n) const
+	{
+		inherited::archive(n);
+		const_iterator i = this->seq.begin(), end = this->seq.end();
+		while (i != end) {
+			n.add_ex("seq", *i);
+			++i;
+		}
+	}
+
 protected:
 	ex conjugate() const
 	{
@@ -475,54 +499,21 @@ protected:
 };
 
 /** Default constructor */
-template <template <class> class C>
-container<C>::container() : inherited(get_tinfo())
-{
-	setflag(get_default_flags());
-}
-
-/** Construct object from archive_node. */
-template <template <class> class C>
-container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+template <template <class T, class = std::allocator<T> > class C>
+container<C>::container()
 {
 	setflag(get_default_flags());
-
-	for (unsigned int i=0; true; i++) {
-		ex e;
-		if (n.find_ex("seq", e, sym_lst, i))
-			this->seq.push_back(e);
-		else
-			break;
-	}
-}
-
-/** Unarchive the object. */
-template <template <class> class C>
-ex container<C>::unarchive(const archive_node &n, lst &sym_lst)
-{
-	return (new container(n, sym_lst))->setflag(status_flags::dynallocated);
 }
 
-/** Archive the object. */
-template <template <class> class C>
-void container<C>::archive(archive_node &n) const
-{
-	inherited::archive(n);
-	const_iterator i = this->seq.begin(), end = this->seq.end();
-	while (i != end) {
-		n.add_ex("seq", *i);
-		++i;
-	}
-}
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 void container<C>::do_print(const print_context & c, unsigned level) const
 {
 	// always print brackets around seq, ignore upper_precedence
 	printseq(c, get_open_delim(), ',', get_close_delim(), precedence(), precedence()+1);
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 void container<C>::do_print_tree(const print_tree & c, unsigned level) const
 {
 	c.s << std::string(level, ' ') << class_name() << " @" << this
@@ -537,20 +528,20 @@ void container<C>::do_print_tree(const print_tree & c, unsigned level) const
 	c.s << std::string(level + c.delta_indent,' ') << "=====" << std::endl;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 void container<C>::do_print_python(const print_python & c, unsigned level) const
 {
 	printseq(c, '[', ',', ']', precedence(), precedence()+1);
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 void container<C>::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
 	c.s << class_name();
 	printseq(c, '(', ',', ')', precedence(), precedence()+1);
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 ex container<C>::op(size_t i) const
 {
 	GINAC_ASSERT(i < nops());
@@ -560,7 +551,7 @@ ex container<C>::op(size_t i) const
 	return *it;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 ex & container<C>::let_op(size_t i)
 {
 	GINAC_ASSERT(i < nops());
@@ -571,7 +562,7 @@ ex & container<C>::let_op(size_t i)
 	return *it;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 ex container<C>::eval(int level) const
 {
 	if (level == 1)
@@ -580,18 +571,34 @@ ex container<C>::eval(int level) const
 		return thiscontainer(evalchildren(level));
 }
 
-template <template <class> class C>
+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. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 int container<C>::compare_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_a<container>(other));
@@ -610,7 +617,7 @@ int container<C>::compare_same_type(const basic & other) const
 	return (it1 == it1end) ? (it2 == it2end ? 0 : -1) : 1;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 bool container<C>::is_equal_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_a<container>(other));
@@ -630,7 +637,7 @@ bool container<C>::is_equal_same_type(const basic & other) const
 }
 
 /** Add element at front. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::prepend(const ex & b)
 {
 	ensure_if_modifiable();
@@ -639,7 +646,7 @@ container<C> & container<C>::prepend(const ex & b)
 }
 
 /** Add element at back. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::append(const ex & b)
 {
 	ensure_if_modifiable();
@@ -648,7 +655,7 @@ container<C> & container<C>::append(const ex & b)
 }
 
 /** Remove first element. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::remove_first()
 {
 	ensure_if_modifiable();
@@ -657,7 +664,7 @@ container<C> & container<C>::remove_first()
 }
 
 /** Remove last element. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::remove_last()
 {
 	ensure_if_modifiable();
@@ -666,7 +673,7 @@ container<C> & container<C>::remove_last()
 }
 
 /** Remove all elements. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::remove_all()
 {
 	ensure_if_modifiable();
@@ -675,7 +682,7 @@ container<C> & container<C>::remove_all()
 }
 
 /** Sort elements. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::sort()
 {
 	ensure_if_modifiable();
@@ -690,7 +697,7 @@ template<> inline void container<std::list>::unique_()
 }
 
 /** Remove adjacent duplicate elements. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 container<C> & container<C>::unique()
 {
 	ensure_if_modifiable();
@@ -699,7 +706,7 @@ container<C> & container<C>::unique()
 }
 
 /** Print sequence of contained elements. */
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 void container<C>::printseq(const print_context & c, char openbracket, char delim,
                             char closebracket, unsigned this_precedence,
                             unsigned upper_precedence) const
@@ -722,7 +729,7 @@ void container<C>::printseq(const print_context & c, char openbracket, char deli
 		c.s << closebracket;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>
 typename container<C>::STLT container<C>::evalchildren(int level) const
 {
 	if (level == 1)
@@ -743,7 +750,7 @@ typename container<C>::STLT container<C>::evalchildren(int level) const
 	return s;
 }
 
-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > 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
@@ -780,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