]> www.ginac.de Git - ginac.git/blobdiff - ginac/power.cpp
- fix LaTeX-output bug reported by Stefan, remove obsolete has(matrix,ex).
[ginac.git] / ginac / power.cpp
index b0f9cd2d293aad258475067ee4693a820e671f9a..15fed248b889d73b24fd3954ed01c6f659152c3e 100644 (file)
@@ -32,6 +32,7 @@
 #include "inifcns.h"
 #include "relational.h"
 #include "symbol.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
 #include "utils.h"
@@ -46,15 +47,11 @@ typedef std::vector<int> intvector;
 // default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
-// public
-
 power::power() : basic(TINFO_power)
 {
        debugmsg("power default ctor",LOGLEVEL_CONSTRUCT);
 }
 
-// protected
-
 void power::copy(const power & other)
 {
        inherited::copy(other);
@@ -62,23 +59,20 @@ void power::copy(const power & other)
        exponent = other.exponent;
 }
 
-void power::destroy(bool call_parent)
-{
-       if (call_parent) inherited::destroy(call_parent);
-}
+DEFAULT_DESTROY(power)
 
 //////////
 // other ctors
 //////////
 
-// public
-
 power::power(const ex & lh, const ex & rh) : basic(TINFO_power), basis(lh), exponent(rh)
 {
        debugmsg("power ctor from ex,ex",LOGLEVEL_CONSTRUCT);
        GINAC_ASSERT(basis.return_type()==return_types::commutative);
 }
 
+/** Ctor from an ex and a bare numeric.  This is somewhat more efficient than
+ *  the normal ctor from two ex whenever it can be used. */
 power::power(const ex & lh, const numeric & rh) : basic(TINFO_power), basis(lh), exponent(rh)
 {
        debugmsg("power ctor from ex,numeric",LOGLEVEL_CONSTRUCT);
@@ -89,7 +83,6 @@ power::power(const ex & lh, const numeric & rh) : basic(TINFO_power), basis(lh),
 // archiving
 //////////
 
-/** Construct object from archive_node. */
 power::power(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
        debugmsg("power ctor from archive_node", LOGLEVEL_CONSTRUCT);
@@ -97,13 +90,6 @@ power::power(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
        n.find_ex("exponent", exponent, sym_lst);
 }
 
-/** Unarchive the object. */
-ex power::unarchive(const archive_node &n, const lst &sym_lst)
-{
-       return (new power(n, sym_lst))->setflag(status_flags::dynallocated);
-}
-
-/** Archive the object. */
 void power::archive(archive_node &n) const
 {
        inherited::archive(n);
@@ -111,112 +97,118 @@ void power::archive(archive_node &n) const
        n.add_ex("exponent", exponent);
 }
 
+DEFAULT_UNARCHIVE(power)
+
 //////////
 // functions overriding virtual functions from bases classes
 //////////
 
 // public
 
-void power::print(std::ostream & os, unsigned upper_precedence) const
-{
-       debugmsg("power print",LOGLEVEL_PRINT);
-       if (exponent.is_equal(_ex1_2())) {
-               os << "sqrt(" << basis << ")";
-       } else {
-               if (precedence<=upper_precedence) os << "(";
-               basis.print(os,precedence);
-               os << "^";
-               exponent.print(os,precedence);
-               if (precedence<=upper_precedence) os << ")";
-       }
-}
-
-void power::printraw(std::ostream & os) const
-{
-       debugmsg("power printraw",LOGLEVEL_PRINT);
-
-       os << class_name() << "(";
-       basis.printraw(os);
-       os << ",";
-       exponent.printraw(os);
-       os << ",hash=" << hashvalue << ",flags=" << flags << ")";
-}
-
-void power::printtree(std::ostream & os, unsigned indent) const
-{
-       debugmsg("power printtree",LOGLEVEL_PRINT);
-
-       os << std::string(indent,' ') << class_name()
-          << ", hash=" << hashvalue
-          << " (0x" << std::hex << hashvalue << std::dec << ")"
-          << ", flags=" << flags << std::endl;
-       basis.printtree(os, indent+delta_indent);
-       exponent.printtree(os, indent+delta_indent);
-}
-
-static void print_sym_pow(std::ostream & os, unsigned type, const symbol &x, int exp)
+static void print_sym_pow(const print_context & c, const symbol &x, int exp)
 {
        // Optimal output of integer powers of symbols to aid compiler CSE.
        // C.f. ISO/IEC 14882:1998, section 1.9 [intro execution], paragraph 15
        // to learn why such a hack is really necessary.
        if (exp == 1) {
-               x.printcsrc(os, type, 0);
+               x.print(c);
        } else if (exp == 2) {
-               x.printcsrc(os, type, 0);
-               os << "*";
-               x.printcsrc(os, type, 0);
+               x.print(c);
+               c.s << "*";
+               x.print(c);
        } else if (exp & 1) {
-               x.printcsrc(os, 0);
-               os << "*";
-               print_sym_pow(os, type, x, exp-1);
+               x.print(c);
+               c.s << "*";
+               print_sym_pow(c, x, exp-1);
        } else {
-               os << "(";
-               print_sym_pow(os, type, x, exp >> 1);
-               os << ")*(";
-               print_sym_pow(os, type, x, exp >> 1);
-               os << ")";
+               c.s << "(";
+               print_sym_pow(c, x, exp >> 1);
+               c.s << ")*(";
+               print_sym_pow(c, x, exp >> 1);
+               c.s << ")";
        }
 }
 
-void power::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
+void power::print(const print_context & c, unsigned level) const
 {
-       debugmsg("power print csrc", LOGLEVEL_PRINT);
-       
-       // Integer powers of symbols are printed in a special, optimized way
-       if (exponent.info(info_flags::integer)
-        && (is_ex_exactly_of_type(basis, symbol) || is_ex_exactly_of_type(basis, constant))) {
-               int exp = ex_to_numeric(exponent).to_int();
-               if (exp > 0)
-                       os << "(";
-               else {
-                       exp = -exp;
-                       if (type == csrc_types::ctype_cl_N)
-                               os << "recip(";
+       debugmsg("power print", LOGLEVEL_PRINT);
+
+       if (is_of_type(c, print_tree)) {
+
+               inherited::print(c, level);
+
+       } else if (is_of_type(c, print_csrc)) {
+
+               // Integer powers of symbols are printed in a special, optimized way
+               if (exponent.info(info_flags::integer)
+                && (is_ex_exactly_of_type(basis, symbol) || is_ex_exactly_of_type(basis, constant))) {
+                       int exp = ex_to_numeric(exponent).to_int();
+                       if (exp > 0)
+                               c.s << '(';
+                       else {
+                               exp = -exp;
+                               if (is_of_type(c, print_csrc_cl_N))
+                                       c.s << "recip(";
+                               else
+                                       c.s << "1.0/(";
+                       }
+                       print_sym_pow(c, ex_to_symbol(basis), exp);
+                       c.s << ')';
+
+               // <expr>^-1 is printed as "1.0/<expr>" or with the recip() function of CLN
+               } else if (exponent.compare(_num_1()) == 0) {
+                       if (is_of_type(c, print_csrc_cl_N))
+                               c.s << "recip(";
                        else
-                               os << "1.0/(";
-               }
-               print_sym_pow(os, type, static_cast<const symbol &>(*basis.bp), exp);
-               os << ")";
+                               c.s << "1.0/(";
+                       basis.print(c);
+                       c.s << ')';
 
-       // <expr>^-1 is printed as "1.0/<expr>" or with the recip() function of CLN
-       } else if (exponent.compare(_num_1()) == 0) {
-               if (type == csrc_types::ctype_cl_N)
-                       os << "recip(";
-               else
-                       os << "1.0/(";
-               basis.bp->printcsrc(os, type, 0);
-               os << ")";
+               // Otherwise, use the pow() or expt() (CLN) functions
+               } else {
+                       if (is_of_type(c, print_csrc_cl_N))
+                               c.s << "expt(";
+                       else
+                               c.s << "pow(";
+                       basis.print(c);
+                       c.s << ',';
+                       exponent.print(c);
+                       c.s << ')';
+               }
 
-       // Otherwise, use the pow() or expt() (CLN) functions
        } else {
-               if (type == csrc_types::ctype_cl_N)
-                       os << "expt(";
-               else
-                       os << "pow(";
-               basis.bp->printcsrc(os, type, 0);
-               os << ",";
-               exponent.bp->printcsrc(os, type, 0);
-               os << ")";
+
+               if (exponent.is_equal(_ex1_2())) {
+                       if (is_of_type(c, print_latex))
+                               c.s << "\\sqrt{";
+                       else
+                               c.s << "sqrt(";
+                       basis.print(c);
+                       if (is_of_type(c, print_latex))
+                               c.s << '}';
+                       else
+                               c.s << ')';
+               } else {
+                       if (precedence() <= level) {
+                               if (is_of_type(c, print_latex))
+                                       c.s << "{(";
+                               else
+                                       c.s << "(";
+                       }
+                       basis.print(c, precedence());
+                       c.s << '^';
+                       if (is_of_type(c, print_latex))
+                               c.s << '{';
+                       exponent.print(c, precedence());
+                       if (is_of_type(c, print_latex))
+                               c.s << '}';
+                       if (precedence() <= level) {
+                               if (is_of_type(c, print_latex))
+                                       c.s << ")}";
+                               else
+                                       c.s << ')';
+                       }
+               }
        }
 }
 
@@ -251,10 +243,10 @@ ex & power::let_op(int i)
        return i==0 ? basis : exponent;
 }
 
-int power::degree(const symbol & s) const
+int power::degree(const ex & s) const
 {
        if (is_exactly_of_type(*exponent.bp,numeric)) {
-               if ((*basis.bp).compare(s)==0) {
+               if (basis.is_equal(s)) {
                        if (ex_to_numeric(exponent).is_integer())
                                return ex_to_numeric(exponent).to_int();
                        else
@@ -265,10 +257,10 @@ int power::degree(const symbol & s) const
        return 0;
 }
 
-int power::ldegree(const symbol & s) const 
+int power::ldegree(const ex & s) const 
 {
        if (is_exactly_of_type(*exponent.bp,numeric)) {
-               if ((*basis.bp).compare(s)==0) {
+               if (basis.is_equal(s)) {
                        if (ex_to_numeric(exponent).is_integer())
                                return ex_to_numeric(exponent).to_int();
                        else
@@ -279,9 +271,9 @@ int power::ldegree(const symbol & s) const
        return 0;
 }
 
-ex power::coeff(const symbol & s, int n) const
+ex power::coeff(const ex & s, int n) const
 {
-       if ((*basis.bp).compare(s)!=0) {
+       if (!basis.is_equal(s)) {
                // basis not equal to s
                if (n == 0)
                        return *this;
@@ -484,17 +476,16 @@ ex power::evalf(int level) const
        return power(ebasis,eexponent);
 }
 
-ex power::subs(const lst & ls, const lst & lr) const
+ex power::subs(const lst & ls, const lst & lr, bool no_pattern) const
 {
-       const ex & subsed_basis=basis.subs(ls,lr);
-       const ex & subsed_exponent=exponent.subs(ls,lr);
+       const ex &subsed_basis = basis.subs(ls, lr, no_pattern);
+       const ex &subsed_exponent = exponent.subs(ls, lr, no_pattern);
 
-       if (are_ex_trivially_equal(basis,subsed_basis)&&
-               are_ex_trivially_equal(exponent,subsed_exponent)) {
-               return *this;
-       }
-       
-       return power(subsed_basis, subsed_exponent);
+       if (are_ex_trivially_equal(basis, subsed_basis)
+        && are_ex_trivially_equal(exponent, subsed_exponent))
+               return basic::subs(ls, lr, no_pattern);
+       else
+               return ex(power(subsed_basis, subsed_exponent)).bp->basic::subs(ls, lr, no_pattern);
 }
 
 ex power::simplify_ncmul(const exvector & v) const
@@ -685,9 +676,7 @@ ex power::expand_add(const add & a, int n) const
                        cout << "k_cum[" << i << "]=" << k_cum[i] << endl;
                        cout << "upper_limit[" << i << "]=" << upper_limit[i] << endl;
                }
-               for (exvector::const_iterator cit=term.begin(); cit!=term.end(); ++cit) {
-                       cout << *cit << endl;
-               }
+               for_each(term.begin(), term.end(), ostream_iterator<ex>(cout, "\n"));
                cout << "end term" << endl;
                */
                
@@ -844,14 +833,6 @@ ex power::expand_noncommutative(const ex & basis, const numeric & exponent,
 }
 */
 
-//////////
-// static member variables
-//////////
-
-// protected
-
-unsigned power::precedence = 60;
-
 // helper function
 
 ex sqrt(const ex & a)