X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmul.cpp;h=dfda4100648a4eadb91c50a403d4cb391f674901;hp=3d33c78a129eeaeaaf9074bc291e76624e403da8;hb=9c2ce1cc26735e268aae8142d9e5dbc5a9ba8ca3;hpb=67467d256b44f5e08498ca81c946d9ffaa25d1e2 diff --git a/ginac/mul.cpp b/ginac/mul.cpp index 3d33c78a..dfda4100 100644 --- a/ginac/mul.cpp +++ b/ginac/mul.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's products of expressions. */ /* - * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2010 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 @@ -20,11 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include - #include "mul.h" #include "add.h" #include "power.h" @@ -37,6 +32,11 @@ #include "symbol.h" #include "compiler.h" +#include +#include +#include +#include + namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(mul, expairseq, @@ -53,7 +53,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(mul, expairseq, mul::mul() { - tinfo_key = &mul::tinfo_static; } ////////// @@ -64,7 +63,6 @@ mul::mul() mul::mul(const ex & lh, const ex & rh) { - tinfo_key = &mul::tinfo_static; overall_coeff = _ex1; construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); @@ -72,7 +70,6 @@ mul::mul(const ex & lh, const ex & rh) mul::mul(const exvector & v) { - tinfo_key = &mul::tinfo_static; overall_coeff = _ex1; construct_from_exvector(v); GINAC_ASSERT(is_canonical()); @@ -80,7 +77,6 @@ mul::mul(const exvector & v) mul::mul(const epvector & v) { - tinfo_key = &mul::tinfo_static; overall_coeff = _ex1; construct_from_epvector(v); GINAC_ASSERT(is_canonical()); @@ -88,7 +84,6 @@ mul::mul(const epvector & v) mul::mul(const epvector & v, const ex & oc, bool do_index_renaming) { - tinfo_key = &mul::tinfo_static; overall_coeff = oc; construct_from_epvector(v, do_index_renaming); GINAC_ASSERT(is_canonical()); @@ -96,7 +91,6 @@ mul::mul(const epvector & v, const ex & oc, bool do_index_renaming) mul::mul(std::auto_ptr vp, const ex & oc, bool do_index_renaming) { - tinfo_key = &mul::tinfo_static; GINAC_ASSERT(vp.get()!=0); overall_coeff = oc; construct_from_epvector(*vp, do_index_renaming); @@ -105,7 +99,6 @@ mul::mul(std::auto_ptr vp, const ex & oc, bool do_index_renaming) mul::mul(const ex & lh, const ex & mh, const ex & rh) { - tinfo_key = &mul::tinfo_static; exvector factors; factors.reserve(3); factors.push_back(lh); @@ -120,8 +113,6 @@ mul::mul(const ex & lh, const ex & mh, const ex & rh) // archiving ////////// -DEFAULT_ARCHIVING(mul) - ////////// // functions overriding virtual functions from base classes ////////// @@ -287,6 +278,16 @@ bool mul::info(unsigned inf) const case info_flags::integer_polynomial: case info_flags::cinteger_polynomial: case info_flags::rational_polynomial: + case info_flags::real: + case info_flags::rational: + case info_flags::integer: + case info_flags::crational: + case info_flags::cinteger: + case info_flags::positive: + case info_flags::nonnegative: + case info_flags::posint: + case info_flags::nonnegint: + case info_flags::even: case info_flags::crational_polynomial: case info_flags::rational_function: { epvector::const_iterator i = seq.begin(), end = seq.end(); @@ -295,6 +296,8 @@ bool mul::info(unsigned inf) const return false; ++i; } + if (overall_coeff.is_equal(*_num1_p) && inf == info_flags::even) + return true; return overall_coeff.info(inf); } case info_flags::algebraic: { @@ -306,6 +309,40 @@ bool mul::info(unsigned inf) const } return false; } + case info_flags::negative: { + bool neg = false; + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + const ex& factor = recombine_pair_to_ex(*i++); + if (factor.info(info_flags::positive)) + continue; + else if (factor.info(info_flags::negative)) + neg = !neg; + else + return false; + } + if (overall_coeff.info(info_flags::negative)) + neg = !neg; + return neg; + } + case info_flags::negint: { + bool neg = false; + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + const ex& factor = recombine_pair_to_ex(*i++); + if (factor.info(info_flags::posint)) + continue; + else if (factor.info(info_flags::negint)) + neg = !neg; + else + return false; + } + if (overall_coeff.info(info_flags::negint)) + neg = !neg; + else if (!overall_coeff.info(info_flags::posint)) + return false; + return neg; + } } return inherited::info(inf); } @@ -637,7 +674,7 @@ ex mul::eval_ncmul(const exvector & v) const return inherited::eval_ncmul(v); } -bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatches, lst & repls) +bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatches, exmap& repls) { ex origbase; int origexponent; @@ -669,7 +706,7 @@ bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatch patternexpsign = 1; } - lst saverepls = repls; + exmap saverepls = repls; if (origexponent < patternexponent || origexpsign != patternexpsign || !origbase.match(patternbase,saverepls)) return false; repls = saverepls; @@ -688,17 +725,17 @@ bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatch * that already have been replaced by previous substitutions and matched[i] * is true for factors that have been matched by the current match. */ -bool algebraic_match_mul_with_mul(const mul &e, const ex &pat, lst &repls, +bool algebraic_match_mul_with_mul(const mul &e, const ex &pat, exmap& repls, int factor, int &nummatches, const std::vector &subsed, std::vector &matched) { - if (factor == pat.nops()) + if (factor == (int)pat.nops()) return true; for (size_t i=0; i(pattern)) { - lst repls; + exmap repls; int nummatches = std::numeric_limits::max(); std::vector subsed(seq.size(), false); std::vector matched(seq.size(), false); @@ -745,7 +782,7 @@ ex mul::algebraic_subs_mul(const exmap & m, unsigned options) const retry1: int nummatches = std::numeric_limits::max(); std::vector currsubsed(seq.size(), false); - lst repls; + exmap repls; if(!algebraic_match_mul_with_mul(*this, it->first, repls, 0, nummatches, subsed, currsubsed)) continue; @@ -754,10 +791,10 @@ retry1: if (currsubsed[j]) subsed[j] = true; ex subsed_pattern - = it->first.subs(ex(repls), subs_options::no_pattern); + = it->first.subs(repls, subs_options::no_pattern); divide_by *= power(subsed_pattern, nummatches); ex subsed_result - = it->second.subs(ex(repls), subs_options::no_pattern); + = it->second.subs(repls, subs_options::no_pattern); multiply_by *= power(subsed_result, nummatches); goto retry1; @@ -765,14 +802,14 @@ retry1: for (size_t j=0; jnops(); j++) { int nummatches = std::numeric_limits::max(); - lst repls; + exmap repls; if (!subsed[j] && tryfactsubs(op(j), it->first, nummatches, repls)){ subsed[j] = true; ex subsed_pattern - = it->first.subs(ex(repls), subs_options::no_pattern); + = it->first.subs(repls, subs_options::no_pattern); divide_by *= power(subsed_pattern, nummatches); ex subsed_result - = it->second.subs(ex(repls), subs_options::no_pattern); + = it->second.subs(repls, subs_options::no_pattern); multiply_by *= power(subsed_result, nummatches); } } @@ -855,10 +892,10 @@ unsigned mul::return_type() const return all_commutative ? return_types::commutative : return_types::noncommutative; } -tinfo_t mul::return_type_tinfo() const +return_type_t mul::return_type_tinfo() const { if (seq.empty()) - return this; // mul without factors: should not happen + return make_return_type_t(); // mul without factors: should not happen // return type_info of first noncommutative element epvector::const_iterator i = seq.begin(), end = seq.end(); @@ -868,7 +905,7 @@ tinfo_t mul::return_type_tinfo() const ++i; } // no noncommutative element found, should not happen - return this; + return make_return_type_t(); } ex mul::thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming) const @@ -1217,4 +1254,6 @@ std::auto_ptr mul::expandchildren(unsigned options) const return std::auto_ptr(0); // nothing has changed } +GINAC_BIND_UNARCHIVER(mul); + } // namespace GiNaC