X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=443022a556da6c9f48e062e2381b4be05b0e0ae3;hp=9d373e794a7313d2c68ce5c27381cb0bb8fd49e1;hb=f78b1f296310b5f1c01b74c9fb10dd33af2a8f4a;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 9d373e79..443022a5 100644
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -30,6 +30,7 @@
 #include "matrix.h"
 #include "mul.h"
 #include "power.h"
+#include "operators.h"
 #include "relational.h"
 #include "pseries.h"
 #include "symbol.h"
@@ -52,14 +53,27 @@ static ex abs_evalf(const ex & arg)
 
 static ex abs_eval(const ex & arg)
 {
-	if (is_ex_exactly_of_type(arg, numeric))
+	if (is_exactly_a<numeric>(arg))
 		return abs(ex_to<numeric>(arg));
 	else
 		return abs(arg).hold();
 }
 
+static void abs_print_latex(const ex & arg, const print_context & c)
+{
+	c.s << "{|"; arg.print(c); c.s << "|}";
+}
+
+static void abs_print_csrc_float(const ex & arg, const print_context & c)
+{
+	c.s << "fabs("; arg.print(c); c.s << ")";
+}
+
 REGISTER_FUNCTION(abs, eval_func(abs_eval).
-                       evalf_func(abs_evalf));
+                       evalf_func(abs_evalf).
+                       print_func<print_latex>(abs_print_latex).
+                       print_func<print_csrc_float>(abs_print_csrc_float).
+                       print_func<print_csrc_double>(abs_print_csrc_float));
 
 
 //////////
@@ -76,11 +90,11 @@ static ex csgn_evalf(const ex & arg)
 
 static ex csgn_eval(const ex & arg)
 {
-	if (is_ex_exactly_of_type(arg, numeric))
+	if (is_exactly_a<numeric>(arg))
 		return csgn(ex_to<numeric>(arg));
 	
-	else if (is_ex_exactly_of_type(arg, mul) &&
-	         is_ex_of_type(arg.op(arg.nops()-1),numeric)) {
+	else if (is_exactly_a<mul>(arg) &&
+	         is_exactly_a<numeric>(arg.op(arg.nops()-1))) {
 		numeric oc = ex_to<numeric>(arg.op(arg.nops()-1));
 		if (oc.is_real()) {
 			if (oc > 0)
@@ -108,7 +122,7 @@ static ex csgn_series(const ex & arg,
                       int order,
                       unsigned options)
 {
-	const ex arg_pt = arg.subs(rel);
+	const ex arg_pt = arg.subs(rel, subs_options::no_pattern);
 	if (arg_pt.info(info_flags::numeric)
 	    && ex_to<numeric>(arg_pt).real().is_zero()
 	    && !(options & series_options::suppress_branchcut))
@@ -185,8 +199,8 @@ static ex eta_series(const ex & x, const ex & y,
                      int order,
                      unsigned options)
 {
-	const ex x_pt = x.subs(rel);
-	const ex y_pt = y.subs(rel);
+	const ex x_pt = x.subs(rel, subs_options::no_pattern);
+	const ex y_pt = y.subs(rel, subs_options::no_pattern);
 	if ((x_pt.info(info_flags::numeric) && x_pt.info(info_flags::negative)) ||
 	    (y_pt.info(info_flags::numeric) && y_pt.info(info_flags::negative)) ||
 	    ((x_pt*y_pt).info(info_flags::numeric) && (x_pt*y_pt).info(info_flags::negative)))
@@ -254,7 +268,7 @@ static ex Li2_deriv(const ex & x, unsigned deriv_param)
 
 static ex Li2_series(const ex &x, const relational &rel, int order, unsigned options)
 {
-	const ex x_pt = x.subs(rel);
+	const ex x_pt = x.subs(rel, subs_options::no_pattern);
 	if (x_pt.info(info_flags::numeric)) {
 		// First special case: x==0 (derivatives have poles)
 		if (x_pt.is_zero()) {
@@ -276,7 +290,7 @@ static ex Li2_series(const ex &x, const relational &rel, int order, unsigned opt
 			for (int i=1; i<order; ++i)
 				ser += pow(s,i) / pow(numeric(i), _num2);
 			// substitute the argument's series expansion
-			ser = ser.subs(s==x.series(rel, order));
+			ser = ser.subs(s==x.series(rel, order), subs_options::no_pattern);
 			// maybe that was terminating, so add a proper order term
 			epvector nseq;
 			nseq.push_back(expair(Order(_ex1), order));
@@ -301,7 +315,7 @@ static ex Li2_series(const ex &x, const relational &rel, int order, unsigned opt
 			for (int i=1; i<order; ++i)
 				ser += pow(1-s,i) * (numeric(1,i)*(I*Pi+log(s-1)) - numeric(1,i*i));
 			// substitute the argument's series expansion
-			ser = ser.subs(s==x.series(rel, order));
+			ser = ser.subs(s==x.series(rel, order), subs_options::no_pattern);
 			// maybe that was terminating, so add a proper order term
 			epvector nseq;
 			nseq.push_back(expair(Order(_ex1), order));
@@ -323,8 +337,8 @@ static ex Li2_series(const ex &x, const relational &rel, int order, unsigned opt
 			seq.push_back(expair(Li2(x_pt), _ex0));
 			// compute the intermediate terms:
 			ex replarg = series(Li2(x), s==foo, order);
-			for (unsigned i=1; i<replarg.nops()-1; ++i)
-				seq.push_back(expair((replarg.op(i)/power(s-foo,i)).series(foo==point,1,options).op(0).subs(foo==s),i));
+			for (size_t i=1; i<replarg.nops()-1; ++i)
+				seq.push_back(expair((replarg.op(i)/power(s-foo,i)).series(foo==point,1,options).op(0).subs(foo==s, subs_options::no_pattern),i));
 			// append an order term:
 			seq.push_back(expair(Order(_ex1), replarg.nops()-1));
 			return pseries(rel, seq);
@@ -354,6 +368,37 @@ static ex Li3_eval(const ex & x)
 REGISTER_FUNCTION(Li3, eval_func(Li3_eval).
                        latex_name("\\mbox{Li}_3"));
 
+//////////
+// Derivatives of Riemann's Zeta-function  zetaderiv(0,x)==zeta(x)
+//////////
+
+static ex zetaderiv_eval(const ex & n, const ex & x)
+{
+	if (n.info(info_flags::numeric)) {
+		// zetaderiv(0,x) -> zeta(x)
+		if (n.is_zero())
+			return zeta(x);
+	}
+	
+	return zetaderiv(n, x).hold();
+}
+
+static ex zetaderiv_deriv(const ex & n, const ex & x, unsigned deriv_param)
+{
+	GINAC_ASSERT(deriv_param<2);
+	
+	if (deriv_param==0) {
+		// d/dn zeta(n,x)
+		throw(std::logic_error("cannot diff zetaderiv(n,x) with respect to n"));
+	}
+	// d/dx psi(n,x)
+	return zetaderiv(n+1,x);
+}
+
+REGISTER_FUNCTION(zetaderiv, eval_func(zetaderiv_eval).
+	                       	 derivative_func(zetaderiv_deriv).
+  	                         latex_name("\\zeta^\\prime"));
+
 //////////
 // factorial
 //////////
@@ -365,7 +410,7 @@ static ex factorial_evalf(const ex & x)
 
 static ex factorial_eval(const ex & x)
 {
-	if (is_ex_exactly_of_type(x, numeric))
+	if (is_exactly_a<numeric>(x))
 		return factorial(ex_to<numeric>(x));
 	else
 		return factorial(x).hold();
@@ -385,7 +430,7 @@ static ex binomial_evalf(const ex & x, const ex & y)
 
 static ex binomial_eval(const ex & x, const ex &y)
 {
-	if (is_ex_exactly_of_type(x, numeric) && is_ex_exactly_of_type(y, numeric))
+	if (is_exactly_a<numeric>(x) && is_exactly_a<numeric>(y))
 		return binomial(ex_to<numeric>(x), ex_to<numeric>(y));
 	else
 		return binomial(x, y).hold();
@@ -400,16 +445,16 @@ REGISTER_FUNCTION(binomial, eval_func(binomial_eval).
 
 static ex Order_eval(const ex & x)
 {
-	if (is_ex_exactly_of_type(x, numeric)) {
+	if (is_exactly_a<numeric>(x)) {
 		// O(c) -> O(1) or 0
 		if (!x.is_zero())
 			return Order(_ex1).hold();
 		else
 			return _ex0;
-	} else if (is_ex_exactly_of_type(x, mul)) {
+	} else if (is_exactly_a<mul>(x)) {
 		const mul &m = ex_to<mul>(x);
 		// O(c*expr) -> O(expr)
-		if (is_ex_exactly_of_type(m.op(m.nops() - 1), numeric))
+		if (is_exactly_a<numeric>(m.op(m.nops() - 1)))
 			return Order(x / m.op(m.nops() - 1)).hold();
 	}
 	return Order(x).hold();
@@ -453,7 +498,7 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 	if (!eqns.info(info_flags::list)) {
 		throw(std::invalid_argument("lsolve(): 1st argument must be a list"));
 	}
-	for (unsigned i=0; i<eqns.nops(); i++) {
+	for (size_t i=0; i<eqns.nops(); i++) {
 		if (!eqns.op(i).info(info_flags::relation_equal)) {
 			throw(std::invalid_argument("lsolve(): 1st argument must be a list of equations"));
 		}
@@ -461,7 +506,7 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 	if (!symbols.info(info_flags::list)) {
 		throw(std::invalid_argument("lsolve(): 2nd argument must be a list"));
 	}
-	for (unsigned i=0; i<symbols.nops(); i++) {
+	for (size_t i=0; i<symbols.nops(); i++) {
 		if (!symbols.op(i).info(info_flags::symbol)) {
 			throw(std::invalid_argument("lsolve(): 2nd argument must be a list of symbols"));
 		}
@@ -472,10 +517,10 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 	matrix rhs(eqns.nops(),1);
 	matrix vars(symbols.nops(),1);
 	
-	for (unsigned r=0; r<eqns.nops(); r++) {
+	for (size_t r=0; r<eqns.nops(); r++) {
 		const ex eq = eqns.op(r).op(0)-eqns.op(r).op(1); // lhs-rhs==0
 		ex linpart = eq;
-		for (unsigned c=0; c<symbols.nops(); c++) {
+		for (size_t c=0; c<symbols.nops(); c++) {
 			const ex co = eq.coeff(ex_to<symbol>(symbols.op(c)),1);
 			linpart -= co*symbols.op(c);
 			sys(r,c) = co;
@@ -485,7 +530,7 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 	}
 	
 	// test if system is linear and fill vars matrix
-	for (unsigned i=0; i<symbols.nops(); i++) {
+	for (size_t i=0; i<symbols.nops(); i++) {
 		vars(i,0) = symbols.op(i);
 		if (sys.has(symbols.op(i)))
 			throw(std::logic_error("lsolve: system is not linear"));
@@ -506,7 +551,7 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 	
 	// return list of equations of the form lst(var1==sol1,var2==sol2,...)
 	lst sollist;
-	for (unsigned i=0; i<symbols.nops(); i++)
+	for (size_t i=0; i<symbols.nops(); i++)
 		sollist.append(symbols.op(i)==solution(i,0));
 	
 	return sollist;
@@ -514,7 +559,7 @@ ex lsolve(const ex &eqns, const ex &symbols, unsigned options)
 
 /* Force inclusion of functions from inifcns_gamma and inifcns_zeta
  * for static lib (so ginsh will see them). */
-unsigned force_include_tgamma = function_index_tgamma;
-unsigned force_include_zeta1 = function_index_zeta1;
+unsigned force_include_tgamma = tgamma_SERIAL::serial;
+unsigned force_include_zeta1 = zeta1_SERIAL::serial;
 
 } // namespace GiNaC