X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ffderivative.cpp;h=914c6bdecaa524b0469a689b9276c7a4b901326b;hb=64a4f00f3a6acfff6b9ced47d652515ad764a2e4;hp=1c766996c8b8ae1f1f806e2982dd392302b983bf;hpb=b4be7b0f30fbb6178cf4ee83e1b3952e084bd8ca;p=ginac.git

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 1c766996..914c6bde 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-2007 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,7 +17,7 @@
  *
  *  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>
@@ -57,7 +57,7 @@ fderivative::fderivative(unsigned ser, const paramset & params, const exvector &
 	tinfo_key = TINFO_fderivative;
 }
 
-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;
 }
@@ -95,21 +95,36 @@ DEFAULT_UNARCHIVE(fderivative)
 // functions overriding virtual functions from base classes
 //////////
 
+void fderivative::print(const print_context & c, unsigned level) const
+{
+	// 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 << ")";
+	if (is_a<print_csrc_double>(c)) {
+		c.s << "D_";
+		while (i != end) {
+			c.s << *i++ << "_";
+		}
+		c.s << *i << "_" << registered_functions()[serial].name;
+	} else {
+		c.s << "D[";
+		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
+	    << registered_functions()[serial].name << " @" << this
 	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
 	    << ", nops=" << nops()
 	    << ", params=";
@@ -160,7 +175,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);
 }
@@ -208,7 +223,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