Improved CLN output [Sheplyakov].

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index d13463af714df83e7a167fee4265f752e69b0d16..3375040f56c20a5bc2d77186691cf442e35ec5e1 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
  */
 
 #ifndef __GINAC_POWER_H__
@@ -30,6 +30,7 @@ namespace GiNaC {
 
 class numeric;
 class add;
+class mul;
 
 /** This class holds a two-component object, a basis and and exponent
  *  representing exponentiation. */
@@ -41,35 +42,39 @@ class power : public basic
        
 // member functions
        
-       // other ctors
+       // other constructors
 public:
-       power(const ex & lh, const ex & rh);
-       power(const ex & lh, const numeric & rh);
+       power(const ex & lh, const ex & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
+       template<typename T> power(const ex & lh, const T & rh) : inherited(&power::tinfo_static), basis(lh), exponent(rh) {}
        
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
-       unsigned precedence(void) const {return 60;}
+       unsigned precedence() const {return 60;}
        bool info(unsigned inf) const;
-       unsigned nops() const;
-       ex & let_op(int i);
+       size_t nops() const;
+       ex op(size_t i) const;
        ex map(map_function & f) const;
+       bool is_polynomial(const ex & var) 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 evalf(int level=0) const;
-       ex evalm(void) const;
+       ex evalm() const;
        ex series(const relational & s, int order, unsigned options = 0) const;
-       ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
-       ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-       ex to_rational(lst &repl_lst) const;
-       exvector get_free_indices(void) const;
-       ex simplify_ncmul(const exvector & v) const;
+       ex subs(const exmap & m, unsigned options = 0) const;
+       bool has(const ex & other, unsigned options = 0) const;
+       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
+       ex to_rational(exmap & repl) const;
+       ex to_polynomial(exmap & repl) const;
+       ex conjugate() const;
+       ex real_part() const;
+       ex imag_part() const;
 protected:
        ex derivative(const symbol & s) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
+       ex eval_ncmul(const exvector & v) const;
+       unsigned return_type() const;
+       tinfo_t return_type_tinfo() const;
        ex expand(unsigned options = 0) const;
        
        // new virtual functions which can be overridden by derived classes
@@ -77,12 +82,17 @@ protected:
        
        // non-virtual functions in this class
 protected:
-       ex expand_add(const add & a, int n) const;
-       ex expand_add_2(const add & a) const;
-       ex expand_mul(const mul & m, const numeric & n) const;
-       //ex expand_commutative_3(const ex & basis, const numeric & exponent,
-       //                        unsigned options) const;
-       //ex expand_noncommutative(const ex & basis, const numeric & exponent, unsigned options) const;
+       void print_power(const print_context & c, const char *powersymbol, const char *openbrace, const char *closebrace, unsigned level) const;
+       void do_print_dflt(const print_dflt & 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(const print_python & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+       void do_print_csrc_cl_N(const print_csrc_cl_N & c, unsigned level) const;
+
+       ex expand_add(const add & a, int n, unsigned options) const;
+       ex expand_add_2(const add & a, unsigned options) const;
+       ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false) const;
        
 // member variables
        
@@ -91,12 +101,6 @@ protected:
        ex exponent;
 };
 
-// utility functions
-inline const power &ex_to_power(const ex &e)
-{
-       return static_cast<const power &>(*e.bp);
-}
-
 // wrapper functions
 
 /** Symbolic exponentiation.  Returns a power-object as a new expression.
@@ -107,9 +111,18 @@ inline ex pow(const ex & b, const ex & e)
 {
        return power(b, e);
 }
+template<typename T1, typename T2>
+inline ex pow(const T1 & b, const T2 & e)
+{
+       return power(ex(b), ex(e));
+}
 
 /** Square root expression.  Returns a power-object with exponent 1/2. */
-ex sqrt(const ex & a);
+inline ex sqrt(const ex & a)
+{
+       extern const ex _ex1_2;
+       return power(a,_ex1_2);
+}
 
 } // namespace GiNaC