X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpower.h;h=5c59ee7fef6679507e63aa996717aa8805c04a07;hp=4e1df9fb87bc34d9fb0f5d245eaa72faf03e5e98;hb=bb6b3d82cdf9e7ff4ecac89c47e63024e39ec96b;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/power.h b/ginac/power.h
index 4e1df9fb..5c59ee7f 100644
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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. */
@@ -43,17 +44,17 @@ class power : public basic
 	
 	// other constructors
 public:
-	power(const ex & lh, const ex & rh) : inherited(TINFO_power), basis(lh), exponent(rh) {}
-	template<typename T> power(const ex & lh, const T & rh) : inherited(TINFO_power), basis(lh), exponent(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 base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	unsigned precedence() const {return 60;}
 	bool info(unsigned inf) const;
 	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;
@@ -61,16 +62,19 @@ public:
 	ex evalf(int level=0) const;
 	ex evalm() const;
 	ex series(const relational & s, int order, unsigned options = 0) const;
-	ex subs(const lst & ls, const lst & lr, unsigned options = 0) const;
-	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-	ex to_rational(lst &repl_lst) const;
-	ex to_polynomial(lst &repl_lst) const;
-	exvector get_free_indices() 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;
 	ex eval_ncmul(const exvector & v) const;
 	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
+	tinfo_t return_type_tinfo() const;
 	ex expand(unsigned options = 0) const;
 	
 	// new virtual functions which can be overridden by derived classes
@@ -78,9 +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;
+	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
 	
@@ -89,14 +101,6 @@ protected:
 	ex exponent;
 };
 
-// utility functions
-
-/** Efficient specialization of is_exactly_a<power>(obj) for power objects. */
-template<> inline bool is_exactly_a<power>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_power;
-}
-
 // wrapper functions
 
 /** Symbolic exponentiation.  Returns a power-object as a new expression.