X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns_gamma.cpp;h=c917387765d0044a46027d8207510646e4f3e2cf;hp=73a64b3e2d3b07dc9e91988b3549ae9a7233e2fd;hb=8bcccf834ad41e94a1a4f3a0304c2945b228b4f4;hpb=66c0f31c678e6c1938d637636b230ea376c157c1

diff --git a/ginac/inifcns_gamma.cpp b/ginac/inifcns_gamma.cpp
index 73a64b3e..c9173877 100644
--- a/ginac/inifcns_gamma.cpp
+++ b/ginac/inifcns_gamma.cpp
@@ -1,7 +1,9 @@
 /** @file inifcns_gamma.cpp
  *
- *  Implementation of Gamma function and some related stuff.
- *
+ *  Implementation of Gamma-function, Polygamma-functions, and some related
+ *  stuff. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,8 +31,10 @@
 #include "power.h"
 #include "symbol.h"
 
+namespace GiNaC {
+
 //////////
-// gamma function
+// Gamma-function
 //////////
 
 /** Evaluation of gamma(x). Knows about integer arguments, half-integer
@@ -38,10 +42,9 @@
  *  evaluation some day...
  *
  *  @exception fail_numeric("complex_infinity") or something similar... */
-ex gamma_eval(ex const & x)
+static ex gamma_eval(ex const & x)
 {
-    if ( x.info(info_flags::numeric) ) {
-
+    if (x.info(info_flags::numeric)) {
         // trap integer arguments:
         if ( x.info(info_flags::integer) ) {
             // gamma(n+1) -> n! for postitive n
@@ -59,21 +62,21 @@ ex gamma_eval(ex const & x)
                 numeric n = ex_to_numeric(x).sub(numHALF());
                 numeric coefficient = doublefactorial(n.mul(numTWO()).sub(numONE()));
                 coefficient = coefficient.div(numTWO().power(n));
-                return coefficient * power(Pi,numHALF());
+                return coefficient * pow(Pi,numHALF());
             } else {
                 // trap negative x=(-n+1/2)
                 // gamma(-n+1/2) -> Pi^(1/2)*(-2)^n/(1*3*..*(2*n-1))
                 numeric n = abs(ex_to_numeric(x).sub(numHALF()));
                 numeric coefficient = numeric(-2).power(n);
                 coefficient = coefficient.div(doublefactorial(n.mul(numTWO()).sub(numONE())));;
-                return coefficient * power(Pi,numHALF());
+                return coefficient*sqrt(Pi);
             }
         }
     }
     return gamma(x).hold();
 }    
     
-ex gamma_evalf(ex const & x)
+static ex gamma_evalf(ex const & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -82,21 +85,61 @@ ex gamma_evalf(ex const & x)
     return gamma(ex_to_numeric(x));
 }
 
-ex gamma_diff(ex const & x, unsigned diff_param)
+static ex gamma_diff(ex const & x, unsigned diff_param)
 {
     ASSERT(diff_param==0);
-
-    return power(x, -1);	//!!
+    
+    return psi(exZERO(),x)*gamma(x);  // diff(log(gamma(x)),x)==psi(0,x)
 }
 
-ex gamma_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex gamma_series(ex const & x, symbol const & s, ex const & point, int order)
 {
-	//!! Only handle one special case for now...
+	// FIXME: Only handle one special case for now...
 	if (x.is_equal(s) && point.is_zero()) {
-		ex e = 1 / s - EulerGamma + s * (power(Pi, 2) / 12 + power(EulerGamma, 2) / 2) + Order(power(s, 2));
+		ex e = 1 / s - EulerGamma + s * (pow(Pi, 2) / 12 + pow(EulerGamma, 2) / 2) + Order(pow(s, 2));
 		return e.series(s, point, order);
 	} else
 		throw(std::logic_error("don't know the series expansion of this particular gamma function"));
 }
 
 REGISTER_FUNCTION(gamma, gamma_eval, gamma_evalf, gamma_diff, gamma_series);
+
+//////////
+// Psi-function (aka polygamma-function)
+//////////
+
+/** Evaluation of polygamma-function psi(n,x). 
+ *  Somebody ought to provide some good numerical evaluation some day... */
+static ex psi_eval(ex const & n, ex const & x)
+{
+    if (n.info(info_flags::numeric) && x.info(info_flags::numeric)) {
+        // do some stuff...
+    }
+    return psi(n, x).hold();
+}    
+    
+static ex psi_evalf(ex const & n, ex const & x)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(n,numeric)
+        TYPECHECK(x,numeric)
+    END_TYPECHECK(psi(n,x))
+    
+    return psi(ex_to_numeric(n), ex_to_numeric(x));
+}
+
+static ex psi_diff(ex const & n, ex const & x, unsigned diff_param)
+{
+    ASSERT(diff_param==0);
+    
+    return psi(n+1, x);
+}
+
+static ex psi_series(ex const & n, ex const & x, symbol const & s, ex const & point, int order)
+{
+    throw(std::logic_error("Nobody told me how to series expand the psi function. :-("));
+}
+
+REGISTER_FUNCTION(psi, psi_eval, psi_evalf, psi_diff, psi_series);
+
+} // namespace GiNaC