X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpower.h;h=afc59f33f8bb58c7c90394b2b8b833fad2940675;hb=fe9dbfb9947b24149b3ce7dd9285f27ab286cbd7;hp=17c06c77b2f2920b9285e903a74a32f2f1d0c67e;hpb=955cb185a85535ab328ffedbfccdc508ce80fa91;p=ginac.git

diff --git a/ginac/power.h b/ginac/power.h
index 17c06c77..afc59f33 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 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -23,12 +23,12 @@
 #ifndef __GINAC_POWER_H__
 #define __GINAC_POWER_H__
 
-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#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,6 +37,8 @@ class add;
  *  representing exponentiation. */
 class power : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(power, basic)
+
     friend class mul;
 
 // member functions
@@ -45,54 +47,55 @@ class power : public basic
 public:
     power();
     ~power();
-    power(power const & other);
-    power const & operator=(power const & other);
+    power(const power & other);
+    const power & operator=(const power & other);
 protected:
-    void copy(power const & other);
+    void copy(const power & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    power(ex const & lh, ex const & rh);
-    power(ex const & lh, numeric const & rh);
+    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(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;
+    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;
-    int nops() const;
-    ex & let_op(int const i);
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
-    ex coeff(symbol const & s, int const n=1) 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(symbol const & s) const;
-    ex series(symbol const & s, ex const & point, int order) const;
-    ex subs(lst const & ls, lst const & lr) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex simplify_ncmul(exvector const & v) 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(basic const & other) const;
+    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;
+    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(add const & a, int const n) const;
-    ex expand_add_2(add const & a) const;
-    ex expand_mul(mul const & m, numeric const & n) const;
-    //ex expand_commutative_3(ex const & basis, numeric const & exponent,
+    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(ex const & basis, numeric const & exponent, unsigned options) const;
+    // ex expand_noncommutative(const ex & basis, const numeric & exponent, unsigned options) const;
 
 // member variables
 
@@ -105,7 +108,7 @@ protected:
 // global constants
 
 extern const power some_power;
-extern type_info const & typeid_power;
+extern const type_info & typeid_power;
 
 // utility functions
 inline const power &ex_to_power(const ex &e)
@@ -119,15 +122,15 @@ inline const power &ex_to_power(const ex &e)
  *
  *  @param b the basis expression
  *  @param e the exponent expression */
-inline ex pow(ex const & b, ex const & e)
+inline ex pow(const ex & b, const ex & e)
 { return power(b,e); }
 
 /** Square root expression.  Returns a power-object with exponent 1/2 as a new
  *  expression.  */
-ex sqrt(ex const & a);
+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__