improve mul::info(): the product of two negative terms is positive, ...

[ginac.git] / ginac / mul.cpp

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 763e6037abacefd0719ecdd9fd5ec6d0799abb53..cee5cd7a7a9f4faf3405eb1f4c9af0b52bd26c02 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -283,10 +283,6 @@ bool mul::info(unsigned inf) const
                case info_flags::integer:
                case info_flags::crational:
                case info_flags::cinteger:
                case info_flags::integer:
                case info_flags::crational:
                case info_flags::cinteger:

-               case info_flags::positive:
-               case info_flags::nonnegative:
-               case info_flags::posint:
-               case info_flags::nonnegint:

                case info_flags::even:
                case info_flags::crational_polynomial:
                case info_flags::rational_function: {
                case info_flags::even:
                case info_flags::crational_polynomial:
                case info_flags::rational_function: {


@@ -309,39 +305,73 @@ bool mul::info(unsigned inf) const
                        }
                        return false;
                }
                        }
                        return false;
                }

+               case info_flags::positive:

                case info_flags::negative: {
                case info_flags::negative: {

-                       bool neg = false;
+                       bool pos = true;

                        epvector::const_iterator i = seq.begin(), end = seq.end();
                        while (i != end) {
                                const ex& factor = recombine_pair_to_ex(*i++);
                                if (factor.info(info_flags::positive))
                                        continue;
                                else if (factor.info(info_flags::negative))
                        epvector::const_iterator i = seq.begin(), end = seq.end();
                        while (i != end) {
                                const ex& factor = recombine_pair_to_ex(*i++);
                                if (factor.info(info_flags::positive))
                                        continue;
                                else if (factor.info(info_flags::negative))

-                                       neg = !neg;
+                                       pos = !pos;

                                else
                                        return false;
                        }
                        if (overall_coeff.info(info_flags::negative))
                                else
                                        return false;
                        }
                        if (overall_coeff.info(info_flags::negative))

-                               neg = !neg;
-                       return neg;
+                               pos = !pos;
+                       return (inf ==info_flags::positive? pos : !pos);

                }
                }

+               case info_flags::nonnegative: {
+                       bool pos = true;
+                       epvector::const_iterator i = seq.begin(), end = seq.end();
+                       while (i != end) {
+                               const ex& factor = recombine_pair_to_ex(*i++);
+                               if (factor.info(info_flags::nonnegative) || factor.info(info_flags::positive))
+                                       continue;
+                               else if (factor.info(info_flags::negative))
+                                       pos = !pos;
+                               else
+                                       return false;
+                       }
+                       return (overall_coeff.info(info_flags::negative)? pos : !pos);
+               }
+               case info_flags::posint:

                case info_flags::negint: {
                case info_flags::negint: {

-                       bool neg = false;
+                       bool pos = true;

                        epvector::const_iterator i = seq.begin(), end = seq.end();
                        while (i != end) {
                                const ex& factor = recombine_pair_to_ex(*i++);
                                if (factor.info(info_flags::posint))
                                        continue;
                                else if (factor.info(info_flags::negint))
                        epvector::const_iterator i = seq.begin(), end = seq.end();
                        while (i != end) {
                                const ex& factor = recombine_pair_to_ex(*i++);
                                if (factor.info(info_flags::posint))
                                        continue;
                                else if (factor.info(info_flags::negint))

-                                       neg = !neg;
+                                       pos = !pos;
+                               else
+                                       return false;
+                       }
+                       if (overall_coeff.info(info_flags::negint))
+                               pos = !pos;
+                       else if (!overall_coeff.info(info_flags::posint))
+                               return false;
+                       return (inf ==info_flags::posint? pos : !pos); 
+               }
+               case info_flags::nonnegint: {
+                       bool pos = true;
+                       epvector::const_iterator i = seq.begin(), end = seq.end();
+                       while (i != end) {
+                               const ex& factor = recombine_pair_to_ex(*i++);
+                               if (factor.info(info_flags::nonnegint) || factor.info(info_flags::posint))
+                                       continue;
+                               else if (factor.info(info_flags::negint))
+                                       pos = !pos;

                                else
                                        return false;
                        }
                        if (overall_coeff.info(info_flags::negint))
                                else
                                        return false;
                        }
                        if (overall_coeff.info(info_flags::negint))

-                               neg = !neg;
+                               pos = !pos;

                        else if (!overall_coeff.info(info_flags::posint))
                                return false;
                        else if (!overall_coeff.info(info_flags::posint))
                                return false;

-                       return neg;
+                       return pos; 

                }
        }
        return inherited::info(inf);
                }
        }
        return inherited::info(inf);