* Implementation of the Zeta-function and some related stuff. */
/*
- * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2000 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
#include "symbol.h"
#include "utils.h"
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
//////////
// Riemann's Zeta-function
//////////
-static ex zeta1_evalf(ex const & x)
+static ex zeta1_evalf(const ex & x)
{
BEGIN_TYPECHECK
TYPECHECK(x,numeric)
return zeta(ex_to_numeric(x));
}
-static ex zeta1_eval(ex const & x)
+static ex zeta1_eval(const ex & x)
{
if (x.info(info_flags::numeric)) {
numeric y = ex_to_numeric(x);
if (x.info(info_flags::odd))
return zeta(x).hold();
else
- return abs(bernoulli(y))*pow(Pi,x)*_num2().power(y-_num1())/factorial(y);
+ return abs(bernoulli(y))*pow(Pi,x)*pow(_num2(),y-_num1())/factorial(y);
} else {
if (x.info(info_flags::odd))
return -bernoulli(_num1()-y)/(_num1()-y);
return zeta(x).hold();
}
-static ex zeta1_diff(ex const & x, unsigned diff_param)
+static ex zeta1_deriv(const ex & x, unsigned deriv_param)
{
- GINAC_ASSERT(diff_param==0);
+ GINAC_ASSERT(deriv_param==0);
return zeta(_ex1(), x);
}
-const unsigned function_index_zeta1 = function::register_new("zeta", zeta1_eval, zeta1_evalf, zeta1_diff, NULL);
+const unsigned function_index_zeta1 =
+ function::register_new(function_options("zeta").
+ eval_func(zeta1_eval).
+ evalf_func(zeta1_evalf).
+ derivative_func(zeta1_deriv).
+ overloaded(2));
//////////
// Derivatives of Riemann's Zeta-function zeta(0,x)==zeta(x)
//////////
-static ex zeta2_eval(ex const & n, ex const & x)
+static ex zeta2_eval(const ex & n, const ex & x)
{
if (n.info(info_flags::numeric)) {
// zeta(0,x) -> zeta(x)
return zeta(n, x).hold();
}
-static ex zeta2_diff(ex const & n, ex const & x, unsigned diff_param)
+static ex zeta2_deriv(const ex & n, const ex & x, unsigned deriv_param)
{
- GINAC_ASSERT(diff_param<2);
+ GINAC_ASSERT(deriv_param<2);
- if (diff_param==0) {
+ if (deriv_param==0) {
// d/dn zeta(n,x)
throw(std::logic_error("cannot diff zeta(n,x) with respect to n"));
}
return zeta(n+1,x);
}
-const unsigned function_index_zeta2 = function::register_new("zeta", zeta2_eval, NULL, zeta2_diff, NULL);
+const unsigned function_index_zeta2 =
+ function::register_new(function_options("zeta").
+ eval_func(zeta2_eval).
+ derivative_func(zeta2_deriv).
+ overloaded(2));
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC