X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=a4dcb5b7e153862ecf647a72de36940b89fc2280;hp=511f3b3d23da1cb12ced5edc485b17175e660ee6;hb=547db2f0380c03c7d013aa8bda36aa33ff5559e1;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926 diff --git a/ginac/add.cpp b/ginac/add.cpp index 511f3b3d..a4dcb5b7 100644 --- a/ginac/add.cpp +++ b/ginac/add.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's sums of expressions. */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2004 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 @@ -32,7 +32,12 @@ namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(add, expairseq) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq, + print_func(&add::do_print). + print_func(&add::do_print_latex). + print_func(&add::do_print_csrc). + print_func(&add::do_print_tree). + print_func(&add::do_print_python_repr)) ////////// // default constructor @@ -81,13 +86,12 @@ add::add(const epvector & v, const ex & oc) GINAC_ASSERT(is_canonical()); } -add::add(epvector * vp, const ex & oc) +add::add(std::auto_ptr vp, const ex & oc) { tinfo_key = TINFO_add; - GINAC_ASSERT(vp!=0); + GINAC_ASSERT(vp.get()!=0); overall_coeff = oc; construct_from_epvector(*vp); - delete vp; GINAC_ASSERT(is_canonical()); } @@ -103,130 +107,121 @@ DEFAULT_ARCHIVING(add) // public -void add::print(const print_context & c, unsigned level) const +void add::print_add(const print_context & c, const char *openbrace, const char *closebrace, const char *mul_sym, unsigned level) const { - if (is_a(c)) { + if (precedence() <= level) + c.s << openbrace << '('; - inherited::print(c, level); + numeric coeff; + bool first = true; - } else if (is_a(c)) { + // First print the overall numeric coefficient, if present + if (!overall_coeff.is_zero()) { + overall_coeff.print(c, 0); + first = false; + } - if (precedence() <= level) - c.s << "("; - - // Print arguments, separated by "+" - epvector::const_iterator it = seq.begin(), itend = seq.end(); - while (it != itend) { - - // If the coefficient is -1, it is replaced by a single minus sign - if (it->coeff.is_equal(_ex1)) { - it->rest.print(c, precedence()); - } else if (it->coeff.is_equal(_ex_1)) { - c.s << "-"; - it->rest.print(c, precedence()); - } else if (ex_to(it->coeff).numer().is_equal(_num1)) { - it->rest.print(c, precedence()); - c.s << "/"; - ex_to(it->coeff).denom().print(c, precedence()); - } else if (ex_to(it->coeff).numer().is_equal(_num_1)) { - c.s << "-"; - it->rest.print(c, precedence()); - c.s << "/"; - ex_to(it->coeff).denom().print(c, precedence()); + // Then proceed with the remaining factors + epvector::const_iterator it = seq.begin(), itend = seq.end(); + while (it != itend) { + coeff = ex_to(it->coeff); + if (!first) { + if (coeff.csgn() == -1) c.s << '-'; else c.s << '+'; + } else { + if (coeff.csgn() == -1) c.s << '-'; + first = false; + } + if (!coeff.is_equal(_num1) && + !coeff.is_equal(_num_1)) { + if (coeff.is_rational()) { + if (coeff.is_negative()) + (-coeff).print(c); + else + coeff.print(c); } else { - it->coeff.print(c, precedence()); - c.s << "*"; - it->rest.print(c, precedence()); + if (coeff.csgn() == -1) + (-coeff).print(c, precedence()); + else + coeff.print(c, precedence()); } - - // Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor) - ++it; - if (it != itend - && (is_a(c) || !it->coeff.info(info_flags::real) // sign inside ctor arguments - || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a(it->rest) && it->rest.info(info_flags::negative))))) - c.s << "+"; - } - - if (!overall_coeff.is_zero()) { - if (overall_coeff.info(info_flags::positive) - || is_a(c) || !overall_coeff.info(info_flags::real)) // sign inside ctor argument - c.s << '+'; - overall_coeff.print(c, precedence()); - } - - if (precedence() <= level) - c.s << ")"; - - } else if (is_a(c)) { - - c.s << class_name() << '('; - op(0).print(c); - for (size_t i=1; irest.print(c, precedence()); + ++it; + } - if (precedence() <= level) { - if (is_a(c)) - c.s << "{("; - else - c.s << "("; - } + if (precedence() <= level) + c.s << ')' << closebrace; +} - numeric coeff; - bool first = true; +void add::do_print(const print_context & c, unsigned level) const +{ + print_add(c, "", "", "*", level); +} - // First print the overall numeric coefficient, if present - if (!overall_coeff.is_zero()) { - if (!is_a(c)) - overall_coeff.print(c, 0); - else - overall_coeff.print(c, precedence()); - first = false; - } +void add::do_print_latex(const print_latex & c, unsigned level) const +{ + print_add(c, "{", "}", " ", level); +} - // Then proceed with the remaining factors - epvector::const_iterator it = seq.begin(), itend = seq.end(); - while (it != itend) { - coeff = ex_to(it->coeff); - if (!first) { - if (coeff.csgn() == -1) c.s << '-'; else c.s << '+'; - } else { - if (coeff.csgn() == -1) c.s << '-'; - first = false; - } - if (!coeff.is_equal(_num1) && - !coeff.is_equal(_num_1)) { - if (coeff.is_rational()) { - if (coeff.is_negative()) - (-coeff).print(c); - else - coeff.print(c); - } else { - if (coeff.csgn() == -1) - (-coeff).print(c, precedence()); - else - coeff.print(c, precedence()); - } - if (is_a(c)) - c.s << ' '; - else - c.s << '*'; - } +void add::do_print_csrc(const print_csrc & c, unsigned level) const +{ + if (precedence() <= level) + c.s << "("; + + // Print arguments, separated by "+" + epvector::const_iterator it = seq.begin(), itend = seq.end(); + while (it != itend) { + + // If the coefficient is -1, it is replaced by a single minus sign + if (it->coeff.is_equal(_ex1)) { + it->rest.print(c, precedence()); + } else if (it->coeff.is_equal(_ex_1)) { + c.s << "-"; + it->rest.print(c, precedence()); + } else if (ex_to(it->coeff).numer().is_equal(_num1)) { + it->rest.print(c, precedence()); + c.s << "/"; + ex_to(it->coeff).denom().print(c, precedence()); + } else if (ex_to(it->coeff).numer().is_equal(_num_1)) { + c.s << "-"; + it->rest.print(c, precedence()); + c.s << "/"; + ex_to(it->coeff).denom().print(c, precedence()); + } else { + it->coeff.print(c, precedence()); + c.s << "*"; it->rest.print(c, precedence()); - ++it; } + + // Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor) + ++it; + if (it != itend + && (is_a(c) || !it->coeff.info(info_flags::real) // sign inside ctor arguments + || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a(it->rest) && it->rest.info(info_flags::negative))))) + c.s << "+"; + } + + if (!overall_coeff.is_zero()) { + if (overall_coeff.info(info_flags::positive) + || is_a(c) || !overall_coeff.info(info_flags::real)) // sign inside ctor argument + c.s << '+'; + overall_coeff.print(c, precedence()); + } + + if (precedence() <= level) + c.s << ")"; +} - if (precedence() <= level) { - if (is_a(c)) - c.s << ")}"; - else - c.s << ")"; - } +void add::do_print_python_repr(const print_python_repr & c, unsigned level) const +{ + c.s << class_name() << '('; + op(0).print(c); + for (size_t i=1; i coeffseq(new epvector); // Calculate sum of coefficients in each term epvector::const_iterator i = seq.begin(), end = seq.end(); @@ -318,8 +313,8 @@ ex add::coeff(const ex & s, int n) const * @param level cut-off in recursive evaluation */ ex add::eval(int level) const { - epvector *evaled_seqp = evalchildren(level); - if (evaled_seqp) { + std::auto_ptr evaled_seqp = evalchildren(level); + if (evaled_seqp.get()) { // do more evaluation later return (new add(evaled_seqp, overall_coeff))-> setflag(status_flags::dynallocated); @@ -359,7 +354,7 @@ ex add::evalm() const { // Evaluate children first and add up all matrices. Stop if there's one // term that is not a matrix. - epvector *s = new epvector; + std::auto_ptr s(new epvector); s->reserve(seq.size()); bool all_matrices = true; @@ -381,13 +376,38 @@ ex add::evalm() const ++it; } - if (all_matrices) { - delete s; + if (all_matrices) return sum + overall_coeff; - } else + else return (new add(s, overall_coeff))->setflag(status_flags::dynallocated); } +ex add::conjugate() const +{ + exvector *v = 0; + for (int i=0; ipush_back(op(i).conjugate()); + continue; + } + ex term = op(i); + ex ccterm = term.conjugate(); + if (are_ex_trivially_equal(term, ccterm)) + continue; + v = new exvector; + v->reserve(nops()); + for (int j=0; jpush_back(op(j)); + v->push_back(ccterm); + } + if (v) { + ex result = add(*v); + delete v; + return result; + } + return *this; +} + ex add::eval_ncmul(const exvector & v) const { if (seq.empty()) @@ -402,7 +422,7 @@ ex add::eval_ncmul(const exvector & v) const * @see ex::diff */ ex add::derivative(const symbol & y) const { - epvector *s = new epvector(); + std::auto_ptr s(new epvector); s->reserve(seq.size()); // Only differentiate the "rest" parts of the expairs. This is faster @@ -442,7 +462,7 @@ ex add::thisexpairseq(const epvector & v, const ex & oc) const return (new add(v,oc))->setflag(status_flags::dynallocated); } -ex add::thisexpairseq(epvector * vp, const ex & oc) const +ex add::thisexpairseq(std::auto_ptr vp, const ex & oc) const { return (new add(vp,oc))->setflag(status_flags::dynallocated); } @@ -512,8 +532,8 @@ ex add::recombine_pair_to_ex(const expair & p) const ex add::expand(unsigned options) const { - epvector *vp = expandchildren(options); - if (vp == NULL) { + std::auto_ptr vp = expandchildren(options); + if (vp.get() == 0) { // the terms have not changed, so it is safe to declare this expanded return (options == 0) ? setflag(status_flags::expanded) : *this; }