Happy New Year!

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index 738d09b337ca5565b3f3ab246bc2fa1db6357b7a..081af04a33106f3ef8a7d0669a1e8a70686204b5 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-2019 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,11 +17,11 @@
  *
  *  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
  */
 
-#ifndef __GINAC_ADD_H__
-#define __GINAC_ADD_H__
+#ifndef GINAC_ADD_H
+#define GINAC_ADD_H
 
 #include "expairseq.h"
 
@@ -33,7 +33,6 @@ class add : public expairseq
        GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
        
        friend class mul;
-       friend class ncmul;
        friend class power;
        
        // other constructors
@@ -42,58 +41,53 @@ public:
        add(const exvector & v);
        add(const epvector & v);
        add(const epvector & v, const ex & oc);
-       add(epvector * vp, const ex & oc);
+       add(epvector && v);
+       add(epvector && v, const ex & oc);
        
-       // functions overriding virtual functions from bases classes
+       // 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;
-       bool info(unsigned inf) 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 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 smod(const numeric &xi) const;
-       numeric max_coefficient(void) const;
-       exvector get_free_indices(void) const;
-       ex simplify_ncmul(const exvector & v) const;
+       unsigned precedence() const override {return 40;}
+       bool info(unsigned inf) const override;
+       bool is_polynomial(const ex & var) const override;
+       int degree(const ex & s) const override;
+       int ldegree(const ex & s) const override;
+       ex coeff(const ex & s, int n=1) const override;
+       ex eval() const override;
+       ex evalm() const override;
+       ex series(const relational & r, int order, unsigned options = 0) const override;
+       ex normal(exmap & repl, exmap & rev_lookup) const override;
+       numeric integer_content() const override;
+       ex smod(const numeric &xi) const override;
+       numeric max_coefficient() const override;
+       ex conjugate() const override;
+       ex real_part() const override;
+       ex imag_part() const override;
+       exvector get_free_indices() const override;
+       ex eval_ncmul(const exvector & v) const override;
 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;
-       ex thisexpairseq(const epvector & v, const ex & oc) const;
-       ex thisexpairseq(epvector * vp, const ex & oc) const;
-       expair split_ex_to_pair(const ex & e) const;
+       ex derivative(const symbol & s) const override;
+       unsigned return_type() const override;
+       return_type_t return_type_tinfo() const override;
+       ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const override;
+       ex thisexpairseq(epvector && vp, const ex & oc, bool do_index_renaming = false) const override;
+       expair split_ex_to_pair(const ex & e) const override;
        expair combine_ex_with_coeff_to_pair(const ex & e,
-                                            const ex & c) const;
+                                            const ex & c) const override;
        expair combine_pair_with_coeff_to_pair(const expair & p,
-                                              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
+                                              const ex & c) const override;
+       ex recombine_pair_to_ex(const expair & p) const override;
+       ex expand(unsigned options=0) const override;
 
+       // 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)
-{
-       return static_cast<const add &>(*e.bp);
-}
+GINAC_DECLARE_UNARCHIVER(add);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_ADD_H__
+#endif // ndef GINAC_ADD_H