X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Ffderivative.cpp;h=0671123229824a734e3b9c621cd4996bd3ebc58c;hb=20bd3aad103c4b97f899b29c059caf9e78f49dae;hp=20070b84c90eecc94f4f5ffa657ddca52bb37c6a;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;p=ginac.git

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 20070b84..06711232 100644
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -3,7 +3,7 @@
  *  Implementation of abstract derivatives of functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2006 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,37 +17,31 @@
  *
  *  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
  */
 
 #include <iostream>
 
 #include "fderivative.h"
-#include "print.h"
+#include "operators.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(fderivative, function)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
+  print_func<print_context>(&fderivative::do_print).
+  print_func<print_tree>(&fderivative::do_print_tree))
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructor
 //////////
 
 fderivative::fderivative()
 {
-	tinfo_key = TINFO_fderivative;
+	tinfo_key = &fderivative::tinfo_static;
 }
 
-void fderivative::copy(const fderivative & other)
-{
-	inherited::copy(other);
-	parameter_set = other.parameter_set;
-}
-
-DEFAULT_DESTROY(fderivative)
-
 //////////
 // other constructors
 //////////
@@ -55,24 +49,24 @@ DEFAULT_DESTROY(fderivative)
 fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args)
 {
 	parameter_set.insert(param);
-	tinfo_key = TINFO_fderivative;
+	tinfo_key = &fderivative::tinfo_static;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params)
 {
-	tinfo_key = TINFO_fderivative;
+	tinfo_key = &fderivative::tinfo_static;
 }
 
-fderivative::fderivative(unsigned ser, const paramset & params, exvector * vp) : function(ser, vp), parameter_set(params)
+fderivative::fderivative(unsigned ser, const paramset & params, std::auto_ptr<exvector> vp) : function(ser, vp), parameter_set(params)
 {
-	tinfo_key = TINFO_fderivative;
+	tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
 // archiving
 //////////
 
-fderivative::fderivative(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+fderivative::fderivative(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
 	unsigned i = 0;
 	while (true) {
@@ -103,33 +97,36 @@ DEFAULT_UNARCHIVE(fderivative)
 
 void fderivative::print(const print_context & c, unsigned level) const
 {
-	if (is_a<print_tree>(c)) {
-
-		c.s << std::string(level, ' ') << class_name() << " "
-		    << registered_functions()[serial].name
-		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-		    << ", nops=" << nops()
-		    << ", params=";
-		paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
-		--end;
-		while (i != end)
-			c.s << *i++ << ",";
-		c.s << *i << std::endl;
-		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
-		for (unsigned i=0; i<seq.size(); ++i)
-			seq[i].print(c, level + delta_indent);
-		c.s << std::string(level + delta_indent, ' ') << "=====" << std::endl;
-
-	} else {
-
-		c.s << "D[";
-		paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
-		--end;
-		while (i != end)
-			c.s << *i++ << ",";
-		c.s << *i << "](" << registered_functions()[serial].name << ")";
-		printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
-	}
+	// class function overrides print(), but we don't want that
+	basic::print(c, level);
+}
+
+void fderivative::do_print(const print_context & c, unsigned level) const
+{
+	c.s << "D[";
+	paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
+	--end;
+	while (i != end)
+		c.s << *i++ << ",";
+	c.s << *i << "](" << registered_functions()[serial].name << ")";
+	printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
+}
+
+void fderivative::do_print_tree(const print_tree & c, unsigned level) const
+{
+	c.s << std::string(level, ' ') << class_name() << " "
+	    << registered_functions()[serial].name << " @" << this
+	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+	    << ", nops=" << nops()
+	    << ", params=";
+	paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end();
+	--end;
+	while (i != end)
+		c.s << *i++ << ",";
+	c.s << *i << std::endl;
+	for (size_t i=0; i<seq.size(); ++i)
+		seq[i].print(c, level + c.delta_indent);
+	c.s << std::string(level + c.delta_indent, ' ') << "=====" << std::endl;
 }
 
 ex fderivative::eval(int level) const
@@ -164,12 +161,12 @@ ex fderivative::series(const relational & r, int order, unsigned options) const
 	return basic::series(r, order, options);
 }
 
-ex fderivative::thisexprseq(const exvector & v) const
+ex fderivative::thiscontainer(const exvector & v) const
 {
 	return fderivative(serial, parameter_set, v);
 }
 
-ex fderivative::thisexprseq(exvector * vp) const
+ex fderivative::thiscontainer(std::auto_ptr<exvector> vp) const
 {
 	return fderivative(serial, parameter_set, vp);
 }
@@ -179,7 +176,7 @@ ex fderivative::thisexprseq(exvector * vp) const
 ex fderivative::derivative(const symbol & s) const
 {
 	ex result;
-	for (unsigned i=0; i!=seq.size(); i++) {
+	for (size_t i=0; i<seq.size(); i++) {
 		ex arg_diff = seq[i].diff(s);
 		if (!arg_diff.is_zero()) {
 			paramset ps = parameter_set;