X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.h;h=258ee2e2ef681f725ea05768a53127778055cd9e;hp=ecdfa897aa9ff8a1a364c2fb29e7d5ab5c64786a;hb=4aaa6006a9408999aa4fe336a14180035aa8c791;hpb=a8507b8af1c08d9b27d98d57f95c7ca1a8671e27

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index ecdfa897..258ee2e2 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -1,8 +1,9 @@
 /** @file inifcns.h
  *
- *  Interface to GiNaC's initially known functions.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to GiNaC's initially known functions. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -22,6 +23,20 @@
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 
+#include "function.h"
+#include "ex.h"
+
+namespace GiNaC {
+
+/** Absolute value. */
+DECLARE_FUNCTION_1P(abs)
+	
+/** Complex sign. */
+DECLARE_FUNCTION_1P(csgn)
+
+/** Eta function: log(a*b) == log(a) + log(b) + eta(a, b). */
+DECLARE_FUNCTION_2P(eta)
+
 /** Sine. */
 DECLARE_FUNCTION_1P(sin)
 
@@ -73,9 +88,51 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
-/** Gamma function. */
-DECLARE_FUNCTION_1P(gamma)
+// overloading at work: we cannot use the macros here
+/** Riemann's Zeta-function. */
+class zeta1_SERIAL { public: static unsigned serial; };
+template<typename T1>
+inline function zeta(const T1 & p1) {
+	return function(zeta1_SERIAL::serial, ex(p1));
+}
+/** Derivatives of Riemann's Zeta-function. */
+class zeta2_SERIAL { public: static unsigned serial; };
+template<typename T1, typename T2>
+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);
+}
 
+/** Gamma-function. */
+DECLARE_FUNCTION_1P(lgamma)
+DECLARE_FUNCTION_1P(tgamma)
+
+/** Beta-function. */
+DECLARE_FUNCTION_2P(beta)
+
+// overloading at work: we cannot use the macros here
+/** Psi-function (aka digamma-function). */
+class psi1_SERIAL { public: static unsigned serial; };
+template<typename T1>
+inline function psi(const T1 & p1) {
+	return function(psi1_SERIAL::serial, ex(p1));
+}
+/** Derivatives of Psi-function (aka polygamma-functions). */
+class psi2_SERIAL { public: static unsigned serial; };
+template<typename T1, typename T2>
+inline function psi(const T1 & p1, const T2 & 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. */
 DECLARE_FUNCTION_1P(factorial)
 
@@ -85,13 +142,26 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex eqns,ex symbols);
+/** Polylogarithm and multiple polylogarithm. */
+DECLARE_FUNCTION_2P(Li)
+
+/** Nielsen's generalized polylogarithm. */
+DECLARE_FUNCTION_3P(S)
 
-ex ncpower(ex basis, unsigned exponent);
+/** Harmonic polylogarithm. */
+DECLARE_FUNCTION_2P(H)
 
-inline bool is_order_function(ex const & e)
+/** 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. */
+inline bool is_order_function(const ex & e)
 {
 	return is_ex_the_function(e, Order);
 }
 
+} // namespace GiNaC
+
 #endif // ndef __GINAC_INIFCNS_H__