]> www.ginac.de Git - ginac.git/blobdiff - ginac/pseries.cpp
- simplify_indexed() renames dummy indices so, e.g., "a.i*a.i+a.j*a.j" gets
[ginac.git] / ginac / pseries.cpp
index 7264d933c068bb03a9b3659a318218e43cbb510c..ffb2cfb98125d658cbaeb1be9a2b13e60aeab34c 100644 (file)
@@ -31,6 +31,7 @@
 #include "power.h"
 #include "relational.h"
 #include "symbol.h"
+#include "print.h"
 #include "archive.h"
 #include "utils.h"
 #include "debugmsg.h"
@@ -121,73 +122,85 @@ DEFAULT_UNARCHIVE(pseries)
 // functions overriding virtual functions from bases classes
 //////////
 
-void pseries::print(std::ostream &os, unsigned upper_precedence) const
+void pseries::print(const print_context & c, unsigned level) const
 {
        debugmsg("pseries print", LOGLEVEL_PRINT);
-       if (precedence<=upper_precedence) os << "(";
-       // objects of type pseries must not have any zero entries, so the
-       // trivial (zero) pseries needs a special treatment here:
-       if (seq.size()==0)
-               os << '0';
-       for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
-               // print a sign, if needed
-               if (i!=seq.begin())
-                       os << '+';
-               if (!is_order_function(i->rest)) {
-                       // print 'rest', i.e. the expansion coefficient
-                       if (i->rest.info(info_flags::numeric) &&
-                               i->rest.info(info_flags::positive)) {
-                               os << i->rest;
-                       } else
-                               os << "(" << i->rest << ')';
-                       // print 'coeff', something like (x-1)^42
-                       if (!i->coeff.is_zero()) {
-                               os << '*';
-                               if (!point.is_zero())
-                                       os << '(' << var-point << ')';
-                               else
-                                       os << var;
-                               if (i->coeff.compare(_ex1())) {
-                                       os << '^';
-                                       if (i->coeff.info(info_flags::negative))
-                                               os << '(' << i->coeff << ')';
-                                       else
-                                               os << i->coeff;
-                               }
-                       }
-               } else {
-                       os << Order(power(var-point,i->coeff));
-               }
-       }
-       if (precedence<=upper_precedence) os << ")";
-}
 
+       if (is_of_type(c, print_tree)) {
 
-void pseries::printraw(std::ostream &os) const
-{
-       debugmsg("pseries printraw", LOGLEVEL_PRINT);
-       os << class_name() << "(" << var << ";" << point << ";";
-       for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
-               os << "(" << (*i).rest << "," << (*i).coeff << "),";
-       os << ")";
-}
+               c.s << std::string(level, ' ') << class_name()
+                   << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+                   << std::endl;
+               unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+               for (unsigned i=0; i<seq.size(); ++i) {
+                       seq[i].rest.print(c, level + delta_indent);
+                       seq[i].coeff.print(c, level + delta_indent);
+                       c.s << std::string(level + delta_indent, ' ') << "-----" << std::endl;
+               }
+               var.print(c, level + delta_indent);
+               point.print(c, level + delta_indent);
 
+       } else {
 
-void pseries::printtree(std::ostream & os, unsigned indent) const
-{
-       debugmsg("pseries printtree",LOGLEVEL_PRINT);
-       os << std::string(indent,' ') << class_name()
-          << ", hash=" << hashvalue
-          << " (0x" << std::hex << hashvalue << std::dec << ")"
-          << ", flags=" << flags << std::endl;
-       for (unsigned i=0; i<seq.size(); ++i) {
-               seq[i].rest.printtree(os,indent+delta_indent);
-               seq[i].coeff.printtree(os,indent+delta_indent);
-               if (i!=seq.size()-1)
-                       os << std::string(indent+delta_indent,' ') << "-----" << std::endl;
+               if (precedence <= level)
+                       c.s << "(";
+               
+               std::string par_open = is_of_type(c, print_latex) ? "{(" : "(";
+               std::string par_close = is_of_type(c, print_latex) ? ")}" : ")";
+               
+               // objects of type pseries must not have any zero entries, so the
+               // trivial (zero) pseries needs a special treatment here:
+               if (seq.size() == 0)
+                       c.s << '0';
+               for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+                       // print a sign, if needed
+                       if (i != seq.begin())
+                               c.s << '+';
+                       if (!is_order_function(i->rest)) {
+                               // print 'rest', i.e. the expansion coefficient
+                               if (i->rest.info(info_flags::numeric) &&
+                                       i->rest.info(info_flags::positive)) {
+                                       i->rest.print(c);
+                               } else {
+                                       c.s << par_open;
+                                       i->rest.print(c);
+                                       c.s << par_close;
+                               }
+                               // print 'coeff', something like (x-1)^42
+                               if (!i->coeff.is_zero()) {
+                                       if (is_of_type(c, print_latex))
+                                               c.s << ' ';
+                                       else
+                                               c.s << '*';
+                                       if (!point.is_zero()) {
+                                               c.s << par_open;
+                                               (var-point).print(c);
+                                               c.s << par_close;
+                                       } else
+                                               var.print(c);
+                                       if (i->coeff.compare(_ex1())) {
+                                               c.s << '^';
+                                               if (i->coeff.info(info_flags::negative)) {
+                                                       c.s << par_open;
+                                                       i->coeff.print(c);
+                                                       c.s << par_close;
+                                               } else {
+                                                       if (is_of_type(c, print_latex)) {
+                                                               c.s << '{';
+                                                               i->coeff.print(c);
+                                                               c.s << '}';
+                                                       } else
+                                                               i->coeff.print(c);
+                                               }
+                                       }
+                               }
+                       } else
+                               Order(power(var-point,i->coeff)).print(c);
+               }
+
+               if (precedence <= level)
+                       c.s << ")";
        }
-       var.printtree(os, indent+delta_indent);
-       point.printtree(os, indent+delta_indent);
 }
 
 int pseries::compare_same_type(const basic & other) const
@@ -229,7 +242,6 @@ unsigned pseries::nops(void) const
        return seq.size();
 }
 
-
 /** Return the ith term in the series when represented as a sum. */
 ex pseries::op(int i) const
 {
@@ -238,13 +250,11 @@ ex pseries::op(int i) const
        return seq[i].rest * power(var - point, seq[i].coeff);
 }
 
-
 ex &pseries::let_op(int i)
 {
        throw (std::logic_error("let_op not defined for pseries"));
 }
 
-
 /** Return degree of highest power of the series.  This is usually the exponent
  *  of the Order term.  If s is not the expansion variable of the series, the
  *  series is examined termwise. */
@@ -338,12 +348,11 @@ ex pseries::coeff(const ex &s, int n) const
 }
 
 /** Does nothing. */
-ex pseries::collect(const ex &s) const
+ex pseries::collect(const ex &s, bool distributed) const
 {
        return *this;
 }
 
-
 /** Evaluate coefficients. */
 ex pseries::eval(int level) const
 {
@@ -364,7 +373,6 @@ ex pseries::eval(int level) const
        return (new pseries(relational(var,point), new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
-
 /** Evaluate coefficients numerically. */
 ex pseries::evalf(int level) const
 {
@@ -385,7 +393,6 @@ ex pseries::evalf(int level) const
        return (new pseries(relational(var,point), new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
-
 ex pseries::subs(const lst & ls, const lst & lr) const
 {
        // If expansion variable is being substituted, convert the series to a
@@ -406,7 +413,6 @@ ex pseries::subs(const lst & ls, const lst & lr) const
        return (new pseries(relational(var,point.subs(ls, lr)), newseq))->setflag(status_flags::dynallocated);
 }
 
-
 /** Implementation of ex::expand() for a power series.  It expands all the
  *  terms individually and returns the resulting series as a new pseries. */
 ex pseries::expand(unsigned options) const
@@ -421,7 +427,6 @@ ex pseries::expand(unsigned options) const
                ->setflag(status_flags::dynallocated | status_flags::expanded);
 }
 
-
 /** Implementation of ex::diff() for a power series.  It treats the series as a
  *  polynomial.
  *  @see ex::diff */
@@ -448,10 +453,6 @@ ex pseries::derivative(const symbol & s) const
        }
 }
 
-
-/** Convert a pseries object to an ordinary polynomial.
- *
- *  @param no_order flag: discard higher order terms */
 ex pseries::convert_to_poly(bool no_order) const
 {
        ex e;
@@ -468,9 +469,6 @@ ex pseries::convert_to_poly(bool no_order) const
        return e;
 }
 
-
-/** Returns true if there is no order term, i.e. the series terminates and
- *  false otherwise. */
 bool pseries::is_terminating(void) const
 {
        return seq.size() == 0 || !is_order_function((seq.end()-1)->rest);
@@ -492,7 +490,7 @@ ex basic::series(const relational & r, int order, unsigned options) const
        const symbol &s = static_cast<symbol &>(*r.lhs().bp);
        
        if (!coeff.is_zero())
-               seq.push_back(expair(coeff, numeric(0)));
+               seq.push_back(expair(coeff, _ex0()));
        
        int n;
        for (n=1; n<order; ++n) {