X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpower.h;h=06f9681ede124039f4286921c32f5bc3b6b27b57;hb=53924dabb046e212f3aa27cb2a21dc7b0842308f;hp=0a156545d1367802cd393e493b685e9d54106804;hpb=0917777d60656298ba44e092712c2b403bfaf559;p=ginac.git

diff --git a/ginac/power.h b/ginac/power.h
index 0a156545..06f9681e 100644
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -43,17 +43,17 @@ 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_func f) const;
+	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;
@@ -80,9 +80,6 @@ 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
 	
@@ -92,9 +89,11 @@ protected:
 };
 
 // utility functions
-inline const power &ex_to_power(const ex &e)
+
+/** Efficient specialization of is_exactly_a<power>(obj) for power objects. */
+template<> inline bool is_exactly_a<power>(const basic & obj)
 {
-	return static_cast<const power &>(*e.bp);
+	return obj.tinfo()==TINFO_power;
 }
 
 // wrapper functions
@@ -107,6 +106,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);