* zeta(n,x) is now zetaderiv(n,s)

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index 0c8e37ca771f4fe371e07ba06f4dbe23fbe8c7e8..f4862c58cfeb6c3375e0795a52c816a93dd1df4e 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums of expressions. */
 
 /*
- *  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
@@ -25,80 +25,71 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Sum of expressions. */
 class add : public expairseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
-
+       
        friend class mul;
-       friend class ncmul;
        friend class power;
-
+       
        // other constructors
 public:
        add(const ex & lh, const ex & rh);
        add(const exvector & v);
        add(const epvector & v);
-       //add(const epvector & v, bool do_not_canonicalize=0);
        add(const epvector & v, const ex & oc);
-       add(epvector * vp, const ex & oc);
-
-       // functions overriding virtual functions from bases classes
+       add(std::auto_ptr<epvector> vp, const ex & oc);
+       
+       // functions overriding virtual functions from base classes
 public:
-       void print(std::ostream & os, unsigned upper_precedence=0) const;
-       void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+       unsigned precedence() const {return 40;}
        bool info(unsigned inf) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
-       ex coeff(const symbol & s, int n=1) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
+       ex coeff(const ex & s, int n=1) const;
        ex eval(int level=0) const;
+       ex evalm() const;
        ex series(const relational & r, int order, unsigned options = 0) const;
-       ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-       numeric integer_content(void) const;
+       ex normal(exmap & repl, exmap & rev_lookup, int level=0) const;
+       numeric integer_content() const;
        ex smod(const numeric &xi) const;
-       numeric max_coefficient(void) const;
-       exvector get_indices(void) const;
-       ex simplify_ncmul(const exvector & v) const;
+       numeric max_coefficient() const;
+       exvector get_free_indices() const;
+       ex eval_ncmul(const exvector & v) const;
 protected:
        ex derivative(const symbol & s) const;
-       bool is_equal_same_type(const basic & other) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
+       unsigned return_type() const;
+       unsigned return_type_tinfo() const;
        ex thisexpairseq(const epvector & v, const ex & oc) const;
-       ex thisexpairseq(epvector * vp, const ex & oc) const;
+       ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
        expair split_ex_to_pair(const ex & e) const;
        expair combine_ex_with_coeff_to_pair(const ex & e,
-                                                                                const ex & c) const;
+                                            const ex & c) const;
        expair combine_pair_with_coeff_to_pair(const expair & p,
-                                                                                  const ex & c) const;
+                                              const ex & c) const;
        ex recombine_pair_to_ex(const expair & p) const;
        ex expand(unsigned options=0) const;
-       
-       // new virtual functions which can be overridden by derived classes
-       // none
-       
-       // non-virtual functions in this class
-       // none
-
-// member variables
 
+       // non-virtual functions in this class
 protected:
-       static unsigned precedence;
+       void print_add(const print_context & c, const char *openbrace, const char *closebrace, const char *mul_sym, unsigned level) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_csrc(const print_csrc & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 };
 
 // utility functions
-inline const add &ex_to_add(const ex &e)
+
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
 {
-       return static_cast<const add &>(*e.bp);
+       return obj.tinfo()==TINFO_add;
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ADD_H__