abs() and conjugate() provide some info() now.

[ginac.git] / ginac / inifcns.cpp

diff --git a/ginac/inifcns.cpp b/ginac/inifcns.cpp
index 0cb2abbd744798bdc61b38348ad71e84e836bc8c..1144ce1997e14eed7911a6b6004a18fcc008b1a4 100644 (file)
--- a/ginac/inifcns.cpp
+++ b/ginac/inifcns.cpp
@@ -76,8 +76,46 @@ static ex conjugate_imag_part(const ex & arg)
        return -arg.imag_part();
 }
 
+static bool func_arg_info(const ex & arg, unsigned inf)
+{
+       // for some functions we can return the info() of its argument
+       // (think of conjugate())
+       switch (inf) {
+               case info_flags::polynomial:
+               case info_flags::integer_polynomial:
+               case info_flags::cinteger_polynomial:
+               case info_flags::rational_polynomial:
+               case info_flags::real:
+               case info_flags::rational:
+               case info_flags::integer:
+               case info_flags::crational:
+               case info_flags::cinteger:
+               case info_flags::even:
+               case info_flags::odd:
+               case info_flags::prime:
+               case info_flags::crational_polynomial:
+               case info_flags::rational_function:
+               case info_flags::algebraic:
+               case info_flags::positive:
+               case info_flags::negative:
+               case info_flags::nonnegative:
+               case info_flags::posint:
+               case info_flags::negint:
+               case info_flags::nonnegint:
+               case info_flags::has_indices:
+                       return arg.info(inf);
+       }
+       return false;
+}
+
+static bool conjugate_info(const ex & arg, unsigned inf)
+{
+       return func_arg_info(arg, inf);
+}
+
 REGISTER_FUNCTION(conjugate_function, eval_func(conjugate_eval).
                                       evalf_func(conjugate_evalf).
+                                      info_func(conjugate_info).
                                       print_func<print_latex>(conjugate_print_latex).
                                       conjugate_func(conjugate_conjugate).
                                       real_part_func(conjugate_real_part).
@@ -207,6 +245,12 @@ static ex abs_eval(const ex & arg)
                        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();
 }
 
@@ -244,8 +288,36 @@ static ex abs_power(const ex & arg, const ex & exp)
                return power(abs(arg), exp).hold();
 }
 
+bool abs_info(const ex & arg, unsigned inf)
+{
+       switch (inf) {
+               case info_flags::integer:
+               case info_flags::even:
+               case info_flags::odd:
+               case info_flags::prime:
+                       return arg.info(inf);
+               case info_flags::nonnegint:
+                       return arg.info(info_flags::integer);
+               case info_flags::nonnegative:
+               case info_flags::real:
+                       return true;
+               case info_flags::negative:
+                       return false;
+               case info_flags::positive:
+                       return arg.info(info_flags::positive) || arg.info(info_flags::negative);
+               case info_flags::has_indices: {
+                       if (arg.info(info_flags::has_indices))
+                               return true;
+                       else
+                               return false;
+               }
+       }
+       return false;
+}
+
 REGISTER_FUNCTION(abs, eval_func(abs_eval).
                        evalf_func(abs_evalf).
+                       info_func(abs_info).
                        print_func<print_latex>(abs_print_latex).
                        print_func<print_csrc_float>(abs_print_csrc_float).
                        print_func<print_csrc_double>(abs_print_csrc_float).