#include "symbol.h"
#include "utils.h"
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
//////////
// absolute value
return abs(x).hold();
}
-REGISTER_FUNCTION(abs, abs_eval, abs_evalf, NULL, NULL);
+REGISTER_FUNCTION(abs, eval_func(abs_eval).
+ evalf_func(abs_evalf));
//////////
// dilogarithm
return Li2(x).hold();
}
-REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li2, eval_func(Li2_eval));
//////////
// trilogarithm
return Li3(x).hold();
}
-REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li3, eval_func(Li3_eval));
//////////
// factorial
return factorial(x).hold();
}
-REGISTER_FUNCTION(factorial, factorial_eval, factorial_evalf, NULL, NULL);
+REGISTER_FUNCTION(factorial, eval_func(factorial_eval).
+ evalf_func(factorial_evalf));
//////////
// binomial
return binomial(x, y).hold();
}
-REGISTER_FUNCTION(binomial, binomial_eval, binomial_evalf, NULL, NULL);
+REGISTER_FUNCTION(binomial, eval_func(binomial_eval).
+ evalf_func(binomial_evalf));
//////////
// Order term function (for truncated power series)
return pseries(s, point, new_seq);
}
-REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
+// Differentiation is handled in function::derivative because of its special requirements
+
+REGISTER_FUNCTION(Order, eval_func(Order_eval).
+ series_func(Order_series));
+
+//////////
+// Inert differentiation
+//////////
+
+static ex Diff_eval(const ex & f, const ex & x)
+{
+ return Diff(f, x).hold();
+}
+
+static ex Diff_deriv(const ex & f, const ex & x, unsigned deriv_param)
+{
+ GINAC_ASSERT(deriv_param == 0 || deriv_param == 1);
+ if (deriv_param == 1)
+ return Diff(Diff(f, x), x);
+ else
+ return _ex0();
+}
+
+REGISTER_FUNCTION(Diff, eval_func(Diff_eval).
+ derivative_func(Diff_deriv));
+
+//////////
+// Inert partial differentiation operator
+//////////
+
+static ex Derivative_eval(const ex & f, const ex & n)
+{
+ if (is_ex_exactly_of_type(n, numeric) && ex_to_numeric(n).is_nonneg_integer()) {
+ unsigned i = ex_to_numeric(n).to_int();
+ if (is_ex_exactly_of_type(f, function)) {
+ if (i < f.nops() && is_ex_exactly_of_type(f.op(i), symbol))
+ return Diff(f, f.op(i));
+ }
+ }
+ return Derivative(f, n).hold();
+}
+
+REGISTER_FUNCTION(Derivative, eval_func(Derivative_eval));
//////////
// Solve linear system
matrix vars(symbols.nops(),1);
for (unsigned r=0; r<eqns.nops(); r++) {
- ex eq=eqns.op(r).op(0)-eqns.op(r).op(1); // lhs-rhs==0
- ex linpart=eq;
+ 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++) {
- ex co=eq.coeff(ex_to_symbol(symbols.op(c)),1);
+ ex co = eq.coeff(ex_to_symbol(symbols.op(c)),1);
linpart -= co*symbols.op(c);
sys.set(r,c,co);
}
// test if system is linear and fill vars matrix
for (unsigned i=0; i<symbols.nops(); i++) {
vars.set(i,0,symbols.op(i));
- if (sys.has(symbols.op(i))) {
+ if (sys.has(symbols.op(i)))
throw(std::logic_error("lsolve: system is not linear"));
- }
- if (rhs.has(symbols.op(i))) {
+ if (rhs.has(symbols.op(i)))
throw(std::logic_error("lsolve: system is not linear"));
- }
}
//matrix solution=sys.solve(rhs);
matrix solution;
try {
- solution=sys.fraction_free_elim(vars,rhs);
+ solution = sys.fraction_free_elim(vars,rhs);
} catch (const runtime_error & e) {
// probably singular matrix (or other error)
// return empty solution list
unsigned force_include_gamma = function_index_gamma;
unsigned force_include_zeta1 = function_index_zeta1;
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC