Subject: [Boost-commit] svn:boost r78442 - in trunk: boost/graph boost/graph/detail libs/graph/doc libs/graph/example libs/graph/test
From: jewillco_at_[hidden]
Date: 2012-05-12 16:46:48
Author: jewillco
Date: 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
New Revision: 78442
URL: http://svn.boost.org/trac/boost/changeset/78442
Log:
Fixed inspect warnings and typos
Text files modified:
trunk/boost/graph/biconnected_components.hpp | 7 +-
trunk/boost/graph/detail/histogram_sort.hpp | 10 +-
trunk/boost/graph/two_graphs_common_spanning_trees.hpp | 2
trunk/libs/graph/doc/directed_graph.html | 103 +--------------------------------------
trunk/libs/graph/example/two_graphs_common_spanning_trees.cpp | 2
trunk/libs/graph/test/two_graphs_common_spanning_trees_test.cpp | 2
6 files changed, 16 insertions(+), 110 deletions(-)
Modified: trunk/boost/graph/biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/biconnected_components.hpp (original)
+++ trunk/boost/graph/biconnected_components.hpp 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -21,6 +21,7 @@
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/graph_utility.hpp>
#include <boost/concept/assert.hpp>
+#include <boost/assert.hpp>
namespace boost
{
@@ -127,8 +128,8 @@
put(comp, S.top(), c);
S.pop();
}
- assert (source(S.top(), g) == parent);
- assert (target(S.top(), g) == u);
+ BOOST_ASSERT (source(S.top(), g) == parent);
+ BOOST_ASSERT (target(S.top(), g) == u);
put(comp, S.top(), c);
S.pop();
++c;
@@ -177,7 +178,7 @@
std::size_t children_of_root;
std::size_t dfs_time = 0;
std::stack<edge_t> S;
- std::vector<char> is_articulation_point(num_vertices(g));
+ std::vector<char> is_articulation_point(num_vertices(g));
biconnected_components_visitor<ComponentMap, DiscoverTimeMap,
LowPointMap, PredecessorMap, OutputIterator, std::stack<edge_t>,
Modified: trunk/boost/graph/detail/histogram_sort.hpp
==============================================================================
--- trunk/boost/graph/detail/histogram_sort.hpp (original)
+++ trunk/boost/graph/detail/histogram_sort.hpp 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -60,7 +60,7 @@
// Put the degree of each vertex v into m_rowstart[v + 1]
for (KeyIterator i = begin; i != end; ++i) {
if (key_filter(*i)) {
- assert (key_transform(*i) < numkeys);
+ BOOST_ASSERT (key_transform(*i) < numkeys);
++starts[key_transform(*i) + 1];
}
}
@@ -100,7 +100,7 @@
for (KeyIterator i = key_begin; i != key_end; ++i, ++v1i) {
if (key_filter(*i)) {
vertices_size_type source = key_transform(*i);
- assert (source < numkeys);
+ BOOST_ASSERT (source < numkeys);
EdgeIndex insert_pos = current_insert_positions[source];
++current_insert_positions[source];
values1_out[insert_pos] = *v1i;
@@ -139,7 +139,7 @@
for (KeyIterator i = key_begin; i != key_end; ++i, ++v1i, ++v2i) {
if (key_filter(*i)) {
vertices_size_type source = key_transform(*i);
- assert (source < numkeys);
+ BOOST_ASSERT (source < numkeys);
EdgeIndex insert_pos = current_insert_positions[source];
++current_insert_positions[source];
values1_out[insert_pos] = *v1i;
@@ -166,7 +166,7 @@
std::vector<EdgeIndex> insert_positions(rowstart, rowstart + numkeys);
// 2. Swap the sources and targets into place
for (size_t i = 0; i < rowstart[numkeys]; ++i) {
- assert (key_transform(key_begin[i]) < numkeys);
+ BOOST_ASSERT (key_transform(key_begin[i]) < numkeys);
// While edge i is not in the right bucket:
while (!(i >= rowstart[key_transform(key_begin[i])] && i < insert_positions[key_transform(key_begin[i])])) {
// Add a slot in the right bucket
@@ -201,7 +201,7 @@
std::vector<EdgeIndex> insert_positions(rowstart, rowstart + numkeys);
// 2. Swap the sources and targets into place
for (size_t i = 0; i < rowstart[numkeys]; ++i) {
- assert (key_transform(key_begin[i]) < numkeys);
+ BOOST_ASSERT (key_transform(key_begin[i]) < numkeys);
// While edge i is not in the right bucket:
while (!(i >= rowstart[key_transform(key_begin[i])] && i < insert_positions[key_transform(key_begin[i])])) {
// Add a slot in the right bucket
Modified: trunk/boost/graph/two_graphs_common_spanning_trees.hpp
==============================================================================
--- trunk/boost/graph/two_graphs_common_spanning_trees.hpp (original)
+++ trunk/boost/graph/two_graphs_common_spanning_trees.hpp 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -6,7 +6,7 @@
// Two Graphs Common Spanning Trees Algorithm
// Based on academic article of Mint, Read and Tarjan
// Efficient Algorithm for Common Spanning Tree Problem
-// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346–347
+// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346-347
#ifndef BOOST_GRAPH_TWO_GRAPHS_COMMON_SPANNING_TREES_HPP
Modified: trunk/libs/graph/doc/directed_graph.html
==============================================================================
--- trunk/libs/graph/doc/directed_graph.html (original)
+++ trunk/libs/graph/doc/directed_graph.html 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -23,7 +23,7 @@
<P>
-The <tt>directed_graph</tt> class template is is a simplified version
+The <tt>directed_graph</tt> class template is a simplified version
of the BGL adjacency list. This class is provided for ease of use, but
may not perform as well as custom-defined adjacency list classes. Instances
of this template model the BidirectionalGraph, VertexIndexGraph, and
@@ -36,105 +36,10 @@
<PRE>
- typedef boost::directed_graph<> Graph;
+ typedef boost::directed_graph<> Graph;
Graph g;
- boost::graph_traits<Graph>::vertex_descriptor v0 = g.add_vertex();
- boost::graph_traits<Graph>::vertex_descriptor v1 = g.add_vertex();
-
- g.add_edge(v0, v1);
-</PRE>
-
-<H3>Template Parameters</H3>
-
-<P>
-<TABLE border>
-<TR>
-<th>Parameter</th><th>Description</th><th>Default</th>
-</tr>
-
-<TR><TD><TT>VertexProp</TT></TD>
-<TD>A property map for the graph vertices.</TD>
-<TD> </TD>
-</TR>
-
-<TR>
-<TD><TT>EdgeProp</TT></TD>
-<TD>A property map for the graph edges.</TD>
-<TD> </TD>
-</TR>
-
-<TR>
-<TD><TT>GraphProp</TT></TD>
-<TD>A property map for the graph itself.</TD>
-</TR>
-
-</TABLE>
-<P>
-
-<H3>Where Defined</H3>
-
-<P>
-boost/graph/directed_graph.hpp
-
-<P>
-
-<br>
-<HR>
-<TABLE>
-<TR valign=top>
-<TD nowrap>Copyright © 2000-2001</TD><TD>
-Jeremy Siek,
-Indiana University (<A
-HREF="mailto:jsiek_at_[hidden]">jsiek_at_[hidden]</A>)<br>
-<A HREF="http://www.boost.org/people/liequan_lee.htm">Lie-Quan Lee</A>, Indiana University (<A HREF="mailto:llee_at_[hidden]">llee_at_[hidden]</A>)<br>
-Andrew Lumsdaine,
-Indiana University (<A
-HREF="mailto:lums_at_[hidden]">lums_at_[hidden]</A>)
-</TD></TR></TABLE>
-
-</BODY>
-</HTML>
-<HTML>
-<!--
- Copyright (c) Jeremy Siek 2000
-
- Distributed under the Boost Software License, Version 1.0.
- (See accompanying file LICENSE_1_0.txt or copy at
- http://www.boost.org/LICENSE_1_0.txt)
- -->
-<Head>
-<Title>Boost Graph Library: Directed Graph</Title>
-<BODY BGCOLOR="#ffffff" LINK="#0000ee" TEXT="#000000" VLINK="#551a8b"
- ALINK="#ff0000">
-<IMG SRC="../../../boost.png"
- ALT="C++ Boost" width="277" height="86">
-
-<BR Clear>
-
-<H1><A NAME="sec:directed-graph-class"></A>
-<pre>
-directed_graph<VertexProp, EdgeProp, GraphProp>
-</pre>
-</H1>
-
-
-<P>
-The <tt>directed_graph</tt> class template is is a simplified version
-of the BGL adjacency list. This class is provided for ease of use, but
-may not perform as well as custom-defined adjacency list classes. Instances
-of this template model the BidirectionalGraph, VertexIndexGraph, and
-EdgeIndexGraph concepts.
-
-<H3>Example</H3>
-
-<P>
-
-
-<PRE>
- typedef boost::directed_graph<> Graph;
- Graph g;
- Graph::vertex_descriptor v0 = g.add_vertex();
- Graph::vertex_descriptor v1 = g.add_vertex();
+ boost::graph_traits<Graph>::vertex_descriptor v0 = g.add_vertex();
+ boost::graph_traits<Graph>::vertex_descriptor v1 = g.add_vertex();
g.add_edge(v0, v1);
</PRE>
Modified: trunk/libs/graph/example/two_graphs_common_spanning_trees.cpp
==============================================================================
--- trunk/libs/graph/example/two_graphs_common_spanning_trees.cpp (original)
+++ trunk/libs/graph/example/two_graphs_common_spanning_trees.cpp 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -6,7 +6,7 @@
// Two Graphs Common Spanning Trees Algorithm
// Based on academic article of Mint, Read and Tarjan
// Efficient Algorithm for Common Spanning Tree Problem
-// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346–347
+// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346-347
#include <boost/graph/adjacency_list.hpp>
Modified: trunk/libs/graph/test/two_graphs_common_spanning_trees_test.cpp
==============================================================================
--- trunk/libs/graph/test/two_graphs_common_spanning_trees_test.cpp (original)
+++ trunk/libs/graph/test/two_graphs_common_spanning_trees_test.cpp 2012-05-12 16:46:47 EDT (Sat, 12 May 2012)
@@ -6,7 +6,7 @@
// Two Graphs Common Spanning Trees Algorithm
// Based on academic article of Mint, Read and Tarjan
// Efficient Algorithm for Common Spanning Tree Problem
-// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346–347
+// Electron. Lett., 28 April 1983, Volume 19, Issue 9, p.346-347
#include <boost/type_traits.hpp>