X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.h;h=0defba9fbca56f41354f7c0abec922d4f175dea7;hp=8be87d64cf15a9e18082bff5ff07c1a49ef2204a;hb=c366645d84ba4cfdd5b98785a9c5e66e0aea3e62;hpb=48b41ea321ed9fa6115a1061d1a1d2f8d8ad0400

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 8be87d64..0defba9f 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -23,11 +23,20 @@
 #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)
 
@@ -79,25 +88,41 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
+// overloading at work: we cannot use the macros here
 /** Riemann's Zeta-function. */
-DECLARE_FUNCTION_1P(zeta)
-//DECLARE_FUNCTION_2P(zeta)
+extern const unsigned function_index_zeta1;
+template<typename T1>
+inline function zeta(const T1 & p1) {
+	return function(function_index_zeta1, ex(p1));
+}
+/** Derivatives of Riemann's Zeta-function. */
+extern const unsigned function_index_zeta2;
+template<typename T1, typename T2>
+inline function zeta(const T1 & p1, const T2 & p2) {
+	return function(function_index_zeta2, ex(p1), ex(p2));
+}
 
 /** Gamma-function. */
-DECLARE_FUNCTION_1P(gamma)
+DECLARE_FUNCTION_1P(lgamma)
+DECLARE_FUNCTION_1P(tgamma)
+
+/** Beta-function. */
+DECLARE_FUNCTION_2P(beta)
 
-/** Psi-function (aka polygamma-function). */
+// overloading at work: we cannot use the macros here
+/** Psi-function (aka digamma-function). */
 extern const unsigned function_index_psi1;
-inline function psi(ex const & p1) {
-    return function(function_index_psi1, p1);
+template<typename T1>
+inline function psi(const T1 & p1) {
+	return function(function_index_psi1, ex(p1));
 }
+/** Derivatives of Psi-function (aka polygamma-functions). */
 extern const unsigned function_index_psi2;
-inline function psi(ex const & p1, ex const & p2) {
-    return function(function_index_psi2, p1, p2);
+template<typename T1, typename T2>
+inline function psi(const T1 & p1, const T2 & p2) {
+	return function(function_index_psi2, ex(p1), ex(p2));
 }
-//DECLARE_FUNCTION_1P(psi)
-//DECLARE_FUNCTION_2P(psi)
-    
+	
 /** Factorial function. */
 DECLARE_FUNCTION_1P(factorial)
 
@@ -107,11 +132,10 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex const &eqns, ex const &symbols);
-
-ex ncpower(ex const &basis, unsigned exponent);
+ex lsolve(const ex &eqns, const ex &symbols);
 
-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);
 }