Additional transformations for mul and power [Sheplyakov].

diff --git a/check/exam_pseries.cpp b/check/exam_pseries.cpp
index 1c8acd939712ddacb3e8dee733907dc76e027783..2e5d2d6ef9e8e5f2b146022813108eb4db660d86 100644 (file)
--- a/check/exam_pseries.cpp
+++ b/check/exam_pseries.cpp
@@ -354,7 +354,8 @@ static unsigned exam_series13()
 {
        unsigned result = 0;
 
-       ex e = pow(2,x)*( 1/x*(-(1+x)/(1-x)) + (1+x)/x/(1-x));
+       ex e = (new mul(pow(2,x), (1/x*(-(1+x)/(1-x)) + (1+x)/x/(1-x)))
+              )->setflag(status_flags::evaluated);
        ex d = Order(x);
        result += check_series(e,0,d,1);
 

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 9bbcd611f697df3bdaf87884616845aec9948e84..b4ef8972920d96b6f5b5043ba5ed404d8d561522 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -446,9 +446,62 @@ ex mul::eval(int level) const
                }
                return (new add(distrseq,
                                ex_to<numeric>(addref.overall_coeff).
-                               mul_dyn(ex_to<numeric>(overall_coeff))))
-                     ->setflag(status_flags::dynallocated | status_flags::evaluated);
+                               mul_dyn(ex_to<numeric>(overall_coeff)))
+                      )->setflag(status_flags::dynallocated | status_flags::evaluated);
+       } else if (seq_size >= 2) {
+               // Strip the content and the unit part from each term. Thus
+               // things like (-x+a)*(3*x-3*a) automagically turn into - 3*(x-a)2
+
+               epvector::const_iterator last = seq.end();
+               epvector::const_iterator i = seq.begin();
+               while (i!=last) {
+                       if (! (is_a<add>(i->rest) && i->coeff.is_equal(_ex1))) {
+                               // power::eval has such a rule, no need to handle powers here
+                               ++i;
+                               continue;
+                       }
+
+                       // XXX: What is the best way to check if the polynomial is a primitive? 
+                       numeric c = i->rest.integer_content();
+                       const numeric& lead_coeff =
+                               ex_to<numeric>(ex_to<add>(i->rest).seq.begin()->coeff).div_dyn(c);
+                       const bool canonicalizable = lead_coeff.is_integer();
+
+                       // XXX: The main variable is chosen in a random way, so this code 
+                       // does NOT transform the term into the canonical form (thus, in some
+                       // very unlucky event it can even loop forever). Hopefully the main
+                       // variable will be the same for all terms in *this
+                       const bool unit_normal = lead_coeff.is_pos_integer();
+                       if ((c == *_num1_p) && ((! canonicalizable) || unit_normal)) {
+                               ++i;
+                               continue;
+                       }
+
+                       std::auto_ptr<epvector> s(new epvector);
+                       s->reserve(seq.size());
+
+                       epvector::const_iterator j=seq.begin();
+                       while (j!=i) {
+                               s->push_back(*j);
+                               ++j;
+                       }
+
+                       if (! unit_normal) {
+                               c = c.mul(*_num_1_p);
+                       }
+                       const ex primitive = (i->rest)/c;
+                       s->push_back(expair(primitive, _ex1));
+                       ++j;
+
+                       while (j!=last) {
+                               s->push_back(*j);
+                               ++j;
+                       }
+                       return (new mul(s, ex_to<numeric>(overall_coeff).mul_dyn(c))
+                              )->setflag(status_flags::dynallocated);
+               }
        }
+
        return this->hold();
 }
 

diff --git a/ginac/power.cpp b/ginac/power.cpp
index fb5e351e7390204dbe6b024f5cc2f8a80c67625b..8829bbae597788f6908e2c4739d68da24ea42619 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -467,8 +467,9 @@ ex power::eval(int level) const
                        if (is_exactly_a<numeric>(sub_exponent)) {
                                const numeric & num_sub_exponent = ex_to<numeric>(sub_exponent);
                                GINAC_ASSERT(num_sub_exponent!=numeric(1));
-                               if (num_exponent->is_integer() || (abs(num_sub_exponent) - (*_num1_p)).is_negative())
+                               if (num_exponent->is_integer() || (abs(num_sub_exponent) - (*_num1_p)).is_negative()) {
                                        return power(sub_basis,num_sub_exponent.mul(*num_exponent));
+                               }
                        }
                }
        
@@ -476,7 +477,31 @@ ex power::eval(int level) const
                if (num_exponent->is_integer() && is_exactly_a<mul>(ebasis)) {
                        return expand_mul(ex_to<mul>(ebasis), *num_exponent, 0);
                }
-       
+
+               // (2*x + 6*y)^(-4) -> 1/16*(x + 3*y)^(-4)
+               if (num_exponent->is_integer() && is_exactly_a<add>(ebasis)) {
+                       const numeric icont = ebasis.integer_content();
+                       const numeric& lead_coeff = 
+                               ex_to<numeric>(ex_to<add>(ebasis).seq.begin()->coeff).div_dyn(icont);
+
+                       const bool canonicalizable = lead_coeff.is_integer();
+                       const bool unit_normal = lead_coeff.is_pos_integer();
+
+                       if (icont != *_num1_p) {
+                               return (new mul(power(ebasis/icont, *num_exponent), power(icont, *num_exponent))
+                                      )->setflag(status_flags::dynallocated);
+                       }
+
+                       if (canonicalizable && (! unit_normal)) {
+                               if (num_exponent->is_even()) {
+                                       return power(-ebasis, *num_exponent);
+                               } else {
+                                       return (new mul(power(-ebasis, *num_exponent), *_num_1_p)
+                                              )->setflag(status_flags::dynallocated);
+                               }
+                       }
+               }
+
                // ^(*(...,x;c1),c2) -> *(^(*(...,x;1),c2),c1^c2)  (c1, c2 numeric(), c1>0)
                // ^(*(...,x;c1),c2) -> *(^(*(...,x;-1),c2),(-c1)^c2)  (c1, c2 numeric(), c1<0)
                if (is_exactly_a<mul>(ebasis)) {