X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpower.h;h=175fea057c39fa12fb25388f478ff2a9b293eb6d;hp=d9748ef93adfc9590f51a666f18f204eef6a634b;hb=1566be23d91ed1311bee2071bdae9ef93d0b7cf6;hpb=06eb6b761f4b9d9eed4decd8ed50d94b40b94a0e

diff --git a/ginac/power.h b/ginac/power.h
index d9748ef9..175fea05 100644
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -43,22 +43,25 @@ class power : public basic
 	
 	// other ctors
 public:
-	power(const ex & lh, const ex & rh);
-	power(const ex & lh, const numeric & rh);
+	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) {}
 	
-	// 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;}
 	bool info(unsigned inf) const;
 	unsigned nops() const;
 	ex & let_op(int i);
+	ex map(map_function & f) 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 series(const relational & s, int order, unsigned options = 0) const;
-	ex subs(const lst & ls, const lst & lr) 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;
@@ -77,24 +80,29 @@ 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;
 	
 // member variables
 	
 protected:
 	ex basis;
 	ex exponent;
-	static unsigned precedence;
 };
 
 // utility functions
+
+/** Return the power object handled by an ex.  Deprecated: use ex_to<power>().
+ *  This is unsafe: you need to check the type first. */
 inline const power &ex_to_power(const ex &e)
 {
 	return static_cast<const power &>(*e.bp);
 }
 
+/** 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.
@@ -105,6 +113,11 @@ 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);