X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fex.cpp;h=b6b968595e05e662aa89e2b89c0aefd4a274fbef;hp=55482551995efcad1ce2166484dd126fc48b8f2e;hb=834bacb25c9427fb03b8f9b34605738fb59202e1;hpb=094911eb78cacb6f2877a70c9ac74766df58ccea diff --git a/ginac/ex.cpp b/ginac/ex.cpp index 55482551..b6b96859 100644 --- a/ginac/ex.cpp +++ b/ginac/ex.cpp @@ -23,21 +23,14 @@ #include #include -#if defined(VERBOSE) -# define GINAC_CONDITIONAL_INLINE -# include "ex.h" -# undef GINAC_CONDITIONAL_INLINE -#else -# include "ex.h" -#endif - +#include "ex.h" #include "add.h" #include "mul.h" #include "ncmul.h" #include "numeric.h" #include "power.h" +#include "lst.h" #include "relational.h" -#include "indexed.h" #include "input_lexer.h" #include "debugmsg.h" #include "utils.h" @@ -50,18 +43,6 @@ namespace GiNaC { // none (all inlined) -////////// -// functions overriding virtual functions from bases classes -////////// - -// none - -////////// -// new virtual functions which can be overridden by derived classes -////////// - -// none - ////////// // non-virtual functions in this class ////////// @@ -83,64 +64,30 @@ void ex::swap(ex & other) other.bp = tmpbp; } -/** Output formatted to be useful as ginsh input. */ -void ex::print(std::ostream & os, unsigned upper_precedence) const -{ - debugmsg("ex print",LOGLEVEL_PRINT); - GINAC_ASSERT(bp!=0); - bp->print(os,upper_precedence); -} - -/** Unreadable output with detailed type information. */ -void ex::printraw(std::ostream & os) const +/** Print expression to stream. The formatting of the output is determined + * by the kind of print_context object that is passed. Possible formattings + * include ginsh-parsable output (the default), tree-like output for + * debugging, and C++ source. + * @see print_context */ +void ex::print(const print_context & c, unsigned level) const { - debugmsg("ex printraw",LOGLEVEL_PRINT); + debugmsg("ex print", LOGLEVEL_PRINT); GINAC_ASSERT(bp!=0); - os << "ex("; - bp->printraw(os); - os << ")"; + bp->print(c, level); } -/** Very detailed and unreadable output with type information and all this. */ -void ex::printtree(std::ostream & os, unsigned indent) const +/** Print expression to stream in a tree-like format suitable for debugging. */ +void ex::printtree(std::ostream & os) const { - debugmsg("ex printtree",LOGLEVEL_PRINT); + debugmsg("ex printtree", LOGLEVEL_PRINT); GINAC_ASSERT(bp!=0); - // os << "refcount=" << bp->refcount << " "; - bp->printtree(os,indent); -} - -/** Print expression as a C++ statement. The output looks like - * " = ;". The "type" parameter has an effect - * on how number literals are printed. - * - * @param os output stream - * @param type variable type (one of the csrc_types) - * @param var_name variable name to be printed */ -void ex::printcsrc(std::ostream & os, unsigned type, const char *var_name) const -{ - debugmsg("ex print csrc", LOGLEVEL_PRINT); - GINAC_ASSERT(bp!=0); - switch (type) { - case csrc_types::ctype_float: - os << "float "; - break; - case csrc_types::ctype_double: - os << "double "; - break; - case csrc_types::ctype_cl_N: - os << "cl_N "; - break; - } - os << var_name << " = "; - bp->printcsrc(os, type, 0); - os << ";\n"; + bp->print(print_tree(os)); } /** Little wrapper arount print to be called within a debugger. */ void ex::dbgprint(void) const { - debugmsg("ex dbgprint",LOGLEVEL_PRINT); + debugmsg("ex dbgprint", LOGLEVEL_PRINT); GINAC_ASSERT(bp!=0); bp->dbgprint(); } @@ -148,73 +95,20 @@ void ex::dbgprint(void) const /** Little wrapper arount printtree to be called within a debugger. */ void ex::dbgprinttree(void) const { - debugmsg("ex dbgprinttree",LOGLEVEL_PRINT); + debugmsg("ex dbgprinttree", LOGLEVEL_PRINT); GINAC_ASSERT(bp!=0); bp->dbgprinttree(); } -bool ex::info(unsigned inf) const -{ - return bp->info(inf); -} - -unsigned ex::nops() const -{ - GINAC_ASSERT(bp!=0); - return bp->nops(); -} - ex ex::expand(unsigned options) const { GINAC_ASSERT(bp!=0); - if (bp->flags & status_flags::expanded) + if (options == 0 && (bp->flags & status_flags::expanded)) // The "expanded" flag only covers the standard options; someone might want to re-expand with different options return *bp; else return bp->expand(options); } -bool ex::has(const ex & other) const -{ - GINAC_ASSERT(bp!=0); - return bp->has(other); -} - -int ex::degree(const symbol & s) const -{ - GINAC_ASSERT(bp!=0); - return bp->degree(s); -} - -int ex::ldegree(const symbol & s) const -{ - GINAC_ASSERT(bp!=0); - return bp->ldegree(s); -} - -ex ex::coeff(const symbol & s, int n) const -{ - GINAC_ASSERT(bp!=0); - return bp->coeff(s,n); -} - -ex ex::collect(const symbol & s) const -{ - GINAC_ASSERT(bp!=0); - return bp->collect(s); -} - -ex ex::eval(int level) const -{ - GINAC_ASSERT(bp!=0); - return bp->eval(level); -} - -ex ex::evalf(int level) const -{ - GINAC_ASSERT(bp!=0); - return bp->evalf(level); -} - /** Compute partial derivative of an expression. * * @param s symbol by which the expression is derived @@ -230,51 +124,30 @@ ex ex::diff(const symbol & s, unsigned nth) const return bp->diff(s, nth); } -ex ex::subs(const lst & ls, const lst & lr) const +/** Check whether expression matches a specified pattern. */ +bool ex::match(const ex & pattern) const { - GINAC_ASSERT(bp!=0); - return bp->subs(ls,lr); + lst repl_lst; + return bp->match(pattern, repl_lst); } -ex ex::subs(const ex & e) const +/** Find all occurrences of a pattern. The found matches are appended to + * the "found" list. If the expression itself matches the pattern, the + * children are not further examined. This function returns true when any + * matches were found. */ +bool ex::find(const ex & pattern, lst & found) const { - GINAC_ASSERT(bp!=0); - return bp->subs(e); -} - -/** Return a vector containing the free indices of the object. */ -exvector ex::get_free_indices(void) const -{ - GINAC_ASSERT(bp!=0); - return bp->get_free_indices(); -} - -/** Simplify/canonicalize expression containing indexed objects. This - * performs contraction of dummy indices where possible and checks whether - * the free indices in sums are consistent. - * - * @return simplified expression */ -ex ex::simplify_indexed(void) const -{ - return GiNaC::simplify_indexed(*this); -} - -/** Simplify/canonicalize expression containing indexed objects. This - * performs contraction of dummy indices where possible, checks whether - * the free indices in sums are consistent, and automatically replaces - * scalar products by known values if desired. - * - * @param sp Scalar products to be replaced automatically - * @return simplified expression */ -ex ex::simplify_indexed(const scalar_products & sp) const -{ - return GiNaC::simplify_indexed(*this, sp); -} - -ex ex::simplify_ncmul(const exvector & v) const -{ - GINAC_ASSERT(bp!=0); - return bp->simplify_ncmul(v); + if (match(pattern)) { + found.append(*this); + found.sort(); + found.unique(); + return true; + } + bool any_found = false; + for (unsigned i=0; iop(i); -} - /** Return modifyable operand/member at position i. */ ex & ex::let_op(int i) { @@ -312,7 +177,8 @@ ex & ex::let_op(int i) ex ex::lhs(void) const { debugmsg("ex lhs()",LOGLEVEL_MEMBER_FUNCTION); - GINAC_ASSERT(is_ex_of_type(*this,relational)); + if (!is_ex_of_type(*this,relational)) + throw std::runtime_error("ex::lhs(): not a relation"); return (*static_cast(bp)).lhs(); } @@ -320,43 +186,11 @@ ex ex::lhs(void) const ex ex::rhs(void) const { debugmsg("ex rhs()",LOGLEVEL_MEMBER_FUNCTION); - GINAC_ASSERT(is_ex_of_type(*this,relational)); + if (!is_ex_of_type(*this,relational)) + throw std::runtime_error("ex::rhs(): not a relation"); return (*static_cast(bp)).rhs(); } -unsigned ex::return_type(void) const -{ - GINAC_ASSERT(bp!=0); - return bp->return_type(); -} - -unsigned ex::return_type_tinfo(void) const -{ - GINAC_ASSERT(bp!=0); - return bp->return_type_tinfo(); -} - -unsigned ex::gethash(void) const -{ - GINAC_ASSERT(bp!=0); - return bp->gethash(); -} - -ex ex::exadd(const ex & rh) const -{ - return (new add(*this,rh))->setflag(status_flags::dynallocated); -} - -ex ex::exmul(const ex & rh) const -{ - return (new mul(*this,rh))->setflag(status_flags::dynallocated); -} - -ex ex::exncmul(const ex & rh) const -{ - return (new ncmul(*this,rh))->setflag(status_flags::dynallocated); -} - // private /** Make this ex writable (if more than one ex handle the same basic) by @@ -380,14 +214,12 @@ void ex::makewriteable() * @see ex::ex(const basic &) */ void ex::construct_from_basic(const basic & other) { - if ((other.flags & status_flags::evaluated)==0) { - // cf. copy ctor - const ex & tmpex = other.eval(1); // evaluate only one (top) level + if (!(other.flags & status_flags::evaluated)) { + const ex & tmpex(other.eval(1)); // evaluate only one (top) level bp = tmpex.bp; - GINAC_ASSERT(bp!=0); GINAC_ASSERT(bp->flags & status_flags::dynallocated); ++bp->refcount; - if ((other.flags & status_flags::dynallocated)&&(other.refcount==0)) + if ((other.refcount==0) && (other.flags & status_flags::dynallocated)) delete &const_cast(other); } else { if (other.flags & status_flags::dynallocated) { @@ -399,7 +231,6 @@ void ex::construct_from_basic(const basic & other) bp->setflag(status_flags::dynallocated); } GINAC_ASSERT(bp!=0); - // bp->clearflag(status_flags::evaluated); ++bp->refcount; } GINAC_ASSERT(bp!=0);