|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49584 - in sandbox/SOC/2008/graphs/trunk/boost/graphs: adjacency_list apps
From: asutton_at_[hidden]
Date: 2008-11-04 11:19:41
Author: asutton
Date: 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
New Revision: 49584
URL: http://svn.boost.org/trac/boost/changeset/49584
Log:
Put directed graphs into boost namespace.
Text files modified:
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_edge.hpp | 7 +++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_graph.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_types.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_vertex.hpp | 7 +++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_iterator.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_list.hpp | 7 +++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_set.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_vector.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_iterator.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_list.hpp | 9 ++++++---
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_set.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_vector.hpp | 8 ++++++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/undirected_graph.hpp | 5 +++--
sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/vertex_vector.hpp | 2 +-
sandbox/SOC/2008/graphs/trunk/boost/graphs/apps/dawg.hpp | 2 ++
15 files changed, 75 insertions(+), 28 deletions(-)
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_edge.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_edge.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_edge.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,11 +1,13 @@
-#ifndef DIRECTED_EDGE_HPP
-#define DIRECTED_EDGE_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_DIRECTED_EDGE_HPP
+#define BOOST_GRAPHS_ADJLIST_DIRECTED_EDGE_HPP
#include <iosfwd>
#include <iterator>
#include <boost/graphs/directional_edge.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* A directed edge represents an edge in a directed graph. A directed edge is
* uniquely identified by its source and target vertices the descriptor into
@@ -228,5 +230,6 @@
edge_iterator edge;
};
+} } } /* namespace boost::graphs::adjacency_list */
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_graph.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_graph.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_graph.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,6 @@
-#ifndef DIRECTED_GRAPH_HPP
-#define DIRECTED_GRAPH_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_DIRECTED_GRAPH_HPP
+#define BOOST_GRAPHS_ADJLIST_DIRECTED_GRAPH_HPP
// Notes on directed graphs... Unlike directed graphs, which are required
// to globally store edge label, the vertices directed graphs act as
@@ -31,6 +31,8 @@
#include <boost/none.hpp>
#include <boost/graphs/adjacency_list/directed_types.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
template <
typename VertexLabel,
typename EdgeLabel,
@@ -943,4 +945,6 @@
#undef BOOST_GRAPH_DG_PARAMS
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_types.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_types.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_types.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,6 @@
-#ifndef DIRECTED_TYPES_HPP
-#define DIRECTED_TYPES_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_DIRECTED_TYPES_HPP
+#define BOOST_GRAPHS_ADJLIST_DIRECTED_TYPES_HPP
// Vertex stores
#include <boost/graphs/adjacency_list/vertex_vector.hpp>
@@ -30,6 +30,8 @@
// Adjacency components
#include <boost/graphs/adjacency_list/adjacency_iterator.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* This class is a metafunction that generates all of the types needed to
* implement a directed graph.
@@ -84,4 +86,6 @@
typedef std::pair<adjacent_vertex_iterator, adjacent_vertex_iterator> adjacent_vertex_range;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_vertex.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_vertex.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/directed_vertex.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,8 @@
-#ifndef DIRECTED_VERTEX_HPP
-#define DIRECTED_VERTEX_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_DIRECTED_VERTEX_HPP
+#define BOOST_GRAPHS_ADJLIST_DIRECTED_VERTEX_HPP
+
+namespace boost { namespace graphs { namespace adjacency_list {
/**
* A directed vertex provides storage for both outgoing edges and in edges.
@@ -162,5 +164,6 @@
in_store _in;
};
+} } } /* namespace boost::graphs::adjacency_list */
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_iterator.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_iterator.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_iterator.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,8 @@
-#ifndef IN_ITERATOR_HPP
-#define IN_ITERATOR_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_IN_ITERATOR_HPP
+#define BOOST_GRAPHS_ADJLIST_IN_ITERATOR_HPP
+
+namespace boost { namespace graphs { namespace adjacency_list {
/**
* The in edge iterator is a wrapper around out store iterators that, when
@@ -62,4 +64,6 @@
iterator iter;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_list.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_list.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_list.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,12 +1,13 @@
-#ifndef IN_LIST_HPP
-#define IN_LIST_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_IN_LIST_HPP
+#define BOOST_GRAPHS_ADJLIST_IN_LIST_HPP
#include <list>
#include <algorithm>
#include <boost/descriptors.hpp>
#include <boost/graphs/utility.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
/**
* The in-edge list references incoming edges from other vertices. Each edge
@@ -105,4 +106,6 @@
size_type _size;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_set.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_set.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_set.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,11 +1,13 @@
-#ifndef IN_SET_HPP
-#define IN_SET_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_IN_SET_HPP
+#define BOOST_GRAPHS_ADJLIST_IN_SET_HPP
#include <map>
#include <boost/descriptors.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* The in-edge set references incoming edges from other vertices. Each edge
* can be uniquely identified by its source vertex and property descriptor.
@@ -92,4 +94,6 @@
mutable store_type _edges;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_vector.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_vector.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/in_vector.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,6 @@
-#ifndef IN_VECTOR_HPP
-#define IN_VECTOR_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_IN_VECTOR_HPP
+#define BOOST_GRAPHS_ADJLIST_IN_VECTOR_HPP
#include <vector>
#include <algorithm>
@@ -8,6 +8,8 @@
#include <boost/descriptors.hpp>
#include <boost/graphs/utility.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* The in-edge vector references incoming edges from other vertices. Each edge
* can be uniquely identified by its source vertex and property descriptor.
@@ -86,4 +88,6 @@
mutable store_type _edges;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_iterator.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_iterator.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_iterator.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,8 @@
-#ifndef OUT_ITERATOR_HPP
-#define OUT_ITERATOR_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_OUT_ITERATOR_HPP
+#define BOOST_GRAPHS_ADJLIST_OUT_ITERATOR_HPP
+
+namespace boost { namespace graphs { namespace adjacency_list {
/**
* The out edge iterator is a wrapper around out store iterators that, when
@@ -85,4 +87,6 @@
iterator iter;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_list.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_list.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_list.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,6 @@
-#ifndef OUT_LIST_HPP
-#define OUT_LIST_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_OUT_LIST_HPP
+#define BOOST_GRAPHS_ADJLIST_OUT_LIST_HPP
#include <list>
#include <algorithm>
@@ -8,13 +8,14 @@
#include <boost/descriptors.hpp>
#include <boost/graphs/utility.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* The out list implements list-based, out-edge storage for directed graphs.
* out-edges are uniquely identified by their target vertex and property
* descriptor. List-based stores support fast inserts, slow finds, but do allow
* removals.
*
-
* @param Edge A tuple describing a vertex descriptor and the edge label.
* @param Alloc The allocator for edge pairs.
*/
@@ -122,4 +123,6 @@
size_type _size;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_set.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_set.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_set.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,12 +1,14 @@
-#ifndef OUT_SET_HPP
-#define OUT_SET_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_OUT_SET_HPP
+#define BOOST_GRAPHS_ADJLIST_OUT_SET_HPP
#include <map>
#include <memory>
#include <boost/descriptors.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* The out set implements set-based, out-edge storage for directed graphs.
* out-edges are uniquely identified by their target vertex and property
@@ -116,4 +118,6 @@
mutable store_type _edges;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_vector.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_vector.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/out_vector.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -1,6 +1,6 @@
-#ifndef OUT_VECTOR_HPP
-#define OUT_VECTOR_HPP
+#ifndef BOOST_GRAPHS_ADJLIST_OUT_VECTOR_HPP
+#define BOOST_GRAPHS_ADJLIST_OUT_VECTOR_HPP
#include <vector>
#include <algorithm>
@@ -9,6 +9,8 @@
#include <boost/descriptors.hpp>
#include <boost/graphs/utility.hpp>
+namespace boost { namespace graphs { namespace adjacency_list {
+
/**
* The in/out vector implements vector-based, edge storage for directed graphs.
* Each out edge is capable of referencing its corresponding in edge in another
@@ -100,4 +102,6 @@
mutable store_type _edges;
};
+} } } /* namespace boost::graphs::adjacency_list */
+
#endif
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/undirected_graph.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/undirected_graph.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/undirected_graph.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -11,9 +11,9 @@
namespace boost { namespace graphs { namespace adjacency_list {
/**
- *
+ * The undirected graph class.
*/
-template <typename VertexLabel, typename EdgeLabel,typename VertexStore, typename EdgeStore>
+template <typename VertexLabel, typename EdgeLabel, typename VertexStore, typename EdgeStore>
class undirected_graph
{
typedef undirected_types<VertexLabel, EdgeLabel, VertexStore, EdgeStore> types;
@@ -200,6 +200,7 @@
//@{
vertex_label& operator[](vertex_descriptor);
vertex_label const& operator[](vertex_descriptor) const;
+
edge_label& operator[](edge_descriptor);
edge_label const& operator[](edge_descriptor) const;
//@}
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/vertex_vector.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/vertex_vector.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/adjacency_list/vertex_vector.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -120,7 +120,7 @@
inline typename store_type::iterator begin() const
{ return _verts.begin(); }
- inline iterator end() const
+ inline typename store_type::iterator end() const
{ return _verts.end(); }
//@}
Modified: sandbox/SOC/2008/graphs/trunk/boost/graphs/apps/dawg.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/trunk/boost/graphs/apps/dawg.hpp (original)
+++ sandbox/SOC/2008/graphs/trunk/boost/graphs/apps/dawg.hpp 2008-11-04 11:19:39 EST (Tue, 04 Nov 2008)
@@ -2,4 +2,6 @@
#ifndef BOOST_GRAPHS_APPS_DAWG_HPP
#ifndef BOOST_GRAPHS_APPS_DAWG_HPP
+
+
#endif
\ No newline at end of file
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk