X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finifcns.h;h=11850c34896a563d935b52807e1a4a372ab4fa07;hb=cb83832adc13e5cca268c8fe0c6c0c98f0cc821e;hp=9781d935c1a2e777a2dfbf9326fba1da8eae8d22;hpb=ca32e8cce5576051183fc6be17ae0c624a185a6d;p=ginac.git

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 9781d935..11850c34 100644
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -26,16 +26,17 @@
 #include "function.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Absolute value. */
 DECLARE_FUNCTION_1P(abs)
-    
+	
 /** Complex sign. */
 DECLARE_FUNCTION_1P(csgn)
 
+/** Eta function: log(a*b) == log(a) + log(b) + eta(a, b). */
+DECLARE_FUNCTION_2P(eta)
+
 /** Sine. */
 DECLARE_FUNCTION_1P(sin)
 
@@ -87,16 +88,18 @@ DECLARE_FUNCTION_1P(Li2)
 /** Trilogarithm. */
 DECLARE_FUNCTION_1P(Li3)
 
-// overloading at work: we cannot use the macros
+// overloading at work: we cannot use the macros here
 /** Riemann's Zeta-function. */
 extern const unsigned function_index_zeta1;
-inline function zeta(const ex & p1) {
-    return function(function_index_zeta1, p1);
+template<typename T1>
+inline function zeta(const T1 & p1) {
+	return function(function_index_zeta1, ex(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);
+template<typename T1, typename T2>
+inline function zeta(const T1 & p1, const T2 & p2) {
+	return function(function_index_zeta2, ex(p1), ex(p2));
 }
 
 /** Gamma-function. */
@@ -106,18 +109,20 @@ DECLARE_FUNCTION_1P(tgamma)
 /** Beta-function. */
 DECLARE_FUNCTION_2P(beta)
 
-// overloading at work: we cannot use the macros
+// overloading at work: we cannot use the macros here
 /** Psi-function (aka digamma-function). */
 extern const unsigned function_index_psi1;
-inline function psi(const ex & p1) {
-    return function(function_index_psi1, p1);
+template<typename T1>
+inline function psi(const T1 & p1) {
+	return function(function_index_psi1, ex(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);
+template<typename T1, typename T2>
+inline function psi(const T1 & p1, const T2 & p2) {
+	return function(function_index_psi2, ex(p1), ex(p2));
 }
-    
+	
 /** Factorial function. */
 DECLARE_FUNCTION_1P(factorial)
 
@@ -127,20 +132,14 @@ DECLARE_FUNCTION_2P(binomial)
 /** Order term function (for truncated power series). */
 DECLARE_FUNCTION_1P(Order)
 
-/** Inert partial differentiation operator. */
-DECLARE_FUNCTION_2P(Derivative)
-
-ex lsolve(const ex &eqns, const ex &symbols);
-
-ex ncpower(const ex &basis, unsigned exponent);
+ex lsolve(const ex &eqns, const ex &symbols, unsigned options = determinant_algo::automatic);
 
+/** Check whether a function is the Order (O(n)) function. */
 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__