X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpower.h;h=d9748ef93adfc9590f51a666f18f204eef6a634b;hb=20466971843965316dba5afb7510e6337276f752;hp=08c8a75a5b1ab9f7a1f5ad6c018f1f794a963476;hpb=19c8f943c15dcc0d946fb4d5fef11e487d34857a;p=ginac.git

diff --git a/ginac/power.h b/ginac/power.h
index 08c8a75a..d9748ef9 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,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,35 @@ 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;
 	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 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 +80,15 @@ 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 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__