* Archiving of GiNaC expressions. */
/*
- * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2001 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
#include "config.h"
#include "utils.h"
-#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
-/** Archive an expression.
- * @param ex the expression to be archived
- * @param name name under which the expression is stored */
void archive::archive_ex(const ex &e, const char *name)
{
// Create root node (which recursively archives the whole expression tree)
}
-/** Retrieve expression from archive by name.
- * @param sym_lst list of pre-defined symbols */
ex archive::unarchive_ex(const lst &sym_lst, const char *name) const
{
// Find root node
goto found;
i++;
}
- throw (std::logic_error("expression with name '" + name_string + "' not found in archive"));
+ throw (std::runtime_error("expression with name '" + name_string + "' not found in archive"));
found:
// Recursively unarchive all nodes, starting at the root node
return nodes[i->root].unarchive(sym_lst);
}
-/** Retrieve expression from archive by index.
- * @param sym_lst list of pre-defined symbols */
ex archive::unarchive_ex(const lst &sym_lst, unsigned int index) const
{
if (index >= exprs.size())
return nodes[exprs[index].root].unarchive(sym_lst);
}
-/** Retrieve expression and its name from archive by index.
- * @param sym_lst list of pre-defined symbols */
ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned int index) const
{
if (index >= exprs.size())
return nodes[exprs[index].root].unarchive(sym_lst);
}
-
-/** Return number of archived expressions. */
unsigned int archive::num_expressions(void) const
{
return exprs.size();
}
+const archive_node &archive::get_top_node(unsigned int index) const
+{
+ if (index >= exprs.size())
+ throw (std::range_error("index of archived expression out of range"));
+
+ return nodes[exprs[index].root];
+}
+
/*
* Archive file format
/** Write unsigned integer quantity to stream. */
static void write_unsigned(std::ostream &os, unsigned int val)
{
- while (val > 0x80) {
+ while (val >= 0x80) {
os.put((val & 0x7f) | 0x80);
val >>= 7;
}
unsigned int ret = 0;
unsigned int shift = 0;
do {
- is.get(b);
+ char b2;
+ is.get(b2);
+ b = b2;
ret |= (b & 0x7f) << shift;
shift += 7;
} while (b & 0x80);
unsigned int num_atoms = ar.atoms.size();
write_unsigned(os, num_atoms);
for (unsigned int i=0; i<num_atoms; i++)
- os << ar.atoms[i] << ends;
+ os << ar.atoms[i] << std::ends;
// Write expressions
unsigned int num_exprs = ar.exprs.size();
/** Copy constructor of archive_node. */
archive_node::archive_node(const archive_node &other)
- : a(other.a), props(other.props), has_expression(other.has_expression), e(other.e)
+ : a(other.a), props(other.props), has_expression(other.has_expression), e(other.e)
{
}
/** Recursively construct archive node from expression. */
archive_node::archive_node(archive &ar, const ex &expr)
- : a(ar), has_expression(true), e(expr)
+ : a(ar), has_expression(true), e(expr)
{
expr.bp->archive(*this);
}
}
-/** Add property of type "bool" to node. */
void archive_node::add_bool(const std::string &name, bool value)
{
props.push_back(property(a.atomize(name), PTYPE_BOOL, value));
}
-/** Add property of type "unsigned int" to node. */
void archive_node::add_unsigned(const std::string &name, unsigned int value)
{
props.push_back(property(a.atomize(name), PTYPE_UNSIGNED, value));
}
-/** Add property of type "string" to node. */
void archive_node::add_string(const std::string &name, const std::string &value)
{
props.push_back(property(a.atomize(name), PTYPE_STRING, a.atomize(value)));
}
-/** Add property of type "ex" to node. */
void archive_node::add_ex(const std::string &name, const ex &value)
{
// Recursively create an archive_node and add its ID to the properties of this node
}
-/** Retrieve property of type "bool" from node.
- * @return "true" if property was found, "false" otherwise */
bool archive_node::find_bool(const std::string &name, bool &ret) const
{
archive_atom name_atom = a.atomize(name);
return false;
}
-/** Retrieve property of type "unsigned" from node.
- * @return "true" if property was found, "false" otherwise */
bool archive_node::find_unsigned(const std::string &name, unsigned int &ret) const
{
archive_atom name_atom = a.atomize(name);
return false;
}
-/** Retrieve property of type "string" from node.
- * @return "true" if property was found, "false" otherwise */
bool archive_node::find_string(const std::string &name, std::string &ret) const
{
archive_atom name_atom = a.atomize(name);
return false;
}
-/** Retrieve property of type "ex" from node.
- * @return "true" if property was found, "false" otherwise */
bool archive_node::find_ex(const std::string &name, ex &ret, const lst &sym_lst, unsigned int index) const
{
archive_atom name_atom = a.atomize(name);
return true;
}
+const archive_node &archive_node::find_ex_node(const std::string &name, unsigned int index) const
+{
+ archive_atom name_atom = a.atomize(name);
+ std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ unsigned int found_index = 0;
+ while (i != iend) {
+ if (i->type == PTYPE_NODE && i->name == name_atom) {
+ if (found_index == index)
+ return a.get_node(i->value);
+ found_index++;
+ }
+ i++;
+ }
+ throw (std::runtime_error("property with name '" + name + "' not found in archive node"));
+}
+
+
+void archive_node::get_properties(propinfovector &v) const
+{
+ v.clear();
+ std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+ while (i != iend) {
+ property_type type = i->type;
+ string name = a.unatomize(i->name);
+
+ propinfovector::iterator a = v.begin(), aend = v.end();
+ bool found = false;
+ while (a != aend) {
+ if (a->type == type && a->name == name) {
+ a->count++;
+ found = true;
+ break;
+ }
+ a++;
+ }
+ if (!found)
+ v.push_back(property_info(type, name));
+ i++;
+ }
+}
+
/** Convert archive node to GiNaC expression. */
ex archive_node::unarchive(const lst &sym_lst) const
}
+/** Assignment operator of property_info. */
+const archive_node::property_info &archive_node::property_info::operator=(const property_info &other)
+{
+ if (this != &other) {
+ type = other.type;
+ name = other.name;
+ count = other.count;
+ }
+ return *this;
+}
+
/** Assignment operator of property. */
const archive_node::property &archive_node::property::operator=(const property &other)
{
}
-/** Clear all archived expressions. */
void archive::clear(void)
{
atoms.clear();
std::vector<std::string>::const_iterator i = atoms.begin(), iend = atoms.end();
archive_atom id = 0;
while (i != iend) {
- os << " " << id << " " << *i << endl;
+ os << " " << id << " " << *i << std::endl;
i++; id++;
}
}
- os << endl;
+ os << std::endl;
// Dump expressions
os << "Expressions:\n";
std::vector<archived_ex>::const_iterator i = exprs.begin(), iend = exprs.end();
unsigned int index = 0;
while (i != iend) {
- os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << endl;
+ os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << std::endl;
i++; index++;
}
}
- os << endl;
+ os << std::endl;
// Dump nodes
os << "Nodes:\n";
case PTYPE_NODE: os << "node"; break;
default: os << "<unknown>"; break;
}
- os << " \"" << a.unatomize(i->name) << "\" " << i->value << endl;
+ os << " \"" << a.unatomize(i->name) << "\" " << i->value << std::endl;
i++;
}
}
}
-#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
git://www.ginac.de / ginac.git / blobdiff