conjugate() symbolic function renamed to conjugate_function()

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 258ee2e2ef681f725ea05768a53127778055cd9e..a17c8d2dfb6761713db6dd6e4c0ce356d4972738 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's initially known functions. */
 
 /*
- *  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
@@ -28,6 +28,9 @@
 
 namespace GiNaC {
 
+/** Complex conjugate. */
+DECLARE_FUNCTION_1P(conjugate_function)
+       
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
        
@@ -88,25 +91,37 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
+/** Derivatives of Riemann's Zeta-function. */
+DECLARE_FUNCTION_2P(zetaderiv)
+
 // overloading at work: we cannot use the macros here
-/** Riemann's Zeta-function. */
+/** Multiple zeta value including Riemann's zeta-function. */
 class zeta1_SERIAL { public: static unsigned serial; };
 template<typename T1>
-inline function zeta(const T1 & p1) {
+inline function zeta(const T1& p1) {
        return function(zeta1_SERIAL::serial, ex(p1));
 }
-/** Derivatives of Riemann's Zeta-function. */
+/** Alternating Euler sum or colored MZV. */
 class zeta2_SERIAL { public: static unsigned serial; };
 template<typename T1, typename T2>
-inline function zeta(const T1 & p1, const T2 & p2) {
+inline function zeta(const T1& p1, const T2& p2) {
        return function(zeta2_SERIAL::serial, ex(p1), ex(p2));
 }
 class zeta_SERIAL;
-template<> inline bool is_the_function<class zeta_SERIAL>(const ex & x)
+template<> inline bool is_the_function<class zeta_SERIAL>(const ex& x)
 {
        return is_the_function<zeta1_SERIAL>(x) || is_the_function<zeta2_SERIAL>(x);
 }
 
+/** Polylogarithm and multiple polylogarithm. */
+DECLARE_FUNCTION_2P(Li)
+
+/** Nielsen's generalized polylogarithm. */
+DECLARE_FUNCTION_3P(S)
+
+/** Harmonic polylogarithm. */
+DECLARE_FUNCTION_2P(H)
+
 /** Gamma-function. */
 DECLARE_FUNCTION_1P(lgamma)
 DECLARE_FUNCTION_1P(tgamma)
@@ -142,18 +157,6 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-/** Polylogarithm and multiple polylogarithm. */
-DECLARE_FUNCTION_2P(Li)
-
-/** Nielsen's generalized polylogarithm. */
-DECLARE_FUNCTION_3P(S)
-
-/** Harmonic polylogarithm. */
-DECLARE_FUNCTION_2P(H)
-
-/** Multiple zeta value. */
-DECLARE_FUNCTION_1P(mZeta)
- 
 ex lsolve(const ex &eqns, const ex &symbols, unsigned options = solve_algo::automatic);
 
 /** Check whether a function is the Order (O(n)) function. */
@@ -162,6 +165,11 @@ inline bool is_order_function(const ex & e)
        return is_ex_the_function(e, Order);
 }
 
+/** Converts a given list containing parameters for H in Remiddi/Vermaseren notation into
+ *  the corresponding GiNaC functions.
+ */
+ex convert_H_to_Li(const ex& parameterlst, const ex& arg);
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_INIFCNS_H__