- removed inert Diff() function; only Derivative() remains

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 9c5019df6dfabf2ec6d37f585e5af080258c91f2..fcf2d05dc088052d60e7d12f9e577b7a103cd4f9 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -37,9 +37,9 @@
 #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
@@ -62,7 +62,8 @@ static ex abs_eval(const ex & x)
         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
@@ -79,7 +80,7 @@ static ex Li2_eval(const ex & x)
     return Li2(x).hold();
 }
 
-REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li2, eval_func(Li2_eval));
 
 //////////
 // trilogarithm
@@ -92,7 +93,7 @@ static ex Li3_eval(const ex & x)
     return Li3(x).hold();
 }
 
-REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li3, eval_func(Li3_eval));
 
 //////////
 // factorial
@@ -111,7 +112,8 @@ static ex factorial_eval(const ex & x)
         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
@@ -130,7 +132,8 @@ static ex binomial_eval(const ex & x, const ex &y)
         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)
@@ -163,7 +166,27 @@ static ex Order_series(const ex & x, const symbol & s, const ex & point, int ord
        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 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
@@ -208,10 +231,10 @@ ex lsolve(const ex &eqns, const ex &symbols)
     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);
         }
@@ -222,18 +245,16 @@ ex lsolve(const ex &eqns, const ex &symbols)
     // 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
@@ -278,9 +299,9 @@ 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_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