X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finifcns.h;h=19a66d356157ab2584b995c13241658922cd7aeb;hb=882ddd98da749458e15d31f0eb261feb3ff8f9f1;hp=8acc2bf4f32f134d70fe64f5e72661294e81f753;hpb=ad5f751e9387ba148cc54c9961d50c37ee879fae;p=ginac.git

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 8acc2bf4..19a66d35 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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)
+	
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
 	
@@ -88,19 +91,36 @@ 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. */
-extern const unsigned function_index_zeta1;
+/** Multiple zeta value including Riemann's zeta-function. */
+class zeta1_SERIAL { public: static unsigned serial; };
 template<typename T1>
-inline function zeta(const T1 & p1) {
-	return function(function_index_zeta1, ex(p1));
+inline function zeta(const T1& p1) {
+	return function(zeta1_SERIAL::serial, ex(p1));
 }
-/** Derivatives of Riemann's Zeta-function. */
-extern const unsigned function_index_zeta2;
+/** 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) {
-	return function(function_index_zeta2, ex(p1), ex(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)
+{
+	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)
@@ -111,16 +131,21 @@ DECLARE_FUNCTION_2P(beta)
 
 // overloading at work: we cannot use the macros here
 /** Psi-function (aka digamma-function). */
-extern const unsigned function_index_psi1;
+class psi1_SERIAL { public: static unsigned serial; };
 template<typename T1>
 inline function psi(const T1 & p1) {
-	return function(function_index_psi1, ex(p1));
+	return function(psi1_SERIAL::serial, ex(p1));
 }
 /** Derivatives of Psi-function (aka polygamma-functions). */
-extern const unsigned function_index_psi2;
+class psi2_SERIAL { public: static unsigned serial; };
 template<typename T1, typename T2>
 inline function psi(const T1 & p1, const T2 & p2) {
-	return function(function_index_psi2, ex(p1), ex(p2));
+	return function(psi2_SERIAL::serial, ex(p1), ex(p2));
+}
+class psi_SERIAL;
+template<> inline bool is_the_function<class psi_SERIAL>(const ex & x)
+{
+	return is_the_function<psi1_SERIAL>(x) || is_the_function<psi2_SERIAL>(x);
 }
 	
 /** Factorial function. */
@@ -132,10 +157,7 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-/** Inert partial differentiation operator. */
-DECLARE_FUNCTION_2P(Derivative)
-
-ex lsolve(const ex &eqns, const ex &symbols);
+ex lsolve(const ex &eqns, const ex &symbols, unsigned options = solve_algo::automatic);
 
 /** Check whether a function is the Order (O(n)) function. */
 inline bool is_order_function(const ex & e)
@@ -143,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__