X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Finifcns_trans.cpp;h=eae92385142ce782c2ffb468d244295931fa5453;hb=a6bb52b00bf185271774e7d56215923700a3ec40;hp=4473fe02aff95f365bd3928e4375ad3faf6149ec;hpb=955cb185a85535ab328ffedbfccdc508ce80fa91;p=ginac.git

diff --git a/ginac/inifcns_trans.cpp b/ginac/inifcns_trans.cpp
index 4473fe02..eae92385 100644
--- a/ginac/inifcns_trans.cpp
+++ b/ginac/inifcns_trans.cpp
@@ -41,7 +41,7 @@ namespace GiNaC {
 // exponential function
 //////////
 
-static ex exp_evalf(ex const & x)
+static ex exp_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -50,7 +50,7 @@ static ex exp_evalf(ex const & x)
     return exp(ex_to_numeric(x)); // -> numeric exp(numeric)
 }
 
-static ex exp_eval(ex const & x)
+static ex exp_eval(const ex & x)
 {
     // exp(0) -> 1
     if (x.is_zero()) {
@@ -80,7 +80,7 @@ static ex exp_eval(ex const & x)
     return exp(x).hold();
 }
 
-static ex exp_diff(ex const & x, unsigned diff_param)
+static ex exp_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
 
@@ -94,7 +94,7 @@ REGISTER_FUNCTION(exp, exp_eval, exp_evalf, exp_diff, NULL);
 // natural logarithm
 //////////
 
-static ex log_evalf(ex const & x)
+static ex log_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -103,7 +103,7 @@ static ex log_evalf(ex const & x)
     return log(ex_to_numeric(x)); // -> numeric log(numeric)
 }
 
-static ex log_eval(ex const & x)
+static ex log_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         if (x.is_equal(_ex1()))  // log(1) -> 0
@@ -120,22 +120,25 @@ static ex log_eval(ex const & x)
         if (!x.info(info_flags::crational))
             return log_evalf(x);
     }
-    // log(exp(t)) -> t (for real-valued t):
+    // log(exp(t)) -> t (if -Pi < t.imag() <= Pi):
     if (is_ex_the_function(x, exp)) {
-        ex t=x.op(0);
-        if (t.info(info_flags::real))
-            return t;
+        ex t = x.op(0);
+        if (t.info(info_flags::numeric)) {
+            numeric nt = ex_to_numeric(t);
+            if (nt.is_real())
+                return t;
+        }
     }
     
     return log(x).hold();
 }
 
-static ex log_diff(ex const & x, unsigned diff_param)
+static ex log_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
 
     // d/dx log(x) -> 1/x
-    return power(x, -1);
+    return power(x, _ex_1());
 }
 
 REGISTER_FUNCTION(log, log_eval, log_evalf, log_diff, NULL);
@@ -144,7 +147,7 @@ REGISTER_FUNCTION(log, log_eval, log_evalf, log_diff, NULL);
 // sine (trigonometric function)
 //////////
 
-static ex sin_evalf(ex const & x)
+static ex sin_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -153,40 +156,44 @@ static ex sin_evalf(ex const & x)
     return sin(ex_to_numeric(x)); // -> numeric sin(numeric)
 }
 
-static ex sin_eval(ex const & x)
-{
-    // sin(n*Pi/6) -> { 0 | +/-1/2 | +/-sqrt(3)/2 | +/-1 }
-    ex SixExOverPi = _ex6()*x/Pi;
-    if (SixExOverPi.info(info_flags::integer)) {
-        numeric z = smod(ex_to_numeric(SixExOverPi),_num12());
-        if (z.is_equal(_num_5()))  // sin(7*Pi/6)  -> -1/2
-            return _ex_1_2();
-        if (z.is_equal(_num_4()))  // sin(8*Pi/6)  -> -sqrt(3)/2
-            return _ex_1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num_3()))  // sin(9*Pi/6)  -> -1
-            return _ex_1();
-        if (z.is_equal(_num_2()))  // sin(10*Pi/6) -> -sqrt(3)/2
-            return _ex_1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num_1()))  // sin(11*Pi/6) -> -1/2
-            return _ex_1_2();
-        if (z.is_equal(_num0()))   // sin(0)       ->  0
-            return _ex0();
-        if (z.is_equal(_num1()))   // sin(1*Pi/6)  ->  1/2
-            return _ex1_2();
-        if (z.is_equal(_num2()))   // sin(2*Pi/6)  ->  sqrt(3)/2
-            return _ex1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num3()))   // sin(3*Pi/6)  ->  1
-            return _ex1();
-        if (z.is_equal(_num4()))   // sin(4*Pi/6)  ->  sqrt(3)/2
-            return _ex1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num5()))   // sin(5*Pi/6)  ->  1/2
-            return _ex1_2();
-        if (z.is_equal(_num6()))   // sin(6*Pi/6)  ->  0
+static ex sin_eval(const ex & x)
+{
+    // sin(n/d*Pi) -> { all known non-nested radicals }
+    ex SixtyExOverPi = _ex60()*x/Pi;
+    ex sign = _ex1();
+    if (SixtyExOverPi.info(info_flags::integer)) {
+        numeric z = mod(ex_to_numeric(SixtyExOverPi),_num120());
+        if (z>=_num60()) {
+            // wrap to interval [0, Pi)
+            z -= _num60();
+            sign = _ex_1();
+        }
+        if (z>_num30()) {
+            // wrap to interval [0, Pi/2)
+            z = _num60()-z;
+        }
+        if (z.is_equal(_num0()))  // sin(0)       -> 0
             return _ex0();
+        if (z.is_equal(_num5()))  // sin(Pi/12)   -> sqrt(6)/4*(1-sqrt(3)/3)
+            return sign*_ex1_4()*power(_ex6(),_ex1_2())*(_ex1()+_ex_1_3()*power(_ex3(),_ex1_2()));
+        if (z.is_equal(_num6()))  // sin(Pi/10)   -> sqrt(5)/4-1/4
+            return sign*(_ex1_4()*power(_ex5(),_ex1_2())+_ex_1_4());
+        if (z.is_equal(_num10())) // sin(Pi/6)    -> 1/2
+            return sign*_ex1_2();
+        if (z.is_equal(_num15())) // sin(Pi/4)    -> sqrt(2)/2
+            return sign*_ex1_2()*power(_ex2(),_ex1_2());
+        if (z.is_equal(_num18())) // sin(3/10*Pi) -> sqrt(5)/4+1/4
+            return sign*(_ex1_4()*power(_ex5(),_ex1_2())+_ex1_4());
+        if (z.is_equal(_num20())) // sin(Pi/3)    -> sqrt(3)/2
+            return sign*_ex1_2()*power(_ex3(),_ex1_2());
+        if (z.is_equal(_num25())) // sin(5/12*Pi) -> sqrt(6)/4*(1+sqrt(3)/3)
+            return sign*_ex1_4()*power(_ex6(),_ex1_2())*(_ex1()+_ex1_3()*power(_ex3(),_ex1_2()));
+        if (z.is_equal(_num30())) // sin(Pi/2)    -> 1
+            return sign*_ex1();
     }
     
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // sin(asin(x)) -> x
         if (is_ex_the_function(x, asin))
             return t;
@@ -205,7 +212,7 @@ static ex sin_eval(ex const & x)
     return sin(x).hold();
 }
 
-static ex sin_diff(ex const & x, unsigned diff_param)
+static ex sin_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -219,7 +226,7 @@ REGISTER_FUNCTION(sin, sin_eval, sin_evalf, sin_diff, NULL);
 // cosine (trigonometric function)
 //////////
 
-static ex cos_evalf(ex const & x)
+static ex cos_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -228,40 +235,44 @@ static ex cos_evalf(ex const & x)
     return cos(ex_to_numeric(x)); // -> numeric cos(numeric)
 }
 
-static ex cos_eval(ex const & x)
-{
-    // cos(n*Pi/6) -> { 0 | +/-1/2 | +/-sqrt(3)/2 | +/-1 }
-    ex SixExOverPi = _ex6()*x/Pi;
-    if (SixExOverPi.info(info_flags::integer)) {
-        numeric z = smod(ex_to_numeric(SixExOverPi),_num12());
-        if (z.is_equal(_num_5()))  // cos(7*Pi/6)  -> -sqrt(3)/2
-            return _ex_1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num_4()))  // cos(8*Pi/6)  -> -1/2
-            return _ex_1_2();
-        if (z.is_equal(_num_3()))  // cos(9*Pi/6)  ->  0
-            return _ex0();
-        if (z.is_equal(_num_2()))  // cos(10*Pi/6) ->  1/2
-            return _ex1_2();
-        if (z.is_equal(_num_1()))  // cos(11*Pi/6) ->  sqrt(3)/2
-            return _ex1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num0()))   // cos(0)       ->  1
-            return _ex1();
-        if (z.is_equal(_num1()))   // cos(1*Pi/6)  ->  sqrt(3)/2
-            return _ex1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num2()))   // cos(2*Pi/6)  ->  1/2
-            return _ex1_2();
-        if (z.is_equal(_num3()))   // cos(3*Pi/6)  ->  0
-            return _ex0();
-        if (z.is_equal(_num4()))   // cos(4*Pi/6)  -> -1/2
-            return _ex_1_2();
-        if (z.is_equal(_num5()))   // cos(5*Pi/6)  -> -sqrt(3)/2
-            return _ex_1_2()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num6()))   // cos(6*Pi/6)  -> -1
-            return _ex_1();
+static ex cos_eval(const ex & x)
+{
+    // cos(n/d*Pi) -> { all known non-nested radicals }
+    ex SixtyExOverPi = _ex60()*x/Pi;
+    ex sign = _ex1();
+    if (SixtyExOverPi.info(info_flags::integer)) {
+        numeric z = mod(ex_to_numeric(SixtyExOverPi),_num120());
+        if (z>=_num60()) {
+            // wrap to interval [0, Pi)
+            z = _num120()-z;
+        }
+        if (z>=_num30()) {
+            // wrap to interval [0, Pi/2)
+            z = _num60()-z;
+            sign = _ex_1();
+        }
+        if (z.is_equal(_num0()))  // cos(0)       -> 1
+            return sign*_ex1();
+        if (z.is_equal(_num5()))  // cos(Pi/12)   -> sqrt(6)/4*(1+sqrt(3)/3)
+            return sign*_ex1_4()*power(_ex6(),_ex1_2())*(_ex1()+_ex1_3()*power(_ex3(),_ex1_2()));
+        if (z.is_equal(_num10())) // cos(Pi/6)    -> sqrt(3)/2
+            return sign*_ex1_2()*power(_ex3(),_ex1_2());
+        if (z.is_equal(_num12())) // cos(Pi/5)    -> sqrt(5)/4+1/4
+            return sign*(_ex1_4()*power(_ex5(),_ex1_2())+_ex1_4());
+        if (z.is_equal(_num15())) // cos(Pi/4)    -> sqrt(2)/2
+            return sign*_ex1_2()*power(_ex2(),_ex1_2());
+        if (z.is_equal(_num20())) // cos(Pi/3)    -> 1/2
+            return sign*_ex1_2();
+        if (z.is_equal(_num24())) // cos(2/5*Pi)  -> sqrt(5)/4-1/4x
+            return sign*(_ex1_4()*power(_ex5(),_ex1_2())+_ex_1_4());
+        if (z.is_equal(_num25())) // cos(5/12*Pi) -> sqrt(6)/4*(1-sqrt(3)/3)
+            return sign*_ex1_4()*power(_ex6(),_ex1_2())*(_ex1()+_ex_1_3()*power(_ex3(),_ex1_2()));
+        if (z.is_equal(_num30())) // cos(Pi/2)    -> 0
+            return sign*_ex0();
     }
     
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // cos(acos(x)) -> x
         if (is_ex_the_function(x, acos))
             return t;
@@ -280,7 +291,7 @@ static ex cos_eval(ex const & x)
     return cos(x).hold();
 }
 
-static ex cos_diff(ex const & x, unsigned diff_param)
+static ex cos_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
 
@@ -294,7 +305,7 @@ REGISTER_FUNCTION(cos, cos_eval, cos_evalf, cos_diff, NULL);
 // tangent (trigonometric function)
 //////////
 
-static ex tan_evalf(ex const & x)
+static ex tan_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -303,28 +314,40 @@ static ex tan_evalf(ex const & x)
     return tan(ex_to_numeric(x));
 }
 
-static ex tan_eval(ex const & x)
-{
-    // tan(n*Pi/6) -> { 0 | +/-sqrt(3) | +/-sqrt(3)/2 }
-    ex SixExOverPi = _ex6()*x/Pi;
-    if (SixExOverPi.info(info_flags::integer)) {
-        numeric z = smod(ex_to_numeric(SixExOverPi),_num6());
-        if (z.is_equal(_num_2()))  // tan(4*Pi/6) -> -sqrt(3)
-            return _ex_1()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num_1()))  // tan(5*Pi/6) -> -sqrt(3)/3
-            return _ex_1_3()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num0()))   // tan(0)      ->  0
+static ex tan_eval(const ex & x)
+{
+    // tan(n/d*Pi) -> { all known non-nested radicals }
+    ex SixtyExOverPi = _ex60()*x/Pi;
+    ex sign = _ex1();
+    if (SixtyExOverPi.info(info_flags::integer)) {
+        numeric z = mod(ex_to_numeric(SixtyExOverPi),_num60());
+        if (z>=_num60()) {
+            // wrap to interval [0, Pi)
+            z -= _num60();
+        }
+        if (z>=_num30()) {
+            // wrap to interval [0, Pi/2)
+            z = _num60()-z;
+            sign = _ex_1();
+        }
+        if (z.is_equal(_num0()))  // tan(0)       -> 0
             return _ex0();
-        if (z.is_equal(_num1()))   // tan(1*Pi/6) ->  sqrt(3)/3
-            return _ex1_3()*power(_ex3(),_ex1_2());
-        if (z.is_equal(_num2()))   // tan(2*Pi/6) ->  sqrt(3)
-            return power(_ex3(),_ex1_2());
-        if (z.is_equal(_num3()))   // tan(3*Pi/6) ->  infinity
+        if (z.is_equal(_num5()))  // tan(Pi/12)   -> 2-sqrt(3)
+            return sign*(_ex2()-power(_ex3(),_ex1_2()));
+        if (z.is_equal(_num10())) // tan(Pi/6)    -> sqrt(3)/3
+            return sign*_ex1_3()*power(_ex3(),_ex1_2());
+        if (z.is_equal(_num15())) // tan(Pi/4)    -> 1
+            return sign*_ex1();
+        if (z.is_equal(_num20())) // tan(Pi/3)    -> sqrt(3)
+            return sign*power(_ex3(),_ex1_2());
+        if (z.is_equal(_num25())) // tan(5/12*Pi) -> 2+sqrt(3)
+            return sign*(power(_ex3(),_ex1_2())+_ex2());
+        if (z.is_equal(_num30())) // tan(Pi/2)    -> infinity
             throw (std::domain_error("tan_eval(): infinity"));
     }
-        
+    
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // tan(atan(x)) -> x
         if (is_ex_the_function(x, atan))
             return t;
@@ -344,24 +367,24 @@ static ex tan_eval(ex const & x)
     return tan(x).hold();
 }
 
-static ex tan_diff(ex const & x, unsigned diff_param)
+static ex tan_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
     // d/dx tan(x) -> 1+tan(x)^2;
-    return (1+power(tan(x),_ex2()));
+    return (_ex1()+power(tan(x),_ex2()));
 }
 
-static ex tan_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex tan_series(const ex & x, const symbol & s, const ex & pt, int order)
 {
     // method:
     // Taylor series where there is no pole falls back to tan_diff.
     // On a pole simply expand sin(x)/cos(x).
-    ex xpoint = x.subs(s==point);
-    if (!(2*xpoint/Pi).info(info_flags::odd))
+    const ex x_pt = x.subs(s==pt);
+    if (!(2*x_pt/Pi).info(info_flags::odd))
         throw do_taylor();  // caught by function::series()
     // if we got here we have to care for a simple pole
-    return (sin(x)/cos(x)).series(s, point, order+2);
+    return (sin(x)/cos(x)).series(s, pt, order+2);
 }
 
 REGISTER_FUNCTION(tan, tan_eval, tan_evalf, tan_diff, tan_series);
@@ -370,7 +393,7 @@ REGISTER_FUNCTION(tan, tan_eval, tan_evalf, tan_diff, tan_series);
 // inverse sine (arc sine)
 //////////
 
-static ex asin_evalf(ex const & x)
+static ex asin_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -379,7 +402,7 @@ static ex asin_evalf(ex const & x)
     return asin(ex_to_numeric(x)); // -> numeric asin(numeric)
 }
 
-static ex asin_eval(ex const & x)
+static ex asin_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // asin(0) -> 0
@@ -405,7 +428,7 @@ static ex asin_eval(ex const & x)
     return asin(x).hold();
 }
 
-static ex asin_diff(ex const & x, unsigned diff_param)
+static ex asin_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -419,7 +442,7 @@ REGISTER_FUNCTION(asin, asin_eval, asin_evalf, asin_diff, NULL);
 // inverse cosine (arc cosine)
 //////////
 
-static ex acos_evalf(ex const & x)
+static ex acos_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -428,7 +451,7 @@ static ex acos_evalf(ex const & x)
     return acos(ex_to_numeric(x)); // -> numeric acos(numeric)
 }
 
-static ex acos_eval(ex const & x)
+static ex acos_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // acos(1) -> 0
@@ -436,10 +459,10 @@ static ex acos_eval(ex const & x)
             return _ex0();
         // acos(1/2) -> Pi/3
         if (x.is_equal(_ex1_2()))
-            return numeric(1,3)*Pi;
+            return _ex1_3()*Pi;
         // acos(0) -> Pi/2
         if (x.is_zero())
-            return numeric(1,2)*Pi;
+            return _ex1_2()*Pi;
         // acos(-1/2) -> 2/3*Pi
         if (x.is_equal(_ex_1_2()))
             return numeric(2,3)*Pi;
@@ -454,7 +477,7 @@ static ex acos_eval(ex const & x)
     return acos(x).hold();
 }
 
-static ex acos_diff(ex const & x, unsigned diff_param)
+static ex acos_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -468,7 +491,7 @@ REGISTER_FUNCTION(acos, acos_eval, acos_evalf, acos_diff, NULL);
 // inverse tangent (arc tangent)
 //////////
 
-static ex atan_evalf(ex const & x)
+static ex atan_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(x,numeric)
@@ -477,7 +500,7 @@ static ex atan_evalf(ex const & x)
     return atan(ex_to_numeric(x)); // -> numeric atan(numeric)
 }
 
-static ex atan_eval(ex const & x)
+static ex atan_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // atan(0) -> 0
@@ -491,11 +514,12 @@ static ex atan_eval(ex const & x)
     return atan(x).hold();
 }    
 
-static ex atan_diff(ex const & x, unsigned diff_param)
+static ex atan_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
 
-    return power(1+x*x, -1);
+    // d/dx atan(x) -> 1/(1+x^2)
+    return power(_ex1()+power(x,_ex2()), _ex_1());
 }
 
 REGISTER_FUNCTION(atan, atan_eval, atan_evalf, atan_diff, NULL);
@@ -504,7 +528,7 @@ REGISTER_FUNCTION(atan, atan_eval, atan_evalf, atan_diff, NULL);
 // inverse tangent (atan2(y,x))
 //////////
 
-static ex atan2_evalf(ex const & y, ex const & x)
+static ex atan2_evalf(const ex & y, const ex & x)
 {
     BEGIN_TYPECHECK
         TYPECHECK(y,numeric)
@@ -514,7 +538,7 @@ static ex atan2_evalf(ex const & y, ex const & x)
     return atan(ex_to_numeric(y),ex_to_numeric(x)); // -> numeric atan(numeric)
 }
 
-static ex atan2_eval(ex const & y, ex const & x)
+static ex atan2_eval(const ex & y, const ex & x)
 {
     if (y.info(info_flags::numeric) && !y.info(info_flags::crational) &&
         x.info(info_flags::numeric) && !x.info(info_flags::crational)) {
@@ -524,16 +548,16 @@ static ex atan2_eval(ex const & y, ex const & x)
     return atan2(y,x).hold();
 }    
 
-static ex atan2_diff(ex const & y, ex const & x, unsigned diff_param)
+static ex atan2_diff(const ex & y, const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param<2);
     
     if (diff_param==0) {
         // d/dy atan(y,x)
-        return x*pow(pow(x,2)+pow(y,2),-1);
+        return x*power(power(x,_ex2())+power(y,_ex2()),_ex_1());
     }
     // d/dx atan(y,x)
-    return -y*pow(pow(x,2)+pow(y,2),-1);
+    return -y*power(power(x,_ex2())+power(y,_ex2()),_ex_1());
 }
 
 REGISTER_FUNCTION(atan2, atan2_eval, atan2_evalf, atan2_diff, NULL);
@@ -542,7 +566,7 @@ REGISTER_FUNCTION(atan2, atan2_eval, atan2_evalf, atan2_diff, NULL);
 // hyperbolic sine (trigonometric function)
 //////////
 
-static ex sinh_evalf(ex const & x)
+static ex sinh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -551,7 +575,7 @@ static ex sinh_evalf(ex const & x)
     return sinh(ex_to_numeric(x)); // -> numeric sinh(numeric)
 }
 
-static ex sinh_eval(ex const & x)
+static ex sinh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         if (x.is_zero())  // sinh(0) -> 0
@@ -565,7 +589,7 @@ static ex sinh_eval(ex const & x)
         return I*sin(x/I);
     
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // sinh(asinh(x)) -> x
         if (is_ex_the_function(x, asinh))
             return t;
@@ -580,7 +604,7 @@ static ex sinh_eval(ex const & x)
     return sinh(x).hold();
 }
 
-static ex sinh_diff(ex const & x, unsigned diff_param)
+static ex sinh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -594,7 +618,7 @@ REGISTER_FUNCTION(sinh, sinh_eval, sinh_evalf, sinh_diff, NULL);
 // hyperbolic cosine (trigonometric function)
 //////////
 
-static ex cosh_evalf(ex const & x)
+static ex cosh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -603,7 +627,7 @@ static ex cosh_evalf(ex const & x)
     return cosh(ex_to_numeric(x)); // -> numeric cosh(numeric)
 }
 
-static ex cosh_eval(ex const & x)
+static ex cosh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         if (x.is_zero())  // cosh(0) -> 1
@@ -617,7 +641,7 @@ static ex cosh_eval(ex const & x)
         return cos(x/I);
     
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // cosh(acosh(x)) -> x
         if (is_ex_the_function(x, acosh))
             return t;
@@ -632,7 +656,7 @@ static ex cosh_eval(ex const & x)
     return cosh(x).hold();
 }
 
-static ex cosh_diff(ex const & x, unsigned diff_param)
+static ex cosh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -646,7 +670,7 @@ REGISTER_FUNCTION(cosh, cosh_eval, cosh_evalf, cosh_diff, NULL);
 // hyperbolic tangent (trigonometric function)
 //////////
 
-static ex tanh_evalf(ex const & x)
+static ex tanh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -655,7 +679,7 @@ static ex tanh_evalf(ex const & x)
     return tanh(ex_to_numeric(x)); // -> numeric tanh(numeric)
 }
 
-static ex tanh_eval(ex const & x)
+static ex tanh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         if (x.is_zero())  // tanh(0) -> 0
@@ -669,7 +693,7 @@ static ex tanh_eval(ex const & x)
         return I*tan(x/I);
     
     if (is_ex_exactly_of_type(x, function)) {
-        ex t=x.op(0);
+        ex t = x.op(0);
         // tanh(atanh(x)) -> x
         if (is_ex_the_function(x, atanh))
             return t;
@@ -684,7 +708,7 @@ static ex tanh_eval(ex const & x)
     return tanh(x).hold();
 }
 
-static ex tanh_diff(ex const & x, unsigned diff_param)
+static ex tanh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -692,16 +716,16 @@ static ex tanh_diff(ex const & x, unsigned diff_param)
     return _ex1()-power(tanh(x),_ex2());
 }
 
-static ex tanh_series(ex const & x, symbol const & s, ex const & point, int order)
+static ex tanh_series(const ex & x, const symbol & s, const ex & pt, int order)
 {
     // method:
     // Taylor series where there is no pole falls back to tanh_diff.
     // On a pole simply expand sinh(x)/cosh(x).
-    ex xpoint = x.subs(s==point);
-    if (!(2*I*xpoint/Pi).info(info_flags::odd))
+    const ex x_pt = x.subs(s==pt);
+    if (!(2*I*x_pt/Pi).info(info_flags::odd))
         throw do_taylor();  // caught by function::series()
     // if we got here we have to care for a simple pole
-    return (sinh(x)/cosh(x)).series(s, point, order+2);
+    return (sinh(x)/cosh(x)).series(s, pt, order+2);
 }
 
 REGISTER_FUNCTION(tanh, tanh_eval, tanh_evalf, tanh_diff, tanh_series);
@@ -710,7 +734,7 @@ REGISTER_FUNCTION(tanh, tanh_eval, tanh_evalf, tanh_diff, tanh_series);
 // inverse hyperbolic sine (trigonometric function)
 //////////
 
-static ex asinh_evalf(ex const & x)
+static ex asinh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -719,7 +743,7 @@ static ex asinh_evalf(ex const & x)
     return asinh(ex_to_numeric(x)); // -> numeric asinh(numeric)
 }
 
-static ex asinh_eval(ex const & x)
+static ex asinh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // asinh(0) -> 0
@@ -733,12 +757,12 @@ static ex asinh_eval(ex const & x)
     return asinh(x).hold();
 }
 
-static ex asinh_diff(ex const & x, unsigned diff_param)
+static ex asinh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
     // d/dx asinh(x) -> 1/sqrt(1+x^2)
-    return power(1+power(x,_ex2()),_ex_1_2());
+    return power(_ex1()+power(x,_ex2()),_ex_1_2());
 }
 
 REGISTER_FUNCTION(asinh, asinh_eval, asinh_evalf, asinh_diff, NULL);
@@ -747,7 +771,7 @@ REGISTER_FUNCTION(asinh, asinh_eval, asinh_evalf, asinh_diff, NULL);
 // inverse hyperbolic cosine (trigonometric function)
 //////////
 
-static ex acosh_evalf(ex const & x)
+static ex acosh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -756,7 +780,7 @@ static ex acosh_evalf(ex const & x)
     return acosh(ex_to_numeric(x)); // -> numeric acosh(numeric)
 }
 
-static ex acosh_eval(ex const & x)
+static ex acosh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // acosh(0) -> Pi*I/2
@@ -776,7 +800,7 @@ static ex acosh_eval(ex const & x)
     return acosh(x).hold();
 }
 
-static ex acosh_diff(ex const & x, unsigned diff_param)
+static ex acosh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);
     
@@ -790,7 +814,7 @@ REGISTER_FUNCTION(acosh, acosh_eval, acosh_evalf, acosh_diff, NULL);
 // inverse hyperbolic tangent (trigonometric function)
 //////////
 
-static ex atanh_evalf(ex const & x)
+static ex atanh_evalf(const ex & x)
 {
     BEGIN_TYPECHECK
        TYPECHECK(x,numeric)
@@ -799,7 +823,7 @@ static ex atanh_evalf(ex const & x)
     return atanh(ex_to_numeric(x)); // -> numeric atanh(numeric)
 }
 
-static ex atanh_eval(ex const & x)
+static ex atanh_eval(const ex & x)
 {
     if (x.info(info_flags::numeric)) {
         // atanh(0) -> 0
@@ -816,7 +840,7 @@ static ex atanh_eval(ex const & x)
     return atanh(x).hold();
 }
 
-static ex atanh_diff(ex const & x, unsigned diff_param)
+static ex atanh_diff(const ex & x, unsigned diff_param)
 {
     GINAC_ASSERT(diff_param==0);