X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffderivative.cpp;h=494b1047768f7a55c4ccbb0919190bfc13dab545;hp=452e07e4399164b04980b3d4d2f7d3c22592b6e6;hb=60dbeb45d93b9610c840eecc9b4d7f5a71f9ab5d;hpb=83a7ee99a947cbbf331018b803ad6be43a9ccd45 diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp index 452e07e4..494b1047 100644 --- a/ginac/fderivative.cpp +++ b/ginac/fderivative.cpp @@ -3,7 +3,7 @@ * Implementation of abstract derivatives of functions. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2017 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,13 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - #include "fderivative.h" #include "operators.h" #include "archive.h" #include "utils.h" +#include + namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function, @@ -40,7 +40,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function, fderivative::fderivative() { - tinfo_key = &fderivative::tinfo_static; } ////////// @@ -50,25 +49,23 @@ fderivative::fderivative() fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args) { parameter_set.insert(param); - tinfo_key = &fderivative::tinfo_static; } fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params) { - tinfo_key = &fderivative::tinfo_static; } -fderivative::fderivative(unsigned ser, const paramset & params, std::auto_ptr vp) : function(ser, vp), parameter_set(params) +fderivative::fderivative(unsigned ser, const paramset & params, exvector && v) : function(ser, std::move(v)), parameter_set(params) { - tinfo_key = &fderivative::tinfo_static; } ////////// // 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; @@ -79,18 +76,18 @@ fderivative::fderivative(const archive_node &n, lst &sym_lst) : inherited(n, sym ++i; } } +GINAC_BIND_UNARCHIVER(fderivative); void fderivative::archive(archive_node &n) const { inherited::archive(n); - paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end(); + auto i = parameter_set.begin(), end = parameter_set.end(); while (i != end) { n.add_unsigned("param", *i); ++i; } } -DEFAULT_UNARCHIVE(fderivative) ////////// // functions overriding virtual functions from base classes @@ -105,7 +102,7 @@ void fderivative::print(const print_context & c, unsigned level) const 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(); + auto i = parameter_set.begin(), end = parameter_set.end(); --end; while (i != end) { c.s << *i++ << ","; @@ -117,7 +114,7 @@ void fderivative::do_print(const print_context & c, unsigned level) const 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(); + auto i = parameter_set.begin(), end = parameter_set.end(); --end; while (i != end) c.s << *i++ << "_"; @@ -132,23 +129,18 @@ void fderivative::do_print_tree(const print_tree & c, unsigned level) const << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec << ", nops=" << nops() << ", params="; - paramset::const_iterator i = parameter_set.begin(), end = parameter_set.end(); + auto 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 1) { - // first evaluate children, then we will end up here again - return fderivative(serial, parameter_set, evalchildren(level)); - } - // No parameters specified? Then return the function itself if (parameter_set.empty()) return function(serial, seq); @@ -160,13 +152,6 @@ ex fderivative::eval(int level) const return this->hold(); } -/** Numeric evaluation falls back to evaluation of arguments. - * @see basic::evalf */ -ex fderivative::evalf(int level) const -{ - return basic::evalf(level); -} - /** The series expansion of derivatives falls back to Taylor expansion. * @see basic::series */ ex fderivative::series(const relational & r, int order, unsigned options) const @@ -179,9 +164,9 @@ ex fderivative::thiscontainer(const exvector & v) const return fderivative(serial, parameter_set, v); } -ex fderivative::thiscontainer(std::auto_ptr vp) const +ex fderivative::thiscontainer(exvector && v) const { - return fderivative(serial, parameter_set, vp); + return fderivative(serial, parameter_set, std::move(v)); } /** Implementation of ex::diff() for derivatives. It applies the chain rule. @@ -230,4 +215,20 @@ bool fderivative::match_same_type(const basic & other) const return parameter_set == o.parameter_set && inherited::match_same_type(other); } +/** Expose this object's derivative structure. + * + * Parameter numbers occurring more than once stand for repeated + * differentiation with respect to that parameter. If a symbolic function + * f(x,y) is differentiated with respect to x, this method will return {0}. + * If f(x,y) is differentiated twice with respect to y, it will return {1,1}. + * (This corresponds to the way this object is printed.) + * + * @return multiset of function's parameter numbers that are abstractly + * differentiated. */ +const paramset& fderivative::derivatives() const +{ + return parameter_set; +} + + } // namespace GiNaC