X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffderivative.cpp;h=bb8dbd44fe988de887027062eaa1b38a3dd9f30f;hp=319cae202b62ba4922644eeb726253b15e4a31b9;hb=073bf40a73e419a3dbcb6dfa190947ce2cc3bdce;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1 diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp index 319cae20..bb8dbd44 100644 --- a/ginac/fderivative.cpp +++ b/ginac/fderivative.cpp @@ -3,7 +3,7 @@ * Implementation of abstract derivatives of functions. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2011 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,67 +17,55 @@ * * 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 "fderivative.h" -#include "print.h" +#include "operators.h" #include "archive.h" -#include "debugmsg.h" #include "utils.h" +#include + namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(fderivative, function) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function, + print_func(&fderivative::do_print). + print_func(&fderivative::do_print_csrc). + print_func(&fderivative::do_print_tree)) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default constructor ////////// fderivative::fderivative() { - debugmsg("fderivative default constructor", LOGLEVEL_CONSTRUCT); - tinfo_key = TINFO_fderivative; } -void fderivative::copy(const fderivative & other) -{ - inherited::copy(other); - parameter_set = other.parameter_set; -} - -DEFAULT_DESTROY(fderivative) - ////////// // other constructors ////////// fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args) { - debugmsg("fderivative constructor from unsigned,unsigned,exvector", LOGLEVEL_CONSTRUCT); parameter_set.insert(param); - tinfo_key = TINFO_fderivative; } fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params) { - debugmsg("fderivative constructor from unsigned,paramset,exvector", LOGLEVEL_CONSTRUCT); - 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 vp) : function(ser, vp), parameter_set(params) { - debugmsg("fderivative constructor from unsigned,paramset,exvector *", LOGLEVEL_CONSTRUCT); - tinfo_key = TINFO_fderivative; } ////////// // archiving ////////// -fderivative::fderivative(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) +void fderivative::read_archive(const archive_node& n, lst& sym_lst) { - debugmsg("fderivative constructor from archive_node", LOGLEVEL_CONSTRUCT); + inherited::read_archive(n, sym_lst); unsigned i = 0; while (true) { unsigned u; @@ -85,9 +73,10 @@ fderivative::fderivative(const archive_node &n, const lst &sym_lst) : inherited( parameter_set.insert(u); else break; - i++; + ++i; } } +GINAC_BIND_UNARCHIVER(fderivative); void fderivative::archive(archive_node &n) const { @@ -99,7 +88,6 @@ void fderivative::archive(archive_node &n) const } } -DEFAULT_UNARCHIVE(fderivative) ////////// // functions overriding virtual functions from base classes @@ -107,35 +95,48 @@ DEFAULT_UNARCHIVE(fderivative) void fderivative::print(const print_context & c, unsigned level) const { - debugmsg("fderivative print", LOGLEVEL_PRINT); - - if (is_of_type(c, print_tree)) { - - 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 << endl; - unsigned delta_indent = static_cast(c).delta_indent; - for (unsigned i=0; i vp) const { return fderivative(serial, parameter_set, vp); } @@ -185,7 +186,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(other)); const fderivative & o = static_cast(other); if (parameter_set != o.parameter_set) @@ -209,7 +210,7 @@ int fderivative::compare_same_type(const basic & other) const bool fderivative::is_equal_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, fderivative)); + GINAC_ASSERT(is_a(other)); const fderivative & o = static_cast(other); if (parameter_set != o.parameter_set) @@ -220,10 +221,10 @@ bool fderivative::is_equal_same_type(const basic & other) const bool fderivative::match_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, fderivative)); + GINAC_ASSERT(is_a(other)); const fderivative & o = static_cast(other); - return parameter_set == o.parameter_set; + return parameter_set == o.parameter_set && inherited::match_same_type(other); } } // namespace GiNaC