Improve abs_eval(): abs(conjugate(z)) => abs(z), ...

... abs(step(z)) => step(z)

Signed-off-by: Vladimir V. Kisil <kisilv@maths.leeds.ac.uk>

diff --git a/check/exam_inifcns.cpp b/check/exam_inifcns.cpp
index 994aa3444d6cf6e16ed2fd321897a433d3de4f17..77a4b3b73d725c001b9e9a0d67eca2149502b995 100644 (file)
--- a/check/exam_inifcns.cpp
+++ b/check/exam_inifcns.cpp
@@ -224,6 +224,7 @@ static unsigned inifcns_consist_abs()
        unsigned result = 0;
        realsymbol a("a"), b("b"), x("x"), y("y");
        possymbol p("p");
        unsigned result = 0;
        realsymbol a("a"), b("b"), x("x"), y("y");
        possymbol p("p");

+       symbol z("z");

 
        if (!abs(exp(x+I*y)).eval().is_equal(exp(x)))
                ++result;
 
        if (!abs(exp(x+I*y)).eval().is_equal(exp(x)))
                ++result;


@@ -242,6 +243,13 @@ static unsigned inifcns_consist_abs()
        if (!abs(pow(x+I*y,a+I*b)).eval().is_equal(abs(pow(x+I*y,a+I*b))))
                ++result;
 
        if (!abs(pow(x+I*y,a+I*b)).eval().is_equal(abs(pow(x+I*y,a+I*b))))
                ++result;
 

+       if (!abs(z.conjugate()).eval().is_equal(abs(z)))
+               ++result;
+
+       if (!abs(step(z)).eval().is_equal(step(z)))
+               ++result;
+
+       return result;

 }
 
 static unsigned inifcns_consist_various()
 }
 
 static unsigned inifcns_consist_various()

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 0cb2abbd744798bdc61b38348ad71e84e836bc8c..e8aacab81d3004973a81444df19552a08f3d621b 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -207,6 +207,12 @@ static ex abs_eval(const ex & arg)
                        return pow(abs(base), exponent.real_part());
        }
 
                        return pow(abs(base), exponent.real_part());
        }
 

+       if (is_ex_the_function(arg, conjugate_function))
+               return abs(arg.op(0));
+
+       if (is_ex_the_function(arg, step))
+               return arg;
+

        return abs(arg).hold();
 }
 
        return abs(arg).hold();
 }