]> www.ginac.de Git - ginac.git/blobdiff - ginac/fderivative.cpp
Synced to HEAD
[ginac.git] / ginac / fderivative.cpp
index 7f40359bdb10f39c0371632812361db8d695cd04..9bf8b3fefff9ec24770e157c2e8271b9cb796d79 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of abstract derivatives of functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <iostream>
+
 #include "fderivative.h"
-#include "print.h"
+#include "operators.h"
 #include "archive.h"
-#include "debugmsg.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, 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<exvector> vp) : function(ser, vp), parameter_set(params)
 {
-       debugmsg("fderivative constructor from unsigned,paramset,exvector *", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_fderivative;
 }
 
@@ -75,9 +66,8 @@ fderivative::fderivative(unsigned ser, const paramset & params, exvector * vp) :
 // archiving
 //////////
 
-fderivative::fderivative(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+fderivative::fderivative(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("fderivative constructor from archive_node", LOGLEVEL_CONSTRUCT);
        unsigned i = 0;
        while (true) {
                unsigned u;
@@ -85,7 +75,7 @@ fderivative::fderivative(const archive_node &n, const lst &sym_lst) : inherited(
                        parameter_set.insert(u);
                else
                        break;
-               i++;
+               ++i;
        }
 }
 
@@ -107,35 +97,36 @@ DEFAULT_UNARCHIVE(fderivative)
 
 void fderivative::print(const print_context & c, unsigned level) const
 {
-       debugmsg("fderivative print", LOGLEVEL_PRINT);
-
-       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 (unsigned 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
@@ -170,12 +161,12 @@ ex fderivative::series(const relational & r, int order, unsigned options) const
        return basic::series(r, order, options);
 }
 
-ex fderivative::thisexprseq(const exvector & v) const
+ex fderivative::thiscontainer(const exvector & v) const
 {
        return fderivative(serial, parameter_set, v);
 }
 
-ex fderivative::thisexprseq(exvector * vp) const
+ex fderivative::thiscontainer(std::auto_ptr<exvector> vp) const
 {
        return fderivative(serial, parameter_set, vp);
 }
@@ -185,7 +176,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<seq.size(); i++) {
                ex arg_diff = seq[i].diff(s);
                if (!arg_diff.is_zero()) {
                        paramset ps = parameter_set;
@@ -198,7 +189,7 @@ ex fderivative::derivative(const symbol & s) const
 
 int fderivative::compare_same_type(const basic & other) const
 {
-       GINAC_ASSERT(is_of_type(other, fderivative));
+       GINAC_ASSERT(is_a<fderivative>(other));
        const fderivative & o = static_cast<const fderivative &>(other);
 
        if (parameter_set != o.parameter_set)
@@ -209,7 +200,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<fderivative>(other));
        const fderivative & o = static_cast<const fderivative &>(other);
 
        if (parameter_set != o.parameter_set)
@@ -220,7 +211,7 @@ 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<fderivative>(other));
        const fderivative & o = static_cast<const fderivative &>(other);
 
        return parameter_set == o.parameter_set;