X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns.cpp;h=9c5019df6dfabf2ec6d37f585e5af080258c91f2;hp=de48b858452b01c3e2bde8c857e8046de4c06fc0;hb=b810b012f15981b0937fca5385a8fa2428180a6e;hpb=8bcccf834ad41e94a1a4f3a0304c2945b228b4f4

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index de48b858..9c5019df 100644
--- 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
@@ -33,23 +33,49 @@
 #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
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
+//////////
+// absolute value
+//////////
+
+static ex abs_evalf(const ex & x)
+{
+    BEGIN_TYPECHECK
+        TYPECHECK(x,numeric)
+    END_TYPECHECK(abs(x))
+    
+    return abs(ex_to_numeric(x));
+}
+
+static ex abs_eval(const ex & 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
 //////////
 
-static ex Li2_eval(ex const & x)
+static ex Li2_eval(const ex & 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();
 }
 
@@ -59,7 +85,7 @@ REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
 // trilogarithm
 //////////
 
-static ex Li3_eval(ex const & x)
+static ex Li3_eval(const ex & x)
 {
     if (x.is_zero())
         return x;
@@ -72,12 +98,12 @@ REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
 // 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));
@@ -91,12 +117,12 @@ REGISTER_FUNCTION(factorial, factorial_eval, factorial_evalf, NULL, NULL);
 // 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));
@@ -110,12 +136,12 @@ REGISTER_FUNCTION(binomial, binomial_eval, binomial_evalf, NULL, NULL);
 // 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)) {
 
 		// O(c)=O(1)
-		return Order(exONE()).hold();
+		return Order(_ex1()).hold();
 
 	} else if (is_ex_exactly_of_type(x, mul)) {
 
@@ -129,18 +155,21 @@ 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(exONE()), numeric(min(x.ldegree(s), order))));
-	return series(s, point, new_seq);
+	new_seq.push_back(expair(Order(_ex1()), numeric(min(x.ldegree(s), order))));
+	return pseries(s, point, new_seq);
 }
 
 REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
 
-/** linear solve. */
-ex lsolve(ex const &eqns, ex const &symbols)
+//////////
+// Solve linear system
+//////////
+
+ex lsolve(const ex &eqns, const ex &symbols)
 {
     // solve a system of linear equations
     if (eqns.info(info_flags::relation_equal)) {
@@ -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"));
@@ -205,7 +234,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;
@@ -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));
     }
     
@@ -232,10 +261,10 @@ 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 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