- rotate_31() and golden_hash_ratio() moved to utils.h

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 981e98e3f119790ab126dad29f711f065ae735ca..de48b858452b01c3e2bde8c857e8046de4c06fc0 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -1,7 +1,8 @@
 /** @file inifcns.cpp
  *
- *  Implementation of GiNaC's initially known functions.
- *
+ *  Implementation of GiNaC's initially known functions. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,13 +23,26 @@
 #include <vector>
 #include <stdexcept>
 
-#include "ginac.h"
+#include "inifcns.h"
+#include "ex.h"
+#include "constant.h"
+#include "lst.h"
+#include "matrix.h"
+#include "mul.h"
+#include "ncmul.h"
+#include "numeric.h"
+#include "power.h"
+#include "relational.h"
+#include "series.h"
+#include "symbol.h"
+
+namespace GiNaC {
 
 //////////
 // dilogarithm
 //////////
 
-ex Li2_eval(ex const & x)
+static ex Li2_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
@@ -45,7 +59,7 @@ REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
 // trilogarithm
 //////////
 
-ex Li3_eval(ex const & x)
+static ex Li3_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
@@ -58,12 +72,12 @@ REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
 // factorial
 //////////
 
-ex factorial_evalf(ex const & x)
+static ex factorial_evalf(ex const & x)
 {
     return factorial(x).hold();
 }
 
-ex factorial_eval(ex const & x)
+static ex factorial_eval(ex const & x)
 {
     if (is_ex_exactly_of_type(x, numeric))
         return factorial(ex_to_numeric(x));
@@ -77,12 +91,12 @@ REGISTER_FUNCTION(factorial, factorial_eval, factorial_evalf, NULL, NULL);
 // binomial
 //////////
 
-ex binomial_evalf(ex const & x, ex const & y)
+static ex binomial_evalf(ex const & x, ex const & y)
 {
     return binomial(x, y).hold();
 }
 
-ex binomial_eval(ex const & x, ex const &y)
+static ex binomial_eval(ex const & x, ex const &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));
@@ -96,7 +110,7 @@ REGISTER_FUNCTION(binomial, binomial_eval, binomial_evalf, NULL, NULL);
 // Order term function (for truncated power series)
 //////////
 
-ex Order_eval(ex const & x)
+static ex Order_eval(ex const & x)
 {
        if (is_ex_exactly_of_type(x, numeric)) {
 
@@ -115,7 +129,7 @@ ex Order_eval(ex const & x)
        return Order(x).hold();
 }
 
-ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
 {
        // Just wrap the function into a series object
        epvector new_seq;
@@ -126,7 +140,7 @@ ex Order_series(ex const & x, symbol const & s, ex const & point, int order)
 REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
 
 /** linear solve. */
-ex lsolve(ex eqns, ex symbols)
+ex lsolve(ex const &eqns, ex const &symbols)
 {
     // solve a system of linear equations
     if (eqns.info(info_flags::relation_equal)) {
@@ -194,7 +208,7 @@ ex lsolve(ex eqns, ex symbols)
     } catch (runtime_error const & e) {
         // probably singular matrix (or other error)
         // return empty solution list
-        cerr << e.what() << endl;
+        // cerr << e.what() << endl;
         return lst();
     }
     
@@ -218,7 +232,7 @@ ex lsolve(ex eqns, ex symbols)
 }
 
 /** non-commutative power. */
-ex ncpower(ex basis, unsigned exponent)
+ex ncpower(ex const &basis, unsigned exponent)
 {
     if (exponent==0) {
         return exONE();
@@ -233,3 +247,9 @@ ex ncpower(ex basis, unsigned exponent)
     return ncmul(v,1);
 }
 
+/** 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_zeta = function_index_zeta;
+
+} // namespace GiNaC