collect_common_factors now works with powers [A.Sheplyakov]

[ginac.git] / ginac / fderivative.cpp

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 1c766996c8b8ae1f1f806e2982dd392302b983bf..296e2939b64c9ffba8cf0865a1d5b1d6a697f1c4 100644 (file)
--- 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-2005 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,6 +95,12 @@ 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[";
@@ -109,7 +115,7 @@ void fderivative::do_print(const print_context & c, unsigned level) const
 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 +166,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);
 }