return e.bp == other.e.bp;
}
+archive_node::archive_node_cit
+ archive_node::find_first(const std::string &name) const
+{
+ archive_atom name_atom = a.atomize(name);
+ for (archive_node_cit i=props.begin(); i!=props.end(); ++i)
+ if (i->name == name_atom)
+ return i;
+ return props.end();;
+}
+
+archive_node::archive_node_cit
+ archive_node::find_last(const std::string &name) const
+{
+ archive_atom name_atom = a.atomize(name);
+ for (archive_node_cit i=props.end(); i!=props.begin();) {
+ --i;
+ if (i->name == name_atom)
+ return i;
+ }
+ return props.end();
+}
void archive_node::add_bool(const std::string &name, bool value)
{
bool archive_node::find_bool(const std::string &name, bool &ret, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
unsigned found_index = 0;
while (i != iend) {
if (i->type == PTYPE_BOOL && i->name == name_atom) {
bool archive_node::find_unsigned(const std::string &name, unsigned &ret, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
unsigned found_index = 0;
while (i != iend) {
if (i->type == PTYPE_UNSIGNED && i->name == name_atom) {
bool archive_node::find_string(const std::string &name, std::string &ret, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
unsigned found_index = 0;
while (i != iend) {
if (i->type == PTYPE_STRING && i->name == name_atom) {
return false;
}
+void archive_node::find_ex_by_loc(archive_node_cit loc, ex &ret, lst &sym_lst)
+ const
+{
+ ret = a.get_node(loc->value).unarchive(sym_lst);
+}
+
bool archive_node::find_ex(const std::string &name, ex &ret, lst &sym_lst, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
unsigned found_index = 0;
while (i != iend) {
if (i->type == PTYPE_NODE && i->name == name_atom) {
const archive_node &archive_node::find_ex_node(const std::string &name, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
unsigned found_index = 0;
while (i != iend) {
if (i->type == PTYPE_NODE && i->name == name_atom) {
void archive_node::get_properties(propinfovector &v) const
{
v.clear();
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
while (i != iend) {
property_type type = i->type;
std::string name = a.unatomize(i->name);
os << "\n";
// Dump properties
- std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ archive_node_cit i = props.begin(), iend = props.end();
while (i != iend) {
os << " ";
switch (i->type) {
};
typedef std::vector<property_info> propinfovector;
+ /** Archived property (data type, name and associated data) */
+ struct property {
+ property() {}
+ 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 value; /**< Stored value. */
+ };
+ typedef std::vector<property>::const_iterator archive_node_cit;
+
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);
* @return "true" if property was found, "false" otherwise */
bool find_string(const std::string &name, std::string &ret, unsigned index = 0) const;
+ /** Find the location in the vector of properties of the first/last
+ * property with a given name. */
+ archive_node_cit find_first(const std::string &name) const;
+ archive_node_cit find_last(const std::string &name) 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, lst &sym_lst, unsigned index = 0) const;
+ /** Retrieve property of type "ex" from the node if it is known
+ * that this node in fact contains such a property at the given
+ * location. This is much more efficient than the preceding function. */
+ void find_ex_by_loc(archive_node_cit loc, ex &ret, lst &sym_lst) 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 index = 0) const;
private:
static archive* dummy_ar_creator();
- /** Archived property (data type, name and associated data) */
- struct property {
- property() {}
- 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 value; /**< Stored value. */
- };
-
/** Reference to the archive to which this node belongs. */
archive &a;
{
setflag(get_default_flags());
- for (unsigned int i=0; true; i++) {
+ archive_node::archive_node_cit first = n.find_first("seq");
+ archive_node::archive_node_cit last = n.find_last("seq");
+ ++last;
+ reserve(this->seq, last - first);
+ for (archive_node::archive_node_cit i=first; i<last; ++i) {
ex e;
- if (n.find_ex("seq", e, sym_lst, i))
- this->seq.push_back(e);
- else
- break;
+ n.find_ex_by_loc(i, e, sym_lst);
+ this->seq.push_back(e);
}
}
, hashtabsize(0)
#endif
{
- for (unsigned int i=0; true; i++) {
+ archive_node::archive_node_cit first = n.find_first("rest");
+ archive_node::archive_node_cit last = n.find_last("coeff");
+ ++last;
+ seq.reserve((last-first)/2);
+
+ for (archive_node::archive_node_cit loc = first; loc < last;) {
ex rest;
ex coeff;
- if (n.find_ex("rest", rest, sym_lst, i) && n.find_ex("coeff", coeff, sym_lst, i))
- seq.push_back(expair(rest, coeff));
- else
- break;
+ n.find_ex_by_loc(loc++, rest, sym_lst);
+ n.find_ex_by_loc(loc++, coeff, sym_lst);
+ seq.push_back(expair(rest, coeff));
}
n.find_ex("overall_coeff", overall_coeff, sym_lst);
if (!(n.find_unsigned("row", row)) || !(n.find_unsigned("col", col)))
throw (std::runtime_error("unknown matrix dimensions in archive"));
m.reserve(row * col);
- for (unsigned int i=0; true; i++) {
+ archive_node::archive_node_cit first = n.find_first("m");
+ archive_node::archive_node_cit last = n.find_last("m");
+ ++last;
+ for (archive_node::archive_node_cit i=first; i<last; ++i) {
ex e;
- if (n.find_ex("m", e, sym_lst, i))
- m.push_back(e);
- else
- break;
+ n.find_ex_by_loc(i, e, sym_lst);
+ m.push_back(e);
}
}
pseries::pseries(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
{
- for (unsigned int i=0; true; ++i) {
+ archive_node::archive_node_cit first = n.find_first("coeff");
+ archive_node::archive_node_cit last = n.find_last("power");
+ ++last;
+ seq.reserve((last-first)/2);
+
+ for (archive_node::archive_node_cit loc = first; loc < last;) {
ex rest;
ex coeff;
- if (n.find_ex("coeff", rest, sym_lst, i) && n.find_ex("power", coeff, sym_lst, i))
- seq.push_back(expair(rest, coeff));
- else
- break;
+ n.find_ex_by_loc(loc++, rest, sym_lst);
+ n.find_ex_by_loc(loc++, coeff, sym_lst);
+ seq.push_back(expair(rest, coeff));
}
+
n.find_ex("var", var, sym_lst);
n.find_ex("point", point, sym_lst);
}