X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpower.h;h=286ee816c3dd8d537c80e5577c727c2a259665c5;hb=6f8e33fb3604e30db5a67684ddf8bde6997efd0c;hp=4e1df9fb87bc34d9fb0f5d245eaa72faf03e5e98;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;p=ginac.git

diff --git a/ginac/power.h b/ginac/power.h
index 4e1df9fb..286ee816 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -48,7 +48,6 @@ public:
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	unsigned precedence() const {return 60;}
 	bool info(unsigned inf) const;
 	size_t nops() const;
@@ -61,11 +60,12 @@ public:
 	ex evalf(int level=0) const;
 	ex evalm() const;
 	ex series(const relational & s, int order, unsigned options = 0) const;
-	ex subs(const lst & ls, const lst & lr, unsigned options = 0) const;
-	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-	ex to_rational(lst &repl_lst) const;
-	ex to_polynomial(lst &repl_lst) const;
+	ex subs(const exmap & m, unsigned options = 0) const;
+	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
+	ex to_rational(exmap & repl) const;
+	ex to_polynomial(exmap & repl) const;
 	exvector get_free_indices() const;
+	ex conjugate() const;
 protected:
 	ex derivative(const symbol & s) const;
 	ex eval_ncmul(const exvector & v) const;
@@ -78,9 +78,16 @@ protected:
 	
 	// 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;
+	void print_power(const print_context & c, const char *powersymbol, const char *openbrace, const char *closebrace, unsigned level) const;
+	void do_print_dflt(const print_dflt & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_csrc(const print_csrc & c, unsigned level) const;
+	void do_print_python(const print_python & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+
+	ex expand_add(const add & a, int n, unsigned options) const;
+	ex expand_add_2(const add & a, unsigned options) const;
+	ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false) const;
 	
 // member variables