use new-style print methods

[ginac.git] / ginac / fderivative.h

diff --git a/ginac/fderivative.h b/ginac/fderivative.h
index a0b0f512efdc044bf0eece985c2fd0d447eb5713..c165d314135d131693cc0196d9777c45e7d32022 100644 (file)
--- a/ginac/fderivative.h
+++ b/ginac/fderivative.h
@@ -3,7 +3,7 @@
  *  Interface to abstract derivatives of functions. */
 
 /*
  *  Interface to abstract derivatives of functions. */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
  *
  *  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


@@ -60,17 +60,21 @@ public:
 
        // functions overriding virtual functions from base classes
 public:
 
        // functions overriding virtual functions from base classes
 public:

-       void print(const print_context & c, unsigned level = 0) const;

        ex eval(int level = 0) const;
        ex evalf(int level = 0) const;
        ex series(const relational & r, int order, unsigned options = 0) const;
        ex eval(int level = 0) const;
        ex evalf(int level = 0) const;
        ex series(const relational & r, int order, unsigned options = 0) const;

-       ex thisexprseq(const exvector & v) const;
-       ex thisexprseq(exvector * vp) const;
+       ex thiscontainer(const exvector & v) const;
+       ex thiscontainer(exvector * vp) const;

 protected:
        ex derivative(const symbol & s) const;
        bool is_equal_same_type(const basic & other) const;
        bool match_same_type(const basic & other) const;
 
 protected:
        ex derivative(const symbol & s) const;
        bool is_equal_same_type(const basic & other) const;
        bool match_same_type(const basic & other) const;
 

+       // non-virtual functions in this class
+protected:
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_tree(const print_tree & c, unsigned level) const;
+

        // member variables
 protected:
        paramset parameter_set; /**< Set of parameter numbers with respect to which to take the derivative */
        // member variables
 protected:
        paramset parameter_set; /**< Set of parameter numbers with respect to which to take the derivative */