X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fex.h;h=498dbd664f7ae80d78aa3a1107aa5e3174891c82;hp=2447c3f268061bd77ab59f58f5f01c21777c5be0;hb=7e8f4f43bc25f9231680c128c8e38612b0dbdc88;hpb=f85392050266dd11d26503fdfbccbeea63b2b898 diff --git a/ginac/ex.h b/ginac/ex.h index 2447c3f2..498dbd66 100644 --- a/ginac/ex.h +++ b/ginac/ex.h @@ -3,7 +3,7 @@ * Interface to GiNaC's light-weight expression handles. */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2005 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 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __GINAC_EX_H__ @@ -55,14 +55,15 @@ static library_init library_initializer; class scalar_products; class const_iterator; +class const_preorder_iterator; +class const_postorder_iterator; /** Lightweight wrapper for GiNaC's symbolic objects. Basically all it does is * to hold a pointer to the other objects, manage the reference counting and * provide methods for manipulation of these objects. (Some people call such * a thing a proxy class.) */ -class ex -{ +class ex { friend class archive_node; friend inline bool are_ex_trivially_equal(const ex &, const ex &); template friend inline const T &ex_to(const ex &); @@ -106,12 +107,17 @@ public: // iterators const_iterator begin() const throw(); const_iterator end() const throw(); + const_preorder_iterator preorder_begin() const; + const_preorder_iterator preorder_end() const throw(); + const_postorder_iterator postorder_begin() const; + const_postorder_iterator postorder_end() const throw(); // evaluation ex eval(int level = 0) const { return bp->eval(level); } ex evalf(int level = 0) const { return bp->evalf(level); } ex evalm() const { return bp->evalm(); } ex eval_ncmul(const exvector & v) const { return bp->eval_ncmul(v); } + ex eval_integ() const { return bp->eval_integ(); } // printing void print(const print_context & c, unsigned level = 0) const; @@ -132,6 +138,9 @@ public: ex lhs() const; ex rhs() const; + // complex conjugation + ex conjugate() const { return bp->conjugate(); } + // pattern matching bool has(const ex & pattern) const { return bp->has(pattern); } bool find(const ex & pattern, lst & found) const; @@ -184,6 +193,7 @@ public: numeric integer_content() const; ex primpart(const ex &x) const; ex primpart(const ex &x, const ex &cont) const; + void unitcontprim(const ex &x, ex &u, ex &c, ex &p) const; ex smod(const numeric &xi) const { return bp->smod(xi); } numeric max_coefficient() const; @@ -355,31 +365,53 @@ ex::ex(const std::string &s, const ex &l) : bp(construct_from_string_and_lst(s, inline int ex::compare(const ex & other) const { +#ifdef GINAC_COMPARE_STATISTICS + compare_statistics.total_compares++; +#endif if (bp == other.bp) // trivial case: both expressions point to same basic return 0; +#ifdef GINAC_COMPARE_STATISTICS + compare_statistics.nontrivial_compares++; +#endif const int cmpval = bp->compare(*other.bp); +#if 1 if (cmpval == 0) { // Expressions point to different, but equal, trees: conserve // memory and make subsequent compare() operations faster by - // making both expression point to the same tree. + // making both expressions point to the same tree. share(other); } +#endif return cmpval; } inline bool ex::is_equal(const ex & other) const { +#ifdef GINAC_COMPARE_STATISTICS + compare_statistics.total_is_equals++; +#endif if (bp == other.bp) // trivial case: both expressions point to same basic return true; - return bp->is_equal(*other.bp); +#ifdef GINAC_COMPARE_STATISTICS + compare_statistics.nontrivial_is_equals++; +#endif + const bool equal = bp->is_equal(*other.bp); +#if 0 + if (equal) { + // Expressions point to different, but equal, trees: conserve + // memory and make subsequent compare() operations faster by + // making both expressions point to the same tree. + share(other); + } +#endif + return equal; } // Iterators -class const_iterator : public std::iterator -{ +class const_iterator : public std::iterator { friend class ex; friend class const_preorder_iterator; friend class const_postorder_iterator; @@ -525,27 +557,24 @@ struct _iter_rep { } // namespace internal -class const_preorder_iterator : public std::iterator -{ +class const_preorder_iterator : public std::iterator { public: const_preorder_iterator() throw() {} - // Provide implicit conversion from const_iterator, so ex::begin() and - // ex::end() can be used to create const_preorder_iterators - const_preorder_iterator(const const_iterator & cit) + const_preorder_iterator(const ex &e, size_t n) { - s.push(internal::_iter_rep(cit.e, cit.i, cit.e.nops())); + s.push(internal::_iter_rep(e, 0, n)); } public: - ex operator*() const + reference operator*() const { return s.top().e; } - std::auto_ptr operator->() const + pointer operator->() const { - return std::auto_ptr(new ex(operator*())); + return &(s.top().e); } const_preorder_iterator &operator++() @@ -563,7 +592,7 @@ public: bool operator==(const const_preorder_iterator &other) const throw() { - return s.top() == other.s.top(); + return s == other.s; } bool operator!=(const const_preorder_iterator &other) const throw() @@ -576,8 +605,10 @@ private: void increment() { - while (s.top().i == s.top().i_end && s.size() > 1) { + while (!s.empty() && s.top().i == s.top().i_end) { s.pop(); + if (s.empty()) + return; ++s.top().i; } @@ -590,31 +621,25 @@ private: } }; -class const_postorder_iterator : public std::iterator -{ +class const_postorder_iterator : public std::iterator { public: const_postorder_iterator() throw() {} - // Provide implicit conversion from const_iterator, so ex::begin() and - // ex::end() can be used to create const_postorder_iterators - const_postorder_iterator(const const_iterator & cit) + const_postorder_iterator(const ex &e, size_t n) { - size_t n = cit.e.nops(); - if (cit.i != n) { - s.push(internal::_iter_rep(cit.e, cit.i, n)); - descend(); - } + s.push(internal::_iter_rep(e, 0, n)); + descend(); } public: - ex operator*() const + reference operator*() const { return s.top().e; } - std::auto_ptr operator->() const + pointer operator->() const { - return std::auto_ptr(new ex(operator*())); + return &(s.top().e); } const_postorder_iterator &operator++() @@ -656,7 +681,7 @@ private: { if (s.top().i == s.top().i_end) s.pop(); - if (s.size() > 0) { + if (!s.empty()) { ++s.top().i; descend(); } @@ -673,6 +698,26 @@ inline const_iterator ex::end() const throw() return const_iterator(*this, nops()); } +inline const_preorder_iterator ex::preorder_begin() const +{ + return const_preorder_iterator(*this, nops()); +} + +inline const_preorder_iterator ex::preorder_end() const throw() +{ + return const_preorder_iterator(); +} + +inline const_postorder_iterator ex::postorder_begin() const +{ + return const_postorder_iterator(*this, nops()); +} + +inline const_postorder_iterator ex::postorder_end() const throw() +{ + return const_postorder_iterator(); +} + // utility functions @@ -709,6 +754,9 @@ inline size_t nops(const ex & thisex) inline ex expand(const ex & thisex, unsigned options = 0) { return thisex.expand(options); } +inline ex conjugate(const ex & thisex) +{ return thisex.conjugate(); } + inline bool has(const ex & thisex, const ex & pattern) { return thisex.has(pattern); } @@ -760,6 +808,9 @@ inline ex evalf(const ex & thisex, int level = 0) inline ex evalm(const ex & thisex) { return thisex.evalm(); } +inline ex eval_integ(const ex & thisex) +{ return thisex.eval_integ(); } + inline ex diff(const ex & thisex, const symbol & s, unsigned nth = 1) { return thisex.diff(s, nth); }