mentioned ncpow()

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index fe562a3c208ff47524d883dd4a4f038a35a6adf5..8f7ac50142933bf154cf27e128c04265e416a54b 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,49 +36,36 @@ class add;
 class power : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(power, basic)
-
+       
        friend class mul;
-
+       
 // member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       power();
-       ~power();
-       power(const power & other);
-       const power & operator=(const power & other);
-protected:
-       void copy(const power & other);
-       void destroy(bool call_parent);
-
-       // 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
 public:
-       basic * duplicate() const;
-       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;
+       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 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;
-       int compare_same_type(const basic & other) const;
        unsigned return_type(void) const;
        unsigned return_type_tinfo(void) const;
        ex expand(unsigned options = 0) const;
@@ -96,20 +81,14 @@ protected:
        //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;
 };
 
-// global constants
-
-extern const power some_power;
-extern const std::type_info & typeid_power;
-
 // utility functions
 inline const power &ex_to_power(const ex &e)
 {
@@ -123,14 +102,13 @@ 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);
+}
 
-/** 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__