X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Farchive.h;h=d141f2883880df900daf764a7e6e80743f6fd60a;hb=a1eaf43324b5a13f7fd133f41366553081f0a3a8;hp=53204398838181607067b4c1e1937da53c9812b6;hpb=7cad9b41c97f0b042ba4af8080e82c8ad4804560;p=ginac.git diff --git a/ginac/archive.h b/ginac/archive.h index 53204398..d141f288 100644 --- a/ginac/archive.h +++ b/ginac/archive.h @@ -3,7 +3,7 @@ * Archiving of GiNaC expressions. */ /* - * GiNaC Copyright (C) 1999-2001 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_ARCHIVE_H__ @@ -25,21 +25,21 @@ #include "ex.h" +#include #include #include -#include +#include namespace GiNaC { -class lst; class archive; /** Numerical ID value to refer to an archive_node. */ -typedef unsigned int archive_node_id; +typedef unsigned archive_node_id; /** Numerical ID value to refer to a string. */ -typedef unsigned int archive_atom; +typedef unsigned archive_atom; /** This class stores all properties needed to record/retrieve the state @@ -65,36 +65,24 @@ public: struct property_info { property_info() {} property_info(property_type t, const std::string &n, unsigned c = 1) : type(t), name(n), count(c) {} - ~property_info() {} - - property_info(const property_info &other) : type(other.type), name(other.name), count(other.count) {} - const property_info &operator=(const property_info &other); property_type type; /**< Data type of property. */ std::string name; /**< Name of property. */ unsigned count; /**< Number of occurrences. */ }; - // Cint doesn't like vector<..,default_alloc> but malloc_alloc is - // unstandardized and not supported by newer GCCs. -#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) - typedef std::vector propinfovector; -#else typedef std::vector propinfovector; -#endif archive_node() : a(*dummy_ar_creator()), has_expression(false) {} // hack for cint which always requires a default constructor archive_node(archive &ar) : a(ar), has_expression(false) {} archive_node(archive &ar, const ex &expr); - ~archive_node() {} - archive_node(const archive_node &other); const archive_node &operator=(const archive_node &other); /** Add property of type "bool" to node. */ void add_bool(const std::string &name, bool value); /** Add property of type "unsigned int" to node. */ - void add_unsigned(const std::string &name, unsigned int value); + void add_unsigned(const std::string &name, unsigned value); /** Add property of type "string" to node. */ void add_string(const std::string &name, const std::string &value); @@ -104,48 +92,46 @@ public: /** Retrieve property of type "bool" from node. * @return "true" if property was found, "false" otherwise */ - bool find_bool(const std::string &name, bool &ret) const; + bool find_bool(const std::string &name, bool &ret, unsigned index = 0) const; /** Retrieve property of type "unsigned" from node. * @return "true" if property was found, "false" otherwise */ - bool find_unsigned(const std::string &name, unsigned int &ret) const; + bool find_unsigned(const std::string &name, unsigned &ret, unsigned index = 0) const; /** Retrieve property of type "string" from node. * @return "true" if property was found, "false" otherwise */ - bool find_string(const std::string &name, std::string &ret) const; + bool find_string(const std::string &name, std::string &ret, unsigned index = 0) const; /** Retrieve property of type "ex" from node. * @return "true" if property was found, "false" otherwise */ - bool find_ex(const std::string &name, ex &ret, const lst &sym_lst, unsigned int index = 0) const; + bool find_ex(const std::string &name, ex &ret, lst &sym_lst, unsigned index = 0) const; /** Retrieve property of type "ex" from node, returning the node of * the sub-expression. */ - const archive_node &find_ex_node(const std::string &name, unsigned int index = 0) const; + const archive_node &find_ex_node(const std::string &name, unsigned index = 0) const; /** Return vector of properties stored in node. */ void get_properties(propinfovector &v) const; - ex unarchive(const lst &sym_lst) const; + ex unarchive(lst &sym_lst) const; bool has_same_ex_as(const archive_node &other) const; + bool has_ex() const {return has_expression;} + ex get_ex() const {return e;} - void forget(void); + void forget(); void printraw(std::ostream &os) const; private: - static archive* dummy_ar_creator(void); + static archive* dummy_ar_creator(); /** Archived property (data type, name and associated data) */ struct property { property() {} - property(archive_atom n, property_type t, unsigned int v) : type(t), name(n), value(v) {} - ~property() {} - - property(const property &other) : type(other.type), name(other.name), value(other.value) {} - const property &operator=(const property &other); + property(archive_atom n, property_type t, unsigned v) : type(t), name(n), value(v) {} property_type type; /**< Data type of property. */ archive_atom name; /**< Name of property. */ - unsigned int value; /**< Stored value. */ + unsigned value; /**< Stored value. */ }; /** Reference to the archive to which this node belongs. */ @@ -190,33 +176,36 @@ public: void archive_ex(const ex &e, const char *name); /** Retrieve expression from archive by name. - * @param sym_lst list of pre-defined symbols */ + * @param sym_lst list of pre-defined symbols + * @param name name of expression */ ex unarchive_ex(const lst &sym_lst, const char *name) const; /** Retrieve expression from archive by index. * @param sym_lst list of pre-defined symbols + * @param index index of expression * @see count_expressions */ - ex unarchive_ex(const lst &sym_lst, unsigned int index = 0) const; + ex unarchive_ex(const lst &sym_lst, unsigned index = 0) const; /** Retrieve expression and its name from archive by index. * @param sym_lst list of pre-defined symbols * @param name receives the name of the expression + * @param index index of expression * @see count_expressions */ - ex unarchive_ex(const lst &sym_lst, std::string &name, unsigned int index = 0) const; + ex unarchive_ex(const lst &sym_lst, std::string &name, unsigned index = 0) const; /** Return number of archived expressions. */ - unsigned int num_expressions(void) const; + unsigned num_expressions() const; /** Return reference to top node of an expression specified by index. */ - const archive_node &get_top_node(unsigned int index = 0) const; + const archive_node &get_top_node(unsigned index = 0) const; /** Clear all archived expressions. */ - void clear(void); + void clear(); archive_node_id add_node(const archive_node &n); archive_node &get_node(archive_node_id id); - void forget(void); + void forget(); void printraw(std::ostream &os) const; private: @@ -242,6 +231,10 @@ public: private: /** Vector of atomized strings (using a vector allows faster unarchiving). */ mutable std::vector atoms; + + /** Map of stored expressions to nodes for faster archiving */ + typedef std::map::iterator mapit; + mutable std::map exprtable; };