X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.h;h=c0f4c33e9a1763e8f0a3b0214c362e624236a6f7;hp=1b5e211ab2c2620640e717f16f12abe09e848987;hb=547db2f0380c03c7d013aa8bda36aa33ff5559e1;hpb=ed21ddd5e2bc0af018c10934342f526d0ae4b7a7 diff --git a/ginac/expairseq.h b/ginac/expairseq.h index 1b5e211a..c0f4c33e 100644 --- a/ginac/expairseq.h +++ b/ginac/expairseq.h @@ -3,7 +3,7 @@ * Interface to sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2004 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 @@ -25,6 +25,7 @@ #include #include +#include // CINT needs to work properly with and #include @@ -48,6 +49,10 @@ typedef epvector::iterator epp; ///< expair-vector pointer typedef std::list epplist; ///< list of expair-vector pointers typedef std::vector epplistvector; ///< vector of epplist +/** Complex conjugate every element of an epvector. Returns zero if this + * does not change anything. */ +epvector* conjugateepvector(const epvector&); + /** A sequence of class expair. * This is used for time-critical classes like sums and products of terms * since handling a list of coeff and rest is much faster than handling a @@ -59,55 +64,38 @@ typedef std::vector epplistvector; ///< vector of epplist * multiplication, which is the reason why there is this base class. */ class expairseq : public basic { - GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(expairseq, basic) - -// member functions + GINAC_DECLARE_REGISTERED_CLASS(expairseq, basic) - // default ctor, dtor, copy ctor assignment operator and helpers -public: - expairseq() : basic(TINFO_expairseq) -#if EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) -#endif // EXPAIRSEQ_USE_HASHTAB - { } - ~expairseq() { destroy(false); } - expairseq(const expairseq & other); - const expairseq & operator=(const expairseq & other); -protected: - void copy(const expairseq & other); - void destroy(bool call_parent); - // other ctors + // other constructors public: expairseq(const ex & lh, const ex & rh); expairseq(const exvector & v); expairseq(const epvector & v, const ex & oc); - expairseq(epvector * vp, const ex & oc); // vp will be deleted + expairseq(std::auto_ptr, const ex & oc); - // functions overriding virtual functions from bases classes + // functions overriding virtual functions from base classes public: - basic * duplicate() const; - void print(const print_context & c, unsigned level = 0) const; - unsigned precedence(void) const {return 10;} + unsigned precedence() const {return 10;} bool info(unsigned inf) const; - unsigned nops() const; - ex op(int i) const; - ex & let_op(int i); + size_t nops() const; + ex op(size_t i) const; ex map(map_function & f) const; ex eval(int level=0) const; - ex to_rational(lst &repl_lst) const; + ex to_rational(exmap & repl) const; + ex to_polynomial(exmap & repl) const; bool match(const ex & pattern, lst & repl_lst) const; - ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const; + ex subs(const exmap & m, unsigned options = 0) const; + ex conjugate() const; protected: - int compare_same_type(const basic & other) const; bool is_equal_same_type(const basic & other) const; - unsigned return_type(void) const; - unsigned calchash(void) const; + unsigned return_type() const; + unsigned calchash() const; ex expand(unsigned options=0) const; // new virtual functions which can be overridden by derived classes protected: virtual ex thisexpairseq(const epvector & v, const ex & oc) const; - virtual ex thisexpairseq(epvector * vp, const ex & oc) const; + virtual ex thisexpairseq(std::auto_ptr vp, const ex & oc) const; virtual void printseq(const print_context & c, char delim, unsigned this_precedence, unsigned upper_precedence) const; @@ -120,13 +108,15 @@ protected: const ex & c) const; virtual ex recombine_pair_to_ex(const expair & p) const; virtual bool expair_needs_further_processing(epp it); - virtual ex default_overall_coeff(void) const; + virtual ex default_overall_coeff() const; virtual void combine_overall_coeff(const ex & c); virtual void combine_overall_coeff(const ex & c1, const ex & c2); virtual bool can_make_flat(const expair & p) const; // non-virtual functions in this class protected: + void do_print(const print_context & c, unsigned level) const; + void do_print_tree(const print_tree & c, unsigned level) const; void construct_from_2_ex_via_exvector(const ex & lh, const ex & rh); void construct_from_2_ex(const ex & lh, const ex & rh); void construct_from_2_expairseq(const expairseq & s1, @@ -137,17 +127,17 @@ protected: void construct_from_epvector(const epvector & v); void make_flat(const exvector & v); void make_flat(const epvector & v); - void canonicalize(void); - void combine_same_terms_sorted_seq(void); + void canonicalize(); + void combine_same_terms_sorted_seq(); #if EXPAIRSEQ_USE_HASHTAB - void combine_same_terms(void); + void combine_same_terms(); unsigned calc_hashtabsize(unsigned sz) const; unsigned calc_hashindex(const ex & e) const; - void shrink_hashtab(void); + void shrink_hashtab(); void remove_hashtab_entry(epvector::const_iterator element); void move_hashtab_entry(epvector::const_iterator oldpos, epvector::iterator newpos); - void sorted_insert(epplist & eppl, epp elem); + void sorted_insert(epplist & eppl, epvector::const_iterator elem); void build_hashtab_and_combine(epvector::iterator & first_numeric, epvector::iterator & last_non_zero, vector & touched, @@ -156,14 +146,14 @@ protected: epvector::iterator & last_non_zero, vector & touched, unsigned & number_of_zeroes); - bool has_coeff_0(void) const; + bool has_coeff_0() const; void add_numerics_to_hashtab(epvector::iterator first_numeric, epvector::const_iterator last_non_zero); #endif // EXPAIRSEQ_USE_HASHTAB bool is_canonical() const; - epvector * expandchildren(unsigned options) const; - epvector * evalchildren(int level) const; - epvector * subschildren(const lst & ls, const lst & lr, bool no_pattern = false) const; + std::auto_ptr expandchildren(unsigned options) const; + std::auto_ptr evalchildren(int level) const; + std::auto_ptr subschildren(const exmap & m, unsigned options = 0) const; // member variables @@ -182,13 +172,6 @@ protected: // utility functions -/** Return the expairseq object handled by an ex. Deprecated: use ex_to(). - * This is unsafe: you need to check the type first. */ -inline const expairseq &ex_to_expairseq(const ex &e) -{ - return static_cast(*e.bp); -} - /** Specialization of is_exactly_a(obj) for expairseq objects. */ template<> inline bool is_exactly_a(const basic & obj) {