Modification in output of last returned expression

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index de48b858452b01c3e2bde8c857e8046de4c06fc0..a334bfcc27284993f348965d7be3473ddb301319 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's initially known functions. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,8 +35,34 @@
 #include "relational.h"
 #include "series.h"
 #include "symbol.h"
+#include "utils.h"
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
+//////////
+// absolute value
+//////////
+
+static ex abs_evalf(ex const & x)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(x,numeric)
+    END_TYPECHECK(abs(x))
+    
+    return abs(ex_to_numeric(x));
+}
+
+static ex abs_eval(ex const & x)
+{
+    if (is_ex_exactly_of_type(x, numeric))
+        return abs(ex_to_numeric(x));
+    else
+        return abs(x).hold();
+}
+
+REGISTER_FUNCTION(abs, abs_eval, abs_evalf, NULL, NULL);
 
 //////////
 // dilogarithm
@@ -46,10 +72,10 @@ static ex Li2_eval(ex const & x)
 {
     if (x.is_zero())
         return x;
-    if (x.is_equal(exONE()))
-        return power(Pi, 2) / 6;
-    if (x.is_equal(exMINUSONE()))
-        return -power(Pi, 2) / 12;
+    if (x.is_equal(_ex1()))
+        return power(Pi, _ex2()) / _ex6();
+    if (x.is_equal(_ex_1()))
+        return -power(Pi, _ex2()) / _ex12();
     return Li2(x).hold();
 }
 
@@ -115,7 +141,7 @@ static ex Order_eval(ex const & x)
        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)) {
 
@@ -133,13 +159,16 @@ 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;
-       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);
 }
 
 REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
 
-/** linear solve. */
+//////////
+// Solve linear system
+//////////
+
 ex lsolve(ex const &eqns, ex const &symbols)
 {
     // solve a system of linear equations
@@ -149,8 +178,8 @@ ex lsolve(ex const &eqns, ex const &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
     }
@@ -159,7 +188,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     if (!eqns.info(info_flags::list)) {
         throw(std::invalid_argument("lsolve: 1st argument must be a list"));
     }
-    for (int i=0; i<eqns.nops(); i++) {
+    for (unsigned i=0; i<eqns.nops(); i++) {
         if (!eqns.op(i).info(info_flags::relation_equal)) {
             throw(std::invalid_argument("lsolve: 1st argument must be a list of equations"));
         }
@@ -167,7 +196,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     if (!symbols.info(info_flags::list)) {
         throw(std::invalid_argument("lsolve: 2nd argument must be a list"));
     }
-    for (int i=0; i<symbols.nops(); i++) {
+    for (unsigned i=0; i<symbols.nops(); i++) {
         if (!symbols.op(i).info(info_flags::symbol)) {
             throw(std::invalid_argument("lsolve: 2nd argument must be a list of symbols"));
         }
@@ -177,11 +206,11 @@ ex lsolve(ex const &eqns, ex const &symbols)
     matrix sys(eqns.nops(),symbols.nops());
     matrix rhs(eqns.nops(),1);
     matrix vars(symbols.nops(),1);
-
-    for (int r=0; r<eqns.nops(); r++) {
+    
+    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;
-        for (int c=0; c<symbols.nops(); c++) {
+        for (unsigned c=0; c<symbols.nops(); c++) {
             ex co=eq.coeff(ex_to_symbol(symbols.op(c)),1);
             linpart -= co*symbols.op(c);
             sys.set(r,c,co);
@@ -191,7 +220,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     }
     
     // test if system is linear and fill vars matrix
-    for (int i=0; i<symbols.nops(); i++) {
+    for (unsigned i=0; i<symbols.nops(); i++) {
         vars.set(i,0,symbols.op(i));
         if (sys.has(symbols.op(i))) {
             throw(std::logic_error("lsolve: system is not linear"));
@@ -224,7 +253,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
     
     // return list of the form lst(var1==sol1,var2==sol2,...)
     lst sollist;
-    for (int i=0; i<symbols.nops(); i++) {
+    for (unsigned i=0; i<symbols.nops(); i++) {
         sollist.append(symbols.op(i)==solution(i,0));
     }
     
@@ -235,7 +264,7 @@ ex lsolve(ex const &eqns, ex const &symbols)
 ex ncpower(ex const &basis, unsigned exponent)
 {
     if (exponent==0) {
-        return exONE();
+        return _ex1();
     }
 
     exvector v;
@@ -250,6 +279,8 @@ ex ncpower(ex const &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_zeta = function_index_zeta;
+unsigned force_include_zeta1 = function_index_zeta1;
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE