]> www.ginac.de Git - ginac.git/blobdiff - ginac/power.cpp
- (l)degree(s), coeff(s, n) and collect(s) were extended to accept expressions
[ginac.git] / ginac / power.cpp
index 33f572f973745544ba2db9df4c6c08955a90a265..4c7519ec9c3b75866896555dbf7bfdd5cbd2c046 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
 #include "symbol.h"
 #include "print.h"
 #include "archive.h"
-#include "debugmsg.h"
 #include "utils.h"
 
 namespace GiNaC {
@@ -46,13 +45,10 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(power, basic)
 typedef std::vector<int> intvector;
 
 //////////
-// default ctor, dtor, copy ctor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
-power::power() : inherited(TINFO_power)
-{
-       debugmsg("power default ctor",LOGLEVEL_CONSTRUCT);
-}
+power::power() : inherited(TINFO_power) { }
 
 void power::copy(const power & other)
 {
@@ -75,7 +71,6 @@ DEFAULT_DESTROY(power)
 
 power::power(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("power ctor from archive_node", LOGLEVEL_CONSTRUCT);
        n.find_ex("basis", basis, sym_lst);
        n.find_ex("exponent", exponent, sym_lst);
 }
@@ -121,8 +116,6 @@ static void print_sym_pow(const print_context & c, const symbol &x, int exp)
 
 void power::print(const print_context & c, unsigned level) const
 {
-       debugmsg("power print", LOGLEVEL_PRINT);
-
        if (is_a<print_tree>(c)) {
 
                inherited::print(c, level);
@@ -146,7 +139,7 @@ void power::print(const print_context & c, unsigned level) const
                        c.s << ')';
 
                // <expr>^-1 is printed as "1.0/<expr>" or with the recip() function of CLN
-               } else if (exponent.compare(_num_1()) == 0) {
+               } else if (exponent.is_equal(_ex_1)) {
                        if (is_a<print_csrc_cl_N>(c))
                                c.s << "recip(";
                        else
@@ -166,9 +159,17 @@ void power::print(const print_context & c, unsigned level) const
                        c.s << ')';
                }
 
+       } else if (is_a<print_python_repr>(c)) {
+
+               c.s << class_name() << '(';
+               basis.print(c);
+               c.s << ',';
+               exponent.print(c);
+               c.s << ')';
+
        } else {
 
-               if (exponent.is_equal(_ex1_2())) {
+               if (exponent.is_equal(_ex1_2)) {
                        if (is_a<print_latex>(c))
                                c.s << "\\sqrt{";
                        else
@@ -186,7 +187,10 @@ void power::print(const print_context & c, unsigned level) const
                                        c.s << "(";
                        }
                        basis.print(c, precedence());
-                       c.s << '^';
+                       if (is_a<print_python>(c))
+                               c.s << "**";
+                       else
+                               c.s << '^';
                        if (is_a<print_latex>(c))
                                c.s << '{';
                        exponent.print(c, precedence());
@@ -240,49 +244,59 @@ ex power::map(map_function & f) const
 
 int power::degree(const ex & s) const
 {
-       if (is_ex_exactly_of_type(exponent, numeric) && ex_to<numeric>(exponent).is_integer()) {
+       if (is_equal(ex_to<basic>(s)))
+               return 1;
+       else if (is_ex_exactly_of_type(exponent, numeric) && ex_to<numeric>(exponent).is_integer()) {
                if (basis.is_equal(s))
                        return ex_to<numeric>(exponent).to_int();
                else
                        return basis.degree(s) * ex_to<numeric>(exponent).to_int();
-       }
-       return 0;
+       } else if (basis.has(s))
+               throw(std::runtime_error("power::degree(): undefined degree because of non-integer exponent"));
+       else
+               return 0;
 }
 
 int power::ldegree(const ex & s) const 
 {
-       if (is_ex_exactly_of_type(exponent, numeric) && ex_to<numeric>(exponent).is_integer()) {
+       if (is_equal(ex_to<basic>(s)))
+               return 1;
+       else if (is_ex_exactly_of_type(exponent, numeric) && ex_to<numeric>(exponent).is_integer()) {
                if (basis.is_equal(s))
                        return ex_to<numeric>(exponent).to_int();
                else
                        return basis.ldegree(s) * ex_to<numeric>(exponent).to_int();
-       }
-       return 0;
+       } else if (basis.has(s))
+               throw(std::runtime_error("power::ldegree(): undefined degree because of non-integer exponent"));
+       else
+               return 0;
 }
 
 ex power::coeff(const ex & s, int n) const
 {
-       if (!basis.is_equal(s)) {
+       if (is_equal(ex_to<basic>(s)))
+               return n==1 ? _ex1 : _ex0;
+       else if (!basis.is_equal(s)) {
                // basis not equal to s
                if (n == 0)
                        return *this;
                else
-                       return _ex0();
+                       return _ex0;
        } else {
                // basis equal to s
                if (is_ex_exactly_of_type(exponent, numeric) && ex_to<numeric>(exponent).is_integer()) {
                        // integer exponent
                        int int_exp = ex_to<numeric>(exponent).to_int();
                        if (n == int_exp)
-                               return _ex1();
+                               return _ex1;
                        else
-                               return _ex0();
+                               return _ex0;
                } else {
                        // non-integer exponents are treated as zero
                        if (n == 0)
                                return *this;
                        else
-                               return _ex0();
+                               return _ex0;
                }
        }
 }
@@ -303,8 +317,6 @@ ex power::coeff(const ex & s, int n) const
  *  @param level cut-off in recursive evaluation */
 ex power::eval(int level) const
 {
-       debugmsg("power eval",LOGLEVEL_MEMBER_FUNCTION);
-       
        if ((level==1) && (flags & status_flags::evaluated))
                return *this;
        else if (level == -max_recursion_level)
@@ -332,11 +344,11 @@ ex power::eval(int level) const
                if (ebasis.is_zero())
                        throw (std::domain_error("power::eval(): pow(0,0) is undefined"));
                else
-                       return _ex1();
+                       return _ex1;
        }
        
        // ^(x,1) -> x
-       if (eexponent.is_equal(_ex1()))
+       if (eexponent.is_equal(_ex1))
                return ebasis;
 
        // ^(0,c1) -> 0 or exception  (depending on real value of c1)
@@ -346,12 +358,12 @@ ex power::eval(int level) const
                else if ((num_exponent->real()).is_negative())
                        throw (pole_error("power::eval(): division by zero",1));
                else
-                       return _ex0();
+                       return _ex0;
        }
 
        // ^(1,x) -> 1
-       if (ebasis.is_equal(_ex1()))
-               return _ex1();
+       if (ebasis.is_equal(_ex1))
+               return _ex1;
 
        if (exponent_is_numerical) {
 
@@ -420,7 +432,7 @@ ex power::eval(int level) const
                        if (is_ex_exactly_of_type(sub_exponent,numeric)) {
                                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()).is_negative())
+                               if (num_exponent->is_integer() || (abs(num_sub_exponent) - _num1).is_negative())
                                        return power(sub_basis,num_sub_exponent.mul(*num_exponent));
                        }
                }
@@ -435,21 +447,21 @@ ex power::eval(int level) const
                if (is_ex_exactly_of_type(ebasis,mul)) {
                        GINAC_ASSERT(!num_exponent->is_integer()); // should have been handled above
                        const mul & mulref = ex_to<mul>(ebasis);
-                       if (!mulref.overall_coeff.is_equal(_ex1())) {
+                       if (!mulref.overall_coeff.is_equal(_ex1)) {
                                const numeric & num_coeff = ex_to<numeric>(mulref.overall_coeff);
                                if (num_coeff.is_real()) {
                                        if (num_coeff.is_positive()) {
                                                mul *mulp = new mul(mulref);
-                                               mulp->overall_coeff = _ex1();
+                                               mulp->overall_coeff = _ex1;
                                                mulp->clearflag(status_flags::evaluated);
                                                mulp->clearflag(status_flags::hash_calculated);
                                                return (new mul(power(*mulp,exponent),
                                                                power(num_coeff,*num_exponent)))->setflag(status_flags::dynallocated);
                                        } else {
-                                               GINAC_ASSERT(num_coeff.compare(_num0())<0);
-                                               if (num_coeff.compare(_num_1())!=0) {
+                                               GINAC_ASSERT(num_coeff.compare(_num0)<0);
+                                               if (!num_coeff.is_equal(_num_1)) {
                                                        mul *mulp = new mul(mulref);
-                                                       mulp->overall_coeff = _ex_1();
+                                                       mulp->overall_coeff = _ex_1;
                                                        mulp->clearflag(status_flags::evaluated);
                                                        mulp->clearflag(status_flags::hash_calculated);
                                                        return (new mul(power(*mulp,exponent),
@@ -478,8 +490,6 @@ ex power::eval(int level) const
 
 ex power::evalf(int level) const
 {
-       debugmsg("power evalf",LOGLEVEL_MEMBER_FUNCTION);
-       
        ex ebasis;
        ex eexponent;
        
@@ -490,7 +500,7 @@ ex power::evalf(int level) const
                throw(std::runtime_error("max recursion level reached"));
        } else {
                ebasis = basis.evalf(level-1);
-               if (!is_ex_exactly_of_type(exponent,numeric))
+               if (!is_exactly_a<numeric>(exponent))
                        eexponent = exponent.evalf(level-1);
                else
                        eexponent = exponent;
@@ -538,14 +548,14 @@ ex power::derivative(const symbol & s) const
                // D(b^r) = r * b^(r-1) * D(b) (faster than the formula below)
                epvector newseq;
                newseq.reserve(2);
-               newseq.push_back(expair(basis, exponent - _ex1()));
-               newseq.push_back(expair(basis.diff(s), _ex1()));
+               newseq.push_back(expair(basis, exponent - _ex1));
+               newseq.push_back(expair(basis.diff(s), _ex1));
                return mul(newseq, exponent);
        } else {
                // D(b^e) = b^e * (D(e)*ln(b) + e*D(b)/b)
                return mul(*this,
                           add(mul(exponent.diff(s), log(basis)),
-                          mul(mul(exponent, basis.diff(s)), power(basis, _ex_1()))));
+                          mul(mul(exponent, basis.diff(s)), power(basis, _ex_1))));
        }
 }
 
@@ -754,21 +764,21 @@ ex power::expand_add_2(const add & a) const
                             !is_exactly_a<mul>(ex_to<power>(r).basis) ||
                             !is_exactly_a<power>(ex_to<power>(r).basis));
                
-               if (are_ex_trivially_equal(c,_ex1())) {
+               if (are_ex_trivially_equal(c,_ex1)) {
                        if (is_ex_exactly_of_type(r,mul)) {
-                               sum.push_back(expair(expand_mul(ex_to<mul>(r),_num2()),
-                                                    _ex1()));
+                               sum.push_back(expair(expand_mul(ex_to<mul>(r),_num2),
+                                                    _ex1));
                        } else {
-                               sum.push_back(expair((new power(r,_ex2()))->setflag(status_flags::dynallocated),
-                                                    _ex1()));
+                               sum.push_back(expair((new power(r,_ex2))->setflag(status_flags::dynallocated),
+                                                    _ex1));
                        }
                } else {
                        if (is_ex_exactly_of_type(r,mul)) {
-                               sum.push_back(expair(expand_mul(ex_to<mul>(r),_num2()),
-                                                    ex_to<numeric>(c).power_dyn(_num2())));
+                               sum.push_back(expair(expand_mul(ex_to<mul>(r),_num2),
+                                                    ex_to<numeric>(c).power_dyn(_num2)));
                        } else {
-                               sum.push_back(expair((new power(r,_ex2()))->setflag(status_flags::dynallocated),
-                                                    ex_to<numeric>(c).power_dyn(_num2())));
+                               sum.push_back(expair((new power(r,_ex2))->setflag(status_flags::dynallocated),
+                                                    ex_to<numeric>(c).power_dyn(_num2)));
                        }
                }
                        
@@ -776,7 +786,7 @@ ex power::expand_add_2(const add & a) const
                        const ex & r1 = cit1->rest;
                        const ex & c1 = cit1->coeff;
                        sum.push_back(a.combine_ex_with_coeff_to_pair((new mul(r,r1))->setflag(status_flags::dynallocated),
-                                                                     _num2().mul(ex_to<numeric>(c)).mul_dyn(ex_to<numeric>(c1))));
+                                                                     _num2.mul(ex_to<numeric>(c)).mul_dyn(ex_to<numeric>(c1))));
                }
        }
        
@@ -786,10 +796,10 @@ ex power::expand_add_2(const add & a) const
        if (!a.overall_coeff.is_zero()) {
                epvector::const_iterator i = a.seq.begin(), end = a.seq.end();
                while (i != end) {
-                       sum.push_back(a.combine_pair_with_coeff_to_pair(*i, ex_to<numeric>(a.overall_coeff).mul_dyn(_num2())));
+                       sum.push_back(a.combine_pair_with_coeff_to_pair(*i, ex_to<numeric>(a.overall_coeff).mul_dyn(_num2)));
                        ++i;
                }
-               sum.push_back(expair(ex_to<numeric>(a.overall_coeff).power_dyn(_num2()),_ex1()));
+               sum.push_back(expair(ex_to<numeric>(a.overall_coeff).power_dyn(_num2),_ex1));
        }
        
        GINAC_ASSERT(sum.size()==(a_nops*(a_nops+1))/2);
@@ -802,7 +812,7 @@ ex power::expand_add_2(const add & a) const
 ex power::expand_mul(const mul & m, const numeric & n) const
 {
        if (n.is_zero())
-               return _ex1();
+               return _ex1;
        
        epvector distrseq;
        distrseq.reserve(m.seq.size());
@@ -821,11 +831,4 @@ ex power::expand_mul(const mul & m, const numeric & n) const
        return (new mul(distrseq,ex_to<numeric>(m.overall_coeff).power_dyn(n)))->setflag(status_flags::dynallocated);
 }
 
-// helper function
-
-ex sqrt(const ex & a)
-{
-       return power(a,_ex1_2());
-}
-
 } // namespace GiNaC