X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.cpp;h=163c3c864ef250da663fefc647a9c3d7e6831921;hp=473a1c9ef43513711c8d876bdf90f65f5bb6b78e;hb=d27f0faccba9e6d846072df8930c562db319a919;hpb=d448856f20cb58f939ddbf636e7f72e3599b1468 diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp index 473a1c9e..163c3c86 100644 --- a/ginac/ncmul.cpp +++ b/ginac/ncmul.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's non-commutative products of expressions. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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 @@ -29,28 +29,27 @@ #include "add.h" #include "mul.h" #include "matrix.h" -#include "print.h" #include "archive.h" -#include "debugmsg.h" #include "utils.h" namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(ncmul, exprseq) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(ncmul, exprseq, + print_func(&ncmul::do_print). + print_func(&basic::do_print_tree). + print_func(&ncmul::do_print_csrc). + print_func(&ncmul::do_print_csrc)) + ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default constructor ////////// ncmul::ncmul() { - debugmsg("ncmul default constructor",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } -DEFAULT_COPY(ncmul) -DEFAULT_DESTROY(ncmul) - ////////// // other constructors ////////// @@ -59,46 +58,39 @@ DEFAULT_DESTROY(ncmul) ncmul::ncmul(const ex & lh, const ex & rh) : inherited(lh,rh) { - debugmsg("ncmul constructor from ex,ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3) : inherited(f1,f2,f3) { - debugmsg("ncmul constructor from 3 ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3, const ex & f4) : inherited(f1,f2,f3,f4) { - debugmsg("ncmul constructor from 4 ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3, const ex & f4, const ex & f5) : inherited(f1,f2,f3,f4,f5) { - debugmsg("ncmul constructor from 5 ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3, const ex & f4, const ex & f5, const ex & f6) : inherited(f1,f2,f3,f4,f5,f6) { - debugmsg("ncmul constructor from 6 ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(const exvector & v, bool discardable) : inherited(v,discardable) { - debugmsg("ncmul constructor from exvector,bool",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } ncmul::ncmul(exvector * vp) : inherited(vp) { - debugmsg("ncmul constructor from exvector *",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_ncmul; } @@ -114,28 +106,15 @@ DEFAULT_ARCHIVING(ncmul) // public -void ncmul::print(const print_context & c, unsigned level) const +void ncmul::do_print(const print_context & c, unsigned level) const { - debugmsg("ncmul print", LOGLEVEL_PRINT); - - if (is_a(c)) { - - inherited::print(c, level); - - } else if (is_a(c)) { - - c.s << "ncmul("; - exvector::const_iterator it = seq.begin(), itend = seq.end()-1; - while (it != itend) { - it->print(c, precedence()); - c.s << ","; - it++; - } - it->print(c, precedence()); - c.s << ")"; + printseq(c, '(', '*', ')', precedence(), level); +} - } else - printseq(c, '(', '*', ')', precedence(), level); +void ncmul::do_print_csrc(const print_context & c, unsigned level) const +{ + c.s << class_name(); + printseq(c, '(', ',', ')', precedence(), precedence()); } bool ncmul::info(unsigned inf) const @@ -155,15 +134,15 @@ ex ncmul::expand(unsigned options) const intvector positions_of_adds(expanded_seq.size()); intvector number_of_add_operands(expanded_seq.size()); - int number_of_adds = 0; - int number_of_expanded_terms = 1; + size_t number_of_adds = 0; + size_t number_of_expanded_terms = 1; - unsigned current_position = 0; + size_t current_position = 0; exvector::const_iterator last = expanded_seq.end(); for (exvector::const_iterator cit=expanded_seq.begin(); cit!=last; ++cit) { if (is_exactly_a(*cit)) { positions_of_adds[number_of_adds] = current_position; - unsigned num_ops = cit->nops(); + size_t num_ops = cit->nops(); number_of_add_operands[number_of_adds] = num_ops; number_of_expanded_terms *= num_ops; number_of_adds++; @@ -185,7 +164,7 @@ ex ncmul::expand(unsigned options) const while (true) { exvector term = expanded_seq; - for (int i=0; i setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0))); @@ -259,15 +238,15 @@ ex ncmul::coeff(const ex & s, int n) const if (coeff_found) return (new ncmul(coeffseq,1))->setflag(status_flags::dynallocated); - return _ex0(); + return _ex0; } -unsigned ncmul::count_factors(const ex & e) const +size_t ncmul::count_factors(const ex & e) const { - if ((is_ex_exactly_of_type(e,mul)&&(e.return_type()!=return_types::commutative))|| - (is_ex_exactly_of_type(e,ncmul))) { - unsigned factors=0; - for (unsigned i=0; i(e)&&(e.return_type()!=return_types::commutative))|| + (is_exactly_a(e))) { + size_t factors=0; + for (size_t i=0; i(e)&&(e.return_type()!=return_types::commutative))|| + (is_exactly_a(e))) { + for (size_t i=0; i exvectorvector; * - ncmul() -> 1 * - ncmul(...,c1,...,c2,...) -> *(c1,c2,ncmul(...)) (pull out commutative elements) * - ncmul(x1,y1,x2,y2) -> *(ncmul(x1,x2),ncmul(y1,y2)) (collect elements of same type) - * - ncmul(x1,x2,x3,...) -> x::simplify_ncmul(x1,x2,x3,...) + * - ncmul(x1,x2,x3,...) -> x::eval_ncmul(x1,x2,x3,...) * * @param level cut-off in recursive evaluation */ ex ncmul::eval(int level) const @@ -316,7 +295,7 @@ ex ncmul::eval(int level) const // ncmul(...,*(x1,x2),...,ncmul(x3,x4),...) -> // ncmul(...,x1,x2,...,x3,x4,...) (associativity) - unsigned factors = 0; + size_t factors = 0; exvector::const_iterator cit = evaledseq.begin(), citend = evaledseq.end(); while (cit != citend) factors += count_factors(*cit++); @@ -331,15 +310,15 @@ ex ncmul::eval(int level) const if (assocseq.size()==1) return *(seq.begin()); // ncmul() -> 1 - if (assocseq.empty()) return _ex1(); + if (assocseq.empty()) return _ex1; // determine return types unsignedvector rettypes; rettypes.reserve(assocseq.size()); - unsigned i = 0; - unsigned count_commutative=0; - unsigned count_noncommutative=0; - unsigned count_noncommutative_composite=0; + size_t i = 0; + size_t count_commutative=0; + size_t count_noncommutative=0; + size_t count_noncommutative_composite=0; cit = assocseq.begin(); citend = assocseq.end(); while (cit != citend) { switch (rettypes[i] = cit->return_type()) { @@ -366,8 +345,8 @@ ex ncmul::eval(int level) const commutativeseq.reserve(count_commutative+1); exvector noncommutativeseq; noncommutativeseq.reserve(assocseq.size()-count_commutative); - unsigned num = assocseq.size(); - for (unsigned i=0; ireturn_type_tinfo(); - unsigned rtt_num = rttinfos.size(); + size_t rtt_num = rttinfos.size(); // search type in vector of known types for (i=0; i 0); - unsigned s=0; + size_t s=0; for (i=0; ibegin(); itend = s->end(); - if (is_ex_of_type(*it, matrix)) { + if (is_a(*it)) { matrix prod(ex_to(*it)); it++; while (it != itend) { - if (!is_ex_of_type(*it, matrix)) + if (!is_a(*it)) goto no_matrix; prod = prod.mul(ex_to(*it)); it++; @@ -468,12 +447,12 @@ no_matrix: return (new ncmul(s))->setflag(status_flags::dynallocated); } -ex ncmul::thisexprseq(const exvector & v) const +ex ncmul::thiscontainer(const exvector & v) const { return (new ncmul(v))->setflag(status_flags::dynallocated); } -ex ncmul::thisexprseq(exvector * vp) const +ex ncmul::thiscontainer(exvector * vp) const { return (new ncmul(vp))->setflag(status_flags::dynallocated); } @@ -485,13 +464,13 @@ ex ncmul::thisexprseq(exvector * vp) const * @see ex::diff */ ex ncmul::derivative(const symbol & s) const { - unsigned num = seq.size(); + size_t num = seq.size(); exvector addseq; addseq.reserve(num); // D(a*b*c) = D(a)*b*c + a*D(b)*c + a*b*D(c) exvector ncmulseq = seq; - for (unsigned i=0; isetflag(status_flags::dynallocated)); @@ -505,7 +484,7 @@ int ncmul::compare_same_type(const basic & other) const return inherited::compare_same_type(other); } -unsigned ncmul::return_type(void) const +unsigned ncmul::return_type() const { if (seq.empty()) return return_types::commutative; @@ -537,7 +516,7 @@ unsigned ncmul::return_type(void) const return all_commutative ? return_types::commutative : return_types::noncommutative; } -unsigned ncmul::return_type_tinfo(void) const +unsigned ncmul::return_type_tinfo() const { if (seq.empty()) return tinfo_key; @@ -576,7 +555,7 @@ exvector ncmul::expandchildren(unsigned options) const return s; } -const exvector & ncmul::get_factors(void) const +const exvector & ncmul::get_factors() const { return seq; } @@ -585,15 +564,15 @@ const exvector & ncmul::get_factors(void) const // friend functions ////////// -ex nonsimplified_ncmul(const exvector & v) +ex reeval_ncmul(const exvector & v) { return (new ncmul(v))->setflag(status_flags::dynallocated); } -ex simplified_ncmul(const exvector & v) +ex hold_ncmul(const exvector & v) { if (v.empty()) - return _ex1(); + return _ex1; else if (v.size() == 1) return v[0]; else