- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index ecd35b688bbf10d3f3fe5403ab78fb8e7ed72d88..0a38c4b0f4f47d07abdb2eba780a78194b5ed420 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -35,8 +35,11 @@
 #include "relational.h"
 #include "series.h"
 #include "symbol.h"
 #include "relational.h"
 #include "series.h"
 #include "symbol.h"

+#include "utils.h"

 
 

+#ifndef NO_GINAC_NAMESPACE

 namespace GiNaC {
 namespace GiNaC {

+#endif // ndef NO_GINAC_NAMESPACE

 
 //////////
 // dilogarithm
 
 //////////
 // dilogarithm


@@ -46,9 +49,9 @@ static ex Li2_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
 {
     if (x.is_zero())
         return x;

-    if (x.is_equal(exONE()))
+    if (x.is_equal(_ex1()))

         return power(Pi, 2) / 6;
         return power(Pi, 2) / 6;

-    if (x.is_equal(exMINUSONE()))
+    if (x.is_equal(_ex_1()))

         return -power(Pi, 2) / 12;
     return Li2(x).hold();
 }
         return -power(Pi, 2) / 12;
     return Li2(x).hold();
 }


@@ -115,7 +118,7 @@ static ex Order_eval(ex const & x)
        if (is_ex_exactly_of_type(x, numeric)) {
 
                // O(c)=O(1)
        if (is_ex_exactly_of_type(x, numeric)) {
 
                // O(c)=O(1)

-               return Order(exONE()).hold();
+               return Order(_ex1()).hold();

 
        } else if (is_ex_exactly_of_type(x, mul)) {
 
 
        } else if (is_ex_exactly_of_type(x, mul)) {
 


@@ -133,7 +136,7 @@ static ex Order_series(ex const & x, symbol const & s, ex const & point, int ord
 {
        // Just wrap the function into a series object
        epvector new_seq;
 {
        // Just wrap the function into a series object
        epvector new_seq;

-       new_seq.push_back(expair(Order(exONE()), numeric(min(x.ldegree(s), order))));
+       new_seq.push_back(expair(Order(_ex1()), numeric(min(x.ldegree(s), order))));

        return series(s, point, new_seq);
 }
 
        return series(s, point, new_seq);
 }
 


@@ -149,8 +152,8 @@ ex lsolve(ex const &eqns, ex const &symbols)
         }
         ex sol=lsolve(lst(eqns),lst(symbols));
         
         }
         ex sol=lsolve(lst(eqns),lst(symbols));
         

-        ASSERT(sol.nops()==1);
-        ASSERT(is_ex_exactly_of_type(sol.op(0),relational));
+        GINAC_ASSERT(sol.nops()==1);
+        GINAC_ASSERT(is_ex_exactly_of_type(sol.op(0),relational));

         
         return sol.op(0).op(1); // return rhs of first solution
     }
         
         return sol.op(0).op(1); // return rhs of first solution
     }


@@ -208,7 +211,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     } catch (runtime_error const & e) {
         // probably singular matrix (or other error)
         // return empty solution list
     } 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();
     }
     
         return lst();
     }
     


@@ -235,7 +238,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
 ex ncpower(ex const &basis, unsigned exponent)
 {
     if (exponent==0) {
 ex ncpower(ex const &basis, unsigned exponent)
 {
     if (exponent==0) {

-        return exONE();
+        return _ex1();

     }
 
     exvector v;
     }
 
     exvector v;


@@ -247,4 +250,11 @@ ex ncpower(ex const &basis, unsigned exponent)
     return ncmul(v,1);
 }
 
     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_zeta1 = function_index_zeta1;
+
+#ifndef NO_GINAC_NAMESPACE

 } // namespace GiNaC
 } // namespace GiNaC

+#endif // ndef NO_GINAC_NAMESPACE