X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ffderivative.cpp;h=49b33e63ca41a57607c90e2a679d4fd13fca9a63;hb=62168ea93d23c81172ad07f9ec2f7044d1570681;hp=9bf8b3fefff9ec24770e157c2e8271b9cb796d79;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919;p=ginac.git

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 9bf8b3fe..49b33e63 100644
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -3,7 +3,7 @@
  *  Implementation of abstract derivatives of functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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 "archive.h"
 #include "utils.h"
 
+#include <iostream>
+
 namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
   print_func<print_context>(&fderivative::do_print).
+  print_func<print_csrc>(&fderivative::do_print_csrc).
   print_func<print_tree>(&fderivative::do_print_tree))
 
 //////////
@@ -39,7 +40,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
 
 fderivative::fderivative()
 {
-	tinfo_key = TINFO_fderivative;
 }
 
 //////////
@@ -49,25 +49,23 @@ fderivative::fderivative()
 fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args)
 {
 	parameter_set.insert(param);
-	tinfo_key = TINFO_fderivative;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params)
 {
-	tinfo_key = TINFO_fderivative;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, std::auto_ptr<exvector> vp) : function(ser, vp), parameter_set(params)
 {
-	tinfo_key = TINFO_fderivative;
 }
 
 //////////
 // archiving
 //////////
 
-fderivative::fderivative(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void fderivative::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	unsigned i = 0;
 	while (true) {
 		unsigned u;
@@ -78,6 +76,7 @@ fderivative::fderivative(const archive_node &n, lst &sym_lst) : inherited(n, sym
 		++i;
 	}
 }
+GINAC_BIND_UNARCHIVER(fderivative);
 
 void fderivative::archive(archive_node &n) const
 {
@@ -89,7 +88,6 @@ void fderivative::archive(archive_node &n) const
 	}
 }
 
-DEFAULT_UNARCHIVE(fderivative)
 
 //////////
 // functions overriding virtual functions from base classes
@@ -106,12 +104,24 @@ 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)
+	while (i != end) {
 		c.s << *i++ << ",";
+	}
 	c.s << *i << "](" << registered_functions()[serial].name << ")";
 	printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence());
 }
 
+void fderivative::do_print_csrc(const print_csrc & 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() << " "
@@ -214,7 +224,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