- added an optional algorithm-switch to lsolve().

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index 24e46f889ecf8219a6554d1718a6c6a7cd3ff507..175fea057c39fa12fb25388f478ff2a9b293eb6d 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -26,9 +26,7 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 class numeric;
 class add;
@@ -38,34 +36,35 @@ class add;
 class power : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(power, basic)
-
+       
        friend class mul;
-
+       
 // member functions
-
-       // other constructors
+       
+       // other ctors
 public:
-       power(const ex & lh, const ex & rh);
-       power(const ex & lh, const numeric & rh);
-
-       // functions overriding virtual functions from bases classes
+       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 base classes
 public:
-       void print(std::ostream & os, unsigned upper_precedence = 0) const;
-       void printraw(std::ostream & os) const;
-       void printtree(std::ostream & os, unsigned indent) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
+       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);
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
-       ex coeff(const symbol & s, int n = 1) 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;
        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;
        ex simplify_ncmul(const exvector & v) const;
 protected:
        ex derivative(const symbol & s) const;
@@ -81,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.
@@ -106,14 +110,18 @@ inline const power &ex_to_power(const ex &e)
  *  @param b the basis expression
  *  @param e the exponent expression */
 inline ex pow(const ex & b, const ex & e)
-{ return power(b,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 as a new
- *  expression.  */
+/** Square root expression.  Returns a power-object with exponent 1/2. */
 ex sqrt(const ex & a);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_POWER_H__