- As advertised: we are calling the Gamma function tgamma() now!

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 55da24d052de66e3559a5469a87f57b8b0883d56..96f4c9a596869ab47886ed8eac5ab61dc693fd17 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -158,17 +158,38 @@ static ex Order_eval(const ex & x)
        return Order(x).hold();
 }
 
-static ex Order_series(const ex & x, const symbol & s, const ex & point, int order)
+static ex Order_series(const ex & x, const relational & r, int order)
 {
        // Just wrap the function into a pseries object
        epvector new_seq;
-       new_seq.push_back(expair(Order(_ex1()), numeric(min(x.ldegree(s), order))));
-       return pseries(s, point, new_seq);
+    GINAC_ASSERT(is_ex_exactly_of_type(r.lhs(),symbol));
+    const symbol *s = static_cast<symbol *>(r.lhs().bp);
+       new_seq.push_back(expair(Order(_ex1()), numeric(min(x.ldegree(*s), order))));
+       return pseries(r, new_seq);
 }
 
+// Differentiation is handled in function::derivative because of its special requirements
+
 REGISTER_FUNCTION(Order, eval_func(Order_eval).
                          series_func(Order_series));
 
+//////////
+// Inert partial differentiation operator
+//////////
+
+static ex Derivative_eval(const ex & f, const ex & l)
+{
+       if (!is_ex_exactly_of_type(f, function)) {
+        throw(std::invalid_argument("Derivative(): 1st argument must be a function"));
+       }
+    if (!is_ex_exactly_of_type(l, lst)) {
+        throw(std::invalid_argument("Derivative(): 2nd argument must be a list"));
+    }
+       return Derivative(f, l).hold();
+}
+
+REGISTER_FUNCTION(Derivative, eval_func(Derivative_eval));
+
 //////////
 // Solve linear system
 //////////
@@ -280,7 +301,7 @@ ex ncpower(const ex &basis, unsigned exponent)
 
 /** Force inclusion of functions from initcns_gamma and inifcns_zeta
  *  for static lib (so ginsh will see them). */
-unsigned force_include_gamma = function_index_gamma;
+unsigned force_include_tgamma = function_index_tgamma;
 unsigned force_include_zeta1 = function_index_zeta1;
 
 #ifndef NO_NAMESPACE_GINAC