X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpower.h;h=24e46f889ecf8219a6554d1718a6c6a7cd3ff507;hb=19d82770007e4d565ce4d07e3e7a02a1809de4eb;hp=a0ebc29bf213aa8b6c542839f5aa252053db2905;hpb=dbb36db8d02b2c25af6bbfff8135112637936e1f;p=ginac.git

diff --git a/ginac/power.h b/ginac/power.h
index a0ebc29b..24e46f88 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -26,9 +26,9 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 class numeric;
 class add;
@@ -37,78 +37,62 @@ class add;
  *  representing exponentiation. */
 class power : public basic
 {
-    GINAC_DECLARE_REGISTERED_CLASS(power, basic)
+	GINAC_DECLARE_REGISTERED_CLASS(power, basic)
 
-    friend class mul;
+	friend class mul;
 
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	// other constructors
 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
-public:
-    power(const ex & lh, const ex & rh);
-    power(const ex & lh, const numeric & rh);
+	power(const ex & lh, const ex & rh);
+	power(const ex & lh, const numeric & rh);
 
-    // functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
-    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 eval(int level=0) const;
-    ex evalf(int level=0) const;
-    ex diff(const symbol & s) const;
-    ex series(const symbol & s, const ex & point, int order) const;
-    ex subs(const lst & ls, const lst & lr) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex simplify_ncmul(const exvector & v) 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;
+	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 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 normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
+	ex to_rational(lst &repl_lst) const;
+	ex simplify_ncmul(const exvector & v) const;
 protected:
-    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;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
+	ex derivative(const symbol & s) const;
+	unsigned return_type(void) const;
+	unsigned return_type_tinfo(void) const;
+	ex expand(unsigned options = 0) const;
+	
+	// new virtual functions which can be overridden by derived classes
+	// none
+	
+	// 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;
-    //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;
+	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;
+	ex basis;
+	ex exponent;
+	static unsigned precedence;
 };
 
-// global constants
-
-extern const power some_power;
-extern const type_info & typeid_power;
-
 // utility functions
 inline const power &ex_to_power(const ex &e)
 {
@@ -128,8 +112,8 @@ inline ex pow(const ex & b, const ex & e)
  *  expression.  */
 ex sqrt(const ex & a);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_POWER_H__