- added the beta function to GiNaC

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index c1f1f24e221e2ef69654d7df9cd9a2fa76ac6eef..a5a527000cdbebbf4b69673ef3682ffd0b3373ba 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -2,11 +2,33 @@
  *
  *  Interface to GiNaC's initially known functions. */
 
-#ifndef _INIFCNS_H_
-#define _INIFCNS_H_
+/*
+ *  GiNaC Copyright (C) 1999 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __GINAC_INIFCNS_H__
+#define __GINAC_INIFCNS_H__
+
+#include <ginac/function.h>
+#include <ginac/ex.h>
 
-#include "numeric.h"
-#include "function.h"
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 /** Sine. */
 DECLARE_FUNCTION_1P(sin)
@@ -59,9 +81,29 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
-/** Gamma function. */
+/** Riemann's Zeta-function. */
+DECLARE_FUNCTION_1P(zeta)
+//DECLARE_FUNCTION_2P(zeta)
+
+/** Gamma-function. */
 DECLARE_FUNCTION_1P(gamma)
 
+/** Beta-function. */
+DECLARE_FUNCTION_2P(beta)
+
+/** Psi-function (aka polygamma-function). */
+// overloading @ work: we cannot use the macros
+extern const unsigned function_index_psi1;
+inline function psi(ex const & p1) {
+    return function(function_index_psi1, p1);
+}
+extern const unsigned function_index_psi2;
+inline function psi(ex const & p1, ex const & p2) {
+    return function(function_index_psi2, p1, p2);
+}
+//DECLARE_FUNCTION_1P(psi)
+//DECLARE_FUNCTION_2P(psi)
+    
 /** Factorial function. */
 DECLARE_FUNCTION_1P(factorial)
 
@@ -71,13 +113,17 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex eqns,ex symbols);
+ex lsolve(ex const &eqns, ex const &symbols);
 
-ex ncpower(ex basis, unsigned exponent);
+ex ncpower(ex const &basis, unsigned exponent);
 
 inline bool is_order_function(ex const & e)
 {
        return is_ex_the_function(e, Order);
 }
 
-#endif // ndef _INIFCNS_H_
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
+#endif // ndef __GINAC_INIFCNS_H__