]> www.ginac.de Git - ginac.git/blobdiff - ginac/mul.cpp
use new-style print methods
[ginac.git] / ginac / mul.cpp
index 8fe739987274e6d93dc8449f6fa5be1ed5992881..f2834131b0c914fe5546d76c7f8da862cd038864 100644 (file)
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(mul, expairseq)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(mul, expairseq,
+  print_func<print_context>(&mul::do_print).
+  print_func<print_latex>(&mul::do_print_latex).
+  print_func<print_csrc>(&mul::do_print_csrc).
+  print_func<print_tree>(&inherited::do_print_tree).
+  print_func<print_python_repr>(&mul::do_print_python_repr))
+
 
 //////////
 // default constructor
@@ -118,159 +124,154 @@ DEFAULT_ARCHIVING(mul)
 // functions overriding virtual functions from base classes
 //////////
 
-// public
-void mul::print(const print_context & c, unsigned level) const
+void mul::print_overall_coeff(const print_context & c, const char *mul_sym) const
 {
-       if (is_a<print_tree>(c)) {
+       const numeric &coeff = ex_to<numeric>(overall_coeff);
+       if (coeff.csgn() == -1)
+               c.s << '-';
+       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());
+               }
+               c.s << mul_sym;
+       }
+}
 
-               inherited::print(c, level);
+void mul::do_print(const print_context & c, unsigned level) const
+{
+       if (precedence() <= level)
+               c.s << '(';
 
-       } else if (is_a<print_csrc>(c)) {
+       print_overall_coeff(c, "*");
 
-               if (precedence() <= level)
-                       c.s << "(";
+       epvector::const_iterator it = seq.begin(), itend = seq.end();
+       bool first = true;
+       while (it != itend) {
+               if (!first)
+                       c.s << '*';
+               else
+                       first = false;
+               recombine_pair_to_ex(*it).print(c, precedence());
+               ++it;
+       }
 
-               if (!overall_coeff.is_equal(_ex1)) {
-                       overall_coeff.print(c, precedence());
-                       c.s << "*";
-               }
+       if (precedence() <= level)
+               c.s << ')';
+}
 
-               // Print arguments, separated by "*" or "/"
-               epvector::const_iterator it = seq.begin(), itend = seq.end();
-               while (it != itend) {
-
-                       // If the first argument is a negative integer power, it gets printed as "1.0/<expr>"
-                       bool needclosingparenthesis = false;
-                       if (it == seq.begin() && it->coeff.info(info_flags::negint)) {
-                               if (is_a<print_csrc_cl_N>(c)) {
-                                       c.s << "recip(";
-                                       needclosingparenthesis = true;
-                               } else
-                                       c.s << "1.0/";
-                       }
+void mul::do_print_latex(const print_latex & c, unsigned level) const
+{
+       if (precedence() <= level)
+               c.s << "{(";
 
-                       // If the exponent is 1 or -1, it is left out
-                       if (it->coeff.is_equal(_ex1) || it->coeff.is_equal(_ex_1))
-                               it->rest.print(c, precedence());
-                       else if (it->coeff.info(info_flags::negint))
-                               // Outer parens around ex needed for broken GCC parser:
-                               (ex(power(it->rest, -ex_to<numeric>(it->coeff)))).print(c, level);
-                       else
-                               // Outer parens around ex needed for broken GCC parser:
-                               (ex(power(it->rest, ex_to<numeric>(it->coeff)))).print(c, level);
-
-                       if (needclosingparenthesis)
-                               c.s << ")";
-
-                       // Separator is "/" for negative integer powers, "*" otherwise
-                       ++it;
-                       if (it != itend) {
-                               if (it->coeff.info(info_flags::negint))
-                                       c.s << "/";
-                               else
-                                       c.s << "*";
-                       }
-               }
+       print_overall_coeff(c, " ");
 
-               if (precedence() <= level)
-                       c.s << ")";
+       // Separate factors into those with negative numeric exponent
+       // and all others
+       epvector::const_iterator it = seq.begin(), itend = seq.end();
+       exvector neg_powers, others;
+       while (it != itend) {
+               GINAC_ASSERT(is_exactly_a<numeric>(it->coeff));
+               if (ex_to<numeric>(it->coeff).is_negative())
+                       neg_powers.push_back(recombine_pair_to_ex(expair(it->rest, -(it->coeff))));
+               else
+                       others.push_back(recombine_pair_to_ex(*it));
+               ++it;
+       }
 
-       } else if (is_a<print_python_repr>(c)) {
-               c.s << class_name() << '(';
-               op(0).print(c);
-               for (size_t i=1; i<nops(); ++i) {
-                       c.s << ',';
-                       op(i).print(c);
-               }
-               c.s << ')';
-       } else {
+       if (!neg_powers.empty()) {
 
-               if (precedence() <= level) {
-                       if (is_a<print_latex>(c))
-                               c.s << "{(";
-                       else
-                               c.s << "(";
-               }
+               // Factors with negative exponent are printed as a fraction
+               c.s << "\\frac{";
+               mul(others).eval().print(c);
+               c.s << "}{";
+               mul(neg_powers).eval().print(c);
+               c.s << "}";
 
-               // First print the overall numeric coefficient
-               const numeric &coeff = ex_to<numeric>(overall_coeff);
-               if (coeff.csgn() == -1)
-                       c.s << '-';
-               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<print_latex>(c))
-                               c.s << ' ';
-                       else
-                               c.s << '*';
-               }
+       } else {
 
-               // Then proceed with the remaining factors
-               epvector::const_iterator it = seq.begin(), itend = seq.end();
-               if (is_a<print_latex>(c)) {
-
-                       // Separate factors into those with negative numeric exponent
-                       // and all others
-                       exvector neg_powers, others;
-                       while (it != itend) {
-                               GINAC_ASSERT(is_exactly_a<numeric>(it->coeff));
-                               if (ex_to<numeric>(it->coeff).is_negative())
-                                       neg_powers.push_back(recombine_pair_to_ex(expair(it->rest, -(it->coeff))));
-                               else
-                                       others.push_back(recombine_pair_to_ex(*it));
-                               ++it;
-                       }
+               // All other factors are printed in the ordinary way
+               exvector::const_iterator vit = others.begin(), vitend = others.end();
+               while (vit != vitend) {
+                       c.s << ' ';
+                       vit->print(c, precedence());
+                       ++vit;
+               }
+       }
 
-                       if (!neg_powers.empty()) {
+       if (precedence() <= level)
+               c.s << ")}";
+}
 
-                               // Factors with negative exponent are printed as a fraction
-                               c.s << "\\frac{";
-                               mul(others).eval().print(c);
-                               c.s << "}{";
-                               mul(neg_powers).eval().print(c);
-                               c.s << "}";
+void mul::do_print_csrc(const print_csrc & c, unsigned level) const
+{
+       if (precedence() <= level)
+               c.s << "(";
 
-                       } else {
+       if (!overall_coeff.is_equal(_ex1)) {
+               overall_coeff.print(c, precedence());
+               c.s << "*";
+       }
 
-                               // All other factors are printed in the ordinary way
-                               exvector::const_iterator vit = others.begin(), vitend = others.end();
-                               while (vit != vitend) {
-                                       c.s << ' ';
-                                       vit->print(c, precedence());
-                                       ++vit;
-                               }
-                       }
+       // Print arguments, separated by "*" or "/"
+       epvector::const_iterator it = seq.begin(), itend = seq.end();
+       while (it != itend) {
+
+               // If the first argument is a negative integer power, it gets printed as "1.0/<expr>"
+               bool needclosingparenthesis = false;
+               if (it == seq.begin() && it->coeff.info(info_flags::negint)) {
+                       if (is_a<print_csrc_cl_N>(c)) {
+                               c.s << "recip(";
+                               needclosingparenthesis = true;
+                       } else
+                               c.s << "1.0/";
+               }
 
-               } else {
+               // If the exponent is 1 or -1, it is left out
+               if (it->coeff.is_equal(_ex1) || it->coeff.is_equal(_ex_1))
+                       it->rest.print(c, precedence());
+               else if (it->coeff.info(info_flags::negint))
+                       // Outer parens around ex needed for broken GCC parser:
+                       (ex(power(it->rest, -ex_to<numeric>(it->coeff)))).print(c, level);
+               else
+                       // Outer parens around ex needed for broken GCC parser:
+                       (ex(power(it->rest, ex_to<numeric>(it->coeff)))).print(c, level);
 
-                       bool first = true;
-                       while (it != itend) {
-                               if (!first)
-                                       c.s << '*';
-                               else
-                                       first = false;
-                               recombine_pair_to_ex(*it).print(c, precedence());
-                               ++it;
-                       }
-               }
+               if (needclosingparenthesis)
+                       c.s << ")";
 
-               if (precedence() <= level) {
-                       if (is_a<print_latex>(c))
-                               c.s << ")}";
+               // Separator is "/" for negative integer powers, "*" otherwise
+               ++it;
+               if (it != itend) {
+                       if (it->coeff.info(info_flags::negint))
+                               c.s << "/";
                        else
-                               c.s << ")";
+                               c.s << "*";
                }
        }
+
+       if (precedence() <= level)
+               c.s << ")";
+}
+
+void mul::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<nops(); ++i) {
+               c.s << ',';
+               op(i).print(c);
+       }
+       c.s << ')';
 }
 
 bool mul::info(unsigned inf) const
@@ -558,27 +559,26 @@ bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatch
        return true;
 }
 
-ex mul::algebraic_subs_mul(const lst & ls, const lst & lr, unsigned options) const
+ex mul::algebraic_subs_mul(const exmap & m, unsigned options) const
 {      
        std::vector<bool> subsed(seq.size(), false);
        exvector subsresult(seq.size());
 
-       lst::const_iterator its, itr;
-       for (its = ls.begin(), itr = lr.begin(); its != ls.end(); ++its, ++itr) {
+       for (exmap::const_iterator it = m.begin(); it != m.end(); ++it) {
 
-               if (is_exactly_a<mul>(*its)) {
+               if (is_exactly_a<mul>(it->first)) {
 
                        int nummatches = std::numeric_limits<int>::max();
                        std::vector<bool> currsubsed(seq.size(), false);
                        bool succeed = true;
                        lst repls;
 
-                       for (size_t j=0; j<its->nops(); j++) {
+                       for (size_t j=0; j<it->first.nops(); j++) {
                                bool found=false;
                                for (size_t k=0; k<nops(); k++) {
                                        if (currsubsed[k] || subsed[k])
                                                continue;
-                                       if (tryfactsubs(op(k), its->op(j), nummatches, repls)) {
+                                       if (tryfactsubs(op(k), it->first.op(j), nummatches, repls)) {
                                                currsubsed[k] = true;
                                                found = true;
                                                break;
@@ -599,7 +599,7 @@ ex mul::algebraic_subs_mul(const lst & ls, const lst & lr, unsigned options) con
                                                subsresult[j] = op(j);
                                        else {
                                                foundfirstsubsedfactor = true;
-                                               subsresult[j] = op(j) * power(itr->subs(ex(repls), subs_options::subs_no_pattern) / its->subs(ex(repls), subs_options::subs_no_pattern), nummatches);
+                                               subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::no_pattern) / it->first.subs(ex(repls), subs_options::no_pattern), nummatches);
                                        }
                                        subsed[j] = true;
                                }
@@ -611,9 +611,9 @@ ex mul::algebraic_subs_mul(const lst & ls, const lst & lr, unsigned options) con
                        lst repls;
 
                        for (size_t j=0; j<this->nops(); j++) {
-                               if (!subsed[j] && tryfactsubs(op(j), *its, nummatches, repls)) {
+                               if (!subsed[j] && tryfactsubs(op(j), it->first, nummatches, repls)) {
                                        subsed[j] = true;
-                                       subsresult[j] = op(j) * power(itr->subs(ex(repls), subs_options::subs_no_pattern) / its->subs(ex(repls), subs_options::subs_no_pattern), nummatches);
+                                       subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::no_pattern) / it->first.subs(ex(repls), subs_options::no_pattern), nummatches);
                                }
                        }
                }
@@ -627,7 +627,7 @@ ex mul::algebraic_subs_mul(const lst & ls, const lst & lr, unsigned options) con
                }
        }
        if (!subsfound)
-               return subs_one_level(ls, lr, options | subs_options::subs_algebraic);
+               return subs_one_level(m, options | subs_options::algebraic);
 
        exvector ev; ev.reserve(nops());
        for (size_t i=0; i<nops(); i++) {