container.pl: can now generate constructors for an arbitary number

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index a334bfcc27284993f348965d7be3473ddb301319..b3527e9c5a06475e1ec721080a35e9c0a805e9e6 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -33,19 +33,19 @@
 #include "numeric.h"
 #include "power.h"
 #include "relational.h"
-#include "series.h"
+#include "pseries.h"
 #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
 //////////
 
-static ex abs_evalf(ex const & x)
+static ex abs_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -54,7 +54,7 @@ static ex abs_evalf(ex const & x)
     return abs(ex_to_numeric(x));
 }
 
-static ex abs_eval(ex const & x)
+static ex abs_eval(const ex & x)
 {
     if (is_ex_exactly_of_type(x, numeric))
         return abs(ex_to_numeric(x));
@@ -62,13 +62,14 @@ static ex abs_eval(ex const & x)
         return abs(x).hold();
 }
 
-REGISTER_FUNCTION(abs, abs_eval, abs_evalf, NULL, NULL);
+REGISTER_FUNCTION(abs, evalf_func(abs_eval).
+                       evalf_func(abs_evalf));
 
 //////////
 // dilogarithm
 //////////
 
-static ex Li2_eval(ex const & x)
+static ex Li2_eval(const ex & x)
 {
     if (x.is_zero())
         return x;
@@ -79,31 +80,31 @@ static ex Li2_eval(ex const & x)
     return Li2(x).hold();
 }
 
-REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li2, eval_func(Li2_eval));
 
 //////////
 // trilogarithm
 //////////
 
-static ex Li3_eval(ex const & x)
+static ex Li3_eval(const ex & x)
 {
     if (x.is_zero())
         return x;
     return Li3(x).hold();
 }
 
-REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li3, eval_func(Li3_eval));
 
 //////////
 // factorial
 //////////
 
-static ex factorial_evalf(ex const & x)
+static ex factorial_evalf(const ex & x)
 {
     return factorial(x).hold();
 }
 
-static ex factorial_eval(ex const & x)
+static ex factorial_eval(const ex & x)
 {
     if (is_ex_exactly_of_type(x, numeric))
         return factorial(ex_to_numeric(x));
@@ -111,18 +112,19 @@ static ex factorial_eval(ex const & 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
 //////////
 
-static ex binomial_evalf(ex const & x, ex const & y)
+static ex binomial_evalf(const ex & x, const ex & y)
 {
     return binomial(x, y).hold();
 }
 
-static ex binomial_eval(ex const & x, ex const &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))
         return binomial(ex_to_numeric(x), ex_to_numeric(y));
@@ -130,13 +132,14 @@ static ex binomial_eval(ex const & x, ex const &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)
 //////////
 
-static ex Order_eval(ex const & x)
+static ex Order_eval(const ex & x)
 {
        if (is_ex_exactly_of_type(x, numeric)) {
 
@@ -155,21 +158,22 @@ static ex Order_eval(ex const & x)
        return Order(x).hold();
 }
 
-static ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex Order_series(const ex & x, const symbol & s, const ex & point, int order)
 {
-       // Just wrap the function into a series object
+       // 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 series(s, point, new_seq);
+       return pseries(s, point, new_seq);
 }
 
-REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
+REGISTER_FUNCTION(Order, eval_func(Order_eval).
+                         series_func(Order_series));
 
 //////////
 // Solve linear system
 //////////
 
-ex lsolve(ex const &eqns, ex const &symbols)
+ex lsolve(const ex &eqns, const ex &symbols)
 {
     // solve a system of linear equations
     if (eqns.info(info_flags::relation_equal)) {
@@ -234,7 +238,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     matrix solution;
     try {
         solution=sys.fraction_free_elim(vars,rhs);
-    } catch (runtime_error const & e) {
+    } catch (const runtime_error & e) {
         // probably singular matrix (or other error)
         // return empty solution list
         // cerr << e.what() << endl;
@@ -261,7 +265,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
 }
 
 /** non-commutative power. */
-ex ncpower(ex const &basis, unsigned exponent)
+ex ncpower(const ex &basis, unsigned exponent)
 {
     if (exponent==0) {
         return _ex1();
@@ -281,6 +285,6 @@ ex ncpower(ex const &basis, unsigned exponent)
 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