- introduced info_flags::cinteger, info_flags::crational,

[ginac.git] / ginac / inifcns_gamma.cpp

diff --git a/ginac/inifcns_gamma.cpp b/ginac/inifcns_gamma.cpp
index 7f3b9f5c924fcb7700e8dc4a8fcad4f4f2bd6c04..ecec37a603dbc208f12aeacb790a2daac18b6309 100644 (file)
--- a/ginac/inifcns_gamma.cpp
+++ b/ginac/inifcns_gamma.cpp
@@ -42,6 +42,15 @@ namespace GiNaC {
 // Gamma-function
 //////////
 
+static ex gamma_evalf(ex const & x)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(x,numeric)
+    END_TYPECHECK(gamma(x))
+    
+    return gamma(ex_to_numeric(x));
+}
+
 /** Evaluation of gamma(x). Knows about integer arguments, half-integer
  *  arguments and that's it. Somebody ought to provide some good numerical
  *  evaluation some day...
@@ -81,15 +90,6 @@ static ex gamma_eval(ex const & x)
     return gamma(x).hold();
 }    
 
-static ex gamma_evalf(ex const & x)
-{
-    BEGIN_TYPECHECK
-        TYPECHECK(x,numeric)
-    END_TYPECHECK(gamma(x))
-    
-    return gamma(ex_to_numeric(x));
-}
-
 static ex gamma_diff(ex const & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
@@ -122,6 +122,17 @@ REGISTER_FUNCTION(gamma, gamma_eval, gamma_evalf, gamma_diff, gamma_series);
 // Beta-function
 //////////
 
+static ex beta_evalf(ex const & x, ex const & y)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(x,numeric)
+        TYPECHECK(y,numeric)
+    END_TYPECHECK(beta(x,y))
+    
+    return gamma(ex_to_numeric(x))*gamma(ex_to_numeric(y))
+        / gamma(ex_to_numeric(x+y));
+}
+
 static ex beta_eval(ex const & x, ex const & y)
 {
     if (x.info(info_flags::numeric) && y.info(info_flags::numeric)) {
@@ -155,17 +166,6 @@ static ex beta_eval(ex const & x, ex const & y)
     return beta(x,y).hold();
 }
 
-static ex beta_evalf(ex const & x, ex const & y)
-{
-    BEGIN_TYPECHECK
-        TYPECHECK(x,numeric)
-        TYPECHECK(y,numeric)
-    END_TYPECHECK(beta(x,y))
-    
-    return gamma(ex_to_numeric(x))*gamma(ex_to_numeric(y))
-        / gamma(ex_to_numeric(x+y));
-}
-
 static ex beta_diff(ex const & x, ex const & y, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param<2);
@@ -184,6 +184,15 @@ REGISTER_FUNCTION(beta, beta_eval, beta_evalf, beta_diff, NULL);
 // Psi-function (aka polygamma-function)
 //////////
 
+static ex psi1_evalf(ex const & x)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(x,numeric)
+    END_TYPECHECK(psi(x))
+    
+    return psi(ex_to_numeric(x));
+}
+
 /** Evaluation of polygamma-function psi(x). 
  *  Somebody ought to provide some good numerical evaluation some day... */
 static ex psi1_eval(ex const & x)
@@ -214,15 +223,6 @@ static ex psi1_eval(ex const & x)
     return psi(x).hold();
 }
 
-static ex psi1_evalf(ex const & x)
-{
-    BEGIN_TYPECHECK
-        TYPECHECK(x,numeric)
-    END_TYPECHECK(psi(x))
-    
-    return psi(ex_to_numeric(x));
-}
-
 static ex psi1_diff(ex const & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
@@ -236,6 +236,16 @@ const unsigned function_index_psi1 = function::register_new("psi", psi1_eval, ps
 // Psi-functions (aka polygamma-functions)  psi(0,x)==psi(x)
 //////////
 
+static ex psi2_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));
+}
+
 /** Evaluation of polygamma-function psi(n,x). 
  *  Somebody ought to provide some good numerical evaluation some day... */
 static ex psi2_eval(ex const & n, ex const & x)
@@ -256,16 +266,6 @@ static ex psi2_eval(ex const & n, ex const & x)
     return psi(n, x).hold();
 }    
 
-static ex psi2_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 psi2_diff(ex const & n, ex const & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param<2);