* zeta(n,x) is now zetaderiv(n,s)

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 095abf7cd5427cf1428feaf5f8ba319009ae0677..e68bd175569b0c6f7b7ae1d40ec725972c0222a0 100644 (file)
--- 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,8 +23,19 @@
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 
-#include <ginac/function.h>
-#include <ginac/ex.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)
@@ -76,9 +88,63 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
-/** Gamma function. */
-DECLARE_FUNCTION_1P(gamma)
+/** Derivatives of Riemann's Zeta-function. */
+DECLARE_FUNCTION_2P(zetaderiv)
+
+// overloading at work: we cannot use the macros here
+/** 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(zeta1_SERIAL::serial, ex(p1));
+}
+/** 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(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)
+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)
 
@@ -88,13 +154,14 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex const &eqns, ex const &symbols);
+ex lsolve(const ex &eqns, const ex &symbols, unsigned options = solve_algo::automatic);
 
-ex ncpower(ex const &basis, unsigned exponent);
-
-inline bool is_order_function(ex const & e)
+/** 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__