X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffderivative.cpp;h=52c5e676541eefcdba7f78213298ba7727da7008;hp=4a93de49e1a181213dda30e639a3cc075bf9d1bf;hb=f01c43a7b5cffea04d34ba3d30b41781255ad5d4;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 4a93de49..52c5e676 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,20 +17,21 @@
  *
  *  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 "operators.h"
-#include "print.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 constructor
@@ -38,7 +39,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(fderivative, function)
 
 fderivative::fderivative()
 {
-	tinfo_key = TINFO_fderivative;
+	tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
@@ -48,17 +49,17 @@ fderivative::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;
 }
 
 //////////
@@ -96,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 (size_t 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
@@ -162,7 +166,7 @@ ex fderivative::thiscontainer(const exvector & v) const
 	return fderivative(serial, parameter_set, v);
 }
 
-ex fderivative::thiscontainer(exvector * vp) const
+ex fderivative::thiscontainer(std::auto_ptr<exvector> vp) const
 {
 	return fderivative(serial, parameter_set, vp);
 }
@@ -210,7 +214,7 @@ bool fderivative::match_same_type(const basic & other) const
 	GINAC_ASSERT(is_a<fderivative>(other));
 	const fderivative & o = static_cast<const fderivative &>(other);
 
-	return parameter_set == o.parameter_set;
+	return parameter_set == o.parameter_set && inherited::match_same_type(other);
 }
 
 } // namespace GiNaC