- fixed bug in normal(): normal(x^a) became (x^(-a))^(-1)

[ginac.git] / ginac / inifcns.h

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index f7622dd43b9500e3099387c136db4bc168b38616..176f67943ccbfecdb9af7fb7ba4f035aae790196 100644 (file)
--- 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-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
@@ -23,10 +23,15 @@
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 
-#include <ginac/function.h>
-#include <ginac/ex.h>
+#include "function.h"
+#include "ex.h"
 
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
+
+/** Absolute value. */
+DECLARE_FUNCTION_1P(abs)
 
 /** Sine. */
 DECLARE_FUNCTION_1P(sin)
@@ -79,16 +84,35 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
+// overloading at work: we cannot use the macros
 /** Riemann's Zeta-function. */
-DECLARE_FUNCTION_1P(zeta)
-DECLARE_FUNCTION_2P(zeta)
-    
+extern const unsigned function_index_zeta1;
+inline function zeta(const ex & p1) {
+    return function(function_index_zeta1, p1);
+}
+/** Derivatives of Riemann's Zeta-function. */
+extern const unsigned function_index_zeta2;
+inline function zeta(const ex & p1, const ex & p2) {
+    return function(function_index_zeta2, p1, p2);
+}
+
 /** Gamma-function. */
 DECLARE_FUNCTION_1P(gamma)
 
-/** Psi-function (aka polygamma-function). */
-DECLARE_FUNCTION_1P(psi)
-DECLARE_FUNCTION_2P(psi)
+/** Beta-function. */
+DECLARE_FUNCTION_2P(beta)
+
+// overloading at work: we cannot use the macros
+/** Psi-function (aka digamma-function). */
+extern const unsigned function_index_psi1;
+inline function psi(const ex & p1) {
+    return function(function_index_psi1, p1);
+}
+/** Derivatives of Psi-function (aka polygamma-functions). */
+extern const unsigned function_index_psi2;
+inline function psi(const ex & p1, const ex & p2) {
+    return function(function_index_psi2, p1, p2);
+}
     
 /** Factorial function. */
 DECLARE_FUNCTION_1P(factorial)
@@ -99,15 +123,23 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-ex lsolve(ex const &eqns, ex const &symbols);
+/** Inert differentiation. */
+DECLARE_FUNCTION_2P(Diff)
+
+/** Inert partial differentiation operator. */
+DECLARE_FUNCTION_2P(Derivative)
+
+ex lsolve(const ex &eqns, const ex &symbols);
 
-ex ncpower(ex const &basis, unsigned exponent);
+ex ncpower(const ex &basis, unsigned exponent);
 
-inline bool is_order_function(ex const & e)
+inline bool is_order_function(const ex & e)
 {
-       return is_ex_the_function(e, Order);
+    return is_ex_the_function(e, Order);
 }
 
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INIFCNS_H__