Subject: [Boost-commit] svn:boost r63664 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/graph/distributed boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/msm boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/config/test libs/filesystem libs/functional/hash libs/fusion libs/graph/doc libs/graph/test libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/python/doc/v2 libs/range libs/range/doc libs/regex libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2010-07-05 12:40:25
Author: jewillco
Date: 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
New Revision: 63664
URL: http://svn.boost.org/trac/boost/changeset/63664
Log:
Merged more changes from trunk, including r63643 (new patches for LLP64)
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/serialization/factory.hpp (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/config/test/boost_no_com_value_init.ipp (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/msm/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/python/doc/v2/args.html (props changed)
branches/release/libs/python/doc/v2/return_internal_reference.html (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/range/doc/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/build/v2/tools/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/jam/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp | 140 +++++++++++++++++++++++++++++++--------
branches/release/boost/graph/distributed/rmat_graph_generator.hpp | 2
branches/release/boost/graph/distributed/strong_components.hpp | 6 +
branches/release/boost/graph/distributed/unsafe_serialize.hpp | 12 +++
branches/release/libs/graph/doc/depth_first_search.html | 2
branches/release/libs/graph/test/astar_search_test.cpp | 2
branches/release/libs/graph/test/dominator_tree_test.cpp | 2
branches/release/libs/graph/test/graphviz_test.cpp | 37 +++++----
branches/release/libs/graph/test/metric_tsp_approx.cpp | 4
9 files changed, 152 insertions(+), 55 deletions(-)
Modified: branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp
==============================================================================
--- branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp (original)
+++ branches/release/boost/graph/distributed/compressed_sparse_row_graph.hpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -1887,6 +1887,110 @@
return k.idx;
}
+/* Common traits for getting vertex_bundle and edge_bundle maps */
+
+namespace detail {
+ template <typename Graph, typename T> struct get_bundles;
+
+ template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename T>
+ class get_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE, T> {
+ typedef BOOST_DISTRIB_CSR_GRAPH_TYPE Graph;
+ typedef typename Graph::process_group_type process_group_type;
+
+ // Extract the global property map for our key type.
+ typedef typename property_map<Graph, vertex_global_t>::const_type vertex_global_map;
+ typedef typename property_traits<vertex_global_map>::value_type vertex_locator;
+ typedef typename property_map<Graph, edge_global_t>::const_type edge_global_map;
+ typedef typename property_traits<edge_global_map>::value_type edge_locator;
+
+ // Build the local property map
+ typedef bundle_property_map<std::vector<VertexProperty>,
+ typename vertex_locator::second_type,
+ VertexProperty,
+ T> vertex_local_pmap;
+
+ // Build the local const property map
+ typedef bundle_property_map<const std::vector<VertexProperty>,
+ typename vertex_locator::second_type,
+ VertexProperty,
+ const T> vertex_local_const_pmap;
+
+ // Build the local property map
+ typedef bundle_property_map<std::vector<EdgeProperty>,
+ typename edge_locator::second_type,
+ EdgeProperty,
+ T> edge_local_pmap;
+
+ // Build the local const property map
+ typedef bundle_property_map<const std::vector<EdgeProperty>,
+ typename edge_locator::second_type,
+ EdgeProperty,
+ const T> edge_local_const_pmap;
+
+ public:
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, vertex_global_map, vertex_local_pmap> vertex_map_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, vertex_global_map, vertex_local_const_pmap> vertex_map_const_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, edge_global_map, edge_local_pmap> edge_map_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, edge_global_map, edge_local_const_pmap> edge_map_const_type;
+
+ };
+
+ template <typename Graph> struct get_full_bundles;
+
+ template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
+ class get_full_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE> { // For vertex_bundle_t and edge_bundle_t
+ typedef BOOST_DISTRIB_CSR_GRAPH_TYPE Graph;
+ typedef typename Graph::process_group_type process_group_type;
+
+ // Extract the global property map for our key type.
+ typedef typename property_map<Graph, vertex_global_t>::const_type vertex_global_map;
+ typedef typename property_traits<vertex_global_map>::value_type vertex_locator;
+ typedef typename property_map<Graph, edge_global_t>::const_type edge_global_map;
+ typedef typename property_traits<edge_global_map>::value_type edge_locator;
+
+ // Build the local property maps
+ typedef typename property_map<typename Graph::base_type, vertex_bundle_t>::type vertex_local_pmap;
+ typedef typename property_map<typename Graph::base_type, vertex_bundle_t>::const_type vertex_local_const_pmap;
+ typedef typename property_map<typename Graph::base_type, edge_bundle_t>::type edge_local_pmap;
+ typedef typename property_map<typename Graph::base_type, edge_bundle_t>::const_type edge_local_const_pmap;
+
+ public:
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, vertex_global_map, vertex_local_pmap> vertex_map_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, vertex_global_map, vertex_local_const_pmap> vertex_map_const_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, edge_global_map, edge_local_pmap> edge_map_type;
+
+ typedef ::boost::parallel::distributed_property_map<
+ process_group_type, edge_global_map, edge_local_const_pmap> edge_map_const_type;
+
+ };
+}
+
+template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
+struct property_map<BOOST_DISTRIB_CSR_GRAPH_TYPE, vertex_bundle_t>
+{
+ typedef typename detail::get_full_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE>::vertex_map_type type;
+ typedef typename detail::get_full_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE>::vertex_map_const_type const_type;
+};
+
+template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS>
+struct property_map<BOOST_DISTRIB_CSR_GRAPH_TYPE, edge_bundle_t>
+{
+ typedef typename detail::get_full_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE>::edge_map_type type;
+ typedef typename detail::get_full_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE>::edge_map_const_type const_type;
+};
+
// -----------------------------------------------------------------
// Bundled Properties
template<BOOST_DISTRIB_CSR_GRAPH_TEMPLATE_PARMS, typename T, typename Bundle>
@@ -1895,39 +1999,20 @@
typedef BOOST_DISTRIB_CSR_GRAPH_TYPE Graph;
typedef typename Graph::process_group_type process_group_type;
- // Determine which locator map to use (vertex or edge)
+public:
typedef typename mpl::if_<detail::is_vertex_bundle<VertexProperty,
EdgeProperty,
Bundle>,
- vertex_global_t, edge_global_t>::type global_t;
+ typename detail::get_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE, T>::vertex_map_type,
+ typename detail::get_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE, T>::edge_map_type>
+ ::type type;
- // Extract the global property map for our key type.
- typedef typename property_map<Graph, global_t>::const_type global_map;
- typedef typename property_traits<global_map>::value_type locator;
-
- // Determine which bundle type we are using
typedef typename mpl::if_<detail::is_vertex_bundle<VertexProperty,
EdgeProperty,
Bundle>,
- VertexProperty, EdgeProperty>::type bundle_t;
-
-public:
- // Build the local property map
- typedef bundle_property_map<std::vector<bundle_t>,
- typename locator::second_type,
- bundle_t,
- T> local_pmap;
-
- // Build the local const property map
- typedef bundle_property_map<const std::vector<bundle_t>,
- typename locator::second_type,
- bundle_t,
- const T> local_const_pmap;
- typedef ::boost::parallel::distributed_property_map<
- process_group_type, global_map, local_pmap> type;
-
- typedef ::boost::parallel::distributed_property_map<
- process_group_type, global_map, local_const_pmap> const_type;
+ typename detail::get_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE, T>::vertex_map_const_type,
+ typename detail::get_bundles<BOOST_DISTRIB_CSR_GRAPH_TYPE, T>::edge_map_const_type>
+ ::type const_type;
};
namespace detail {
@@ -1996,7 +2081,6 @@
{
typedef BOOST_DISTRIB_CSR_GRAPH_TYPE Graph;
typedef typename property_map<Graph, T Bundle::*>::type result_type;
- typedef typename property_map<Graph, T Bundle::*>::local_pmap local_pmap;
// Resolver
typedef typename property_traits<result_type>::value_type value_type;
@@ -2022,8 +2106,6 @@
{
typedef BOOST_DISTRIB_CSR_GRAPH_TYPE Graph;
typedef typename property_map<Graph, T Bundle::*>::const_type result_type;
- typedef typename property_map<Graph, T Bundle::*>::local_const_pmap
- local_pmap;
// Resolver
typedef typename property_traits<result_type>::value_type value_type;
Modified: branches/release/boost/graph/distributed/rmat_graph_generator.hpp
==============================================================================
--- branches/release/boost/graph/distributed/rmat_graph_generator.hpp (original)
+++ branches/release/boost/graph/distributed/rmat_graph_generator.hpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -60,7 +60,7 @@
if (permute_vertices)
generate_permutation_vector(gen, vertexPermutation, n);
- int SCALE = int(floor(log(n)/log(2.)));
+ int SCALE = int(floor(log(double(n))/log(2.)));
boost::uniform_01<RandomGenerator> prob(gen);
std::map<value_type, bool> edge_map;
Modified: branches/release/boost/graph/distributed/strong_components.hpp
==============================================================================
--- branches/release/boost/graph/distributed/strong_components.hpp (original)
+++ branches/release/boost/graph/distributed/strong_components.hpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -478,20 +478,22 @@
for( boost::tie(vstart, vend) = vertices(g); vstart != vend; vstart++ ) {
vertex_descriptor v = get(succ_map, *vstart);
- if( v != graph_traits<Graph>::null_vertex() )
+ if( v != graph_traits<Graph>::null_vertex() ) {
if (dest_map[v] == id)
set_map[v].succ.push_back(*vstart);
else
successors[dest_map[v]].push_back( std::make_pair(v, *vstart) );
+ }
}
for( boost::tie(rev_vstart, rev_vend) = vertices(gr); rev_vstart != rev_vend; rev_vstart++ ) {
vertex_descriptor v = get(pred_map, *rev_vstart);
- if( v != graph_traits<Graph>::null_vertex() )
+ if( v != graph_traits<Graph>::null_vertex() ) {
if (dest_map[v] == id)
set_map[v].pred.push_back(get(rf, *rev_vstart));
else
predecessors[dest_map[v]].push_back( std::make_pair(v, get(rf, *rev_vstart)) );
+ }
}
// Send predecessor and successor messages
Modified: branches/release/boost/graph/distributed/unsafe_serialize.hpp
==============================================================================
--- branches/release/boost/graph/distributed/unsafe_serialize.hpp (original)
+++ branches/release/boost/graph/distributed/unsafe_serialize.hpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -21,6 +21,9 @@
#include <boost/serialization/is_bitwise_serializable.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/if.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/type_traits.hpp>
#include <utility>
BOOST_IS_BITWISE_SERIALIZABLE(void*)
@@ -31,8 +34,15 @@
namespace boost {
typedef mpl::if_c<(sizeof(int) == sizeof(void*)),
int,
- mpl::if_c<(sizeof(long) == sizeof(void*)), long, void>::type
+ mpl::if_c<(sizeof(long) == sizeof(void*)),
+ long,
+ mpl::if_c<(sizeof(void*) <= sizeof(boost::intmax_t)),
+ boost::intmax_t,
+ void>::type
+ >::type
>::type ptr_serialize_type;
+
+ BOOST_STATIC_ASSERT ((!boost::is_void<ptr_serialize_type>::value));
template<typename T> inline T& unsafe_serialize(T& x) { return x; }
Modified: branches/release/libs/graph/doc/depth_first_search.html
==============================================================================
--- branches/release/libs/graph/doc/depth_first_search.html (original)
+++ branches/release/libs/graph/doc/depth_first_search.html 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -223,7 +223,7 @@
<b>Default:</b> <tt>get(vertex_index, g)</tt>.
Note: if you use this default, make sure your graph has
an internal <tt>vertex_index</tt> property. For example,
- <tt>adjacenty_list</tt> with <tt>VertexList=listS</tt> does
+ <tt>adjacency_list</tt> with <tt>VertexList=listS</tt> does
not have an internal <tt>vertex_index</tt> property.<br>
<b>Python</b>: Unsupported parameter.
Modified: branches/release/libs/graph/test/astar_search_test.cpp
==============================================================================
--- branches/release/libs/graph/test/astar_search_test.cpp (original)
+++ branches/release/libs/graph/test/astar_search_test.cpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -169,7 +169,7 @@
// pick random start/goal
- minstd_rand gen(time(0));
+ boost::minstd_rand gen(time(0));
vertex start = gen() % num_vertices(g);
vertex goal = gen() % num_vertices(g);
Modified: branches/release/libs/graph/test/dominator_tree_test.cpp
==============================================================================
--- branches/release/libs/graph/test/dominator_tree_test.cpp (original)
+++ branches/release/libs/graph/test/dominator_tree_test.cpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -265,7 +265,7 @@
cout << endl;
// dominator tree correctness test
- BOOST_CHECK(equal(idom.begin(), idom.end(), testSet[i].correctIdoms.begin()));
+ BOOST_CHECK(std::equal(idom.begin(), idom.end(), testSet[i].correctIdoms.begin()));
// compare results of fast version and slow version of dominator tree
domTreePredVector2 =
Modified: branches/release/libs/graph/test/graphviz_test.cpp
==============================================================================
--- branches/release/libs/graph/test/graphviz_test.cpp (original)
+++ branches/release/libs/graph/test/graphviz_test.cpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -12,6 +12,7 @@
// Author: Ronald Garcia
#define BOOST_GRAPHVIZ_USE_ISTREAM
+#define BOOST_TEST_MODULE TestGraphviz
#include <boost/regex.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/assign/std/map.hpp>
@@ -20,6 +21,7 @@
#include <boost/tuple/tuple.hpp>
#include <boost/property_map/dynamic_property_map.hpp>
#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>
#include <algorithm>
#include <string>
@@ -131,26 +133,26 @@
return result;
}
-int test_main(int, char*[]) {
+// int test_main(int, char*[]) {
typedef istringstream gs_t;
// Basic directed graph tests
- {
+ BOOST_AUTO_TEST_CASE (basic_directed_graph_1) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",7.7f) ("e", 6.66f);
gs_t gs("digraph { a node [mass = 7.7] c e [mass = 6.66] }");
BOOST_CHECK((test_graph<directedS,vecS>(gs,3,masses,weight_map_t())));
}
- {
+ BOOST_AUTO_TEST_CASE (basic_directed_graph_2) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("e", 6.66f);
gs_t gs("digraph { a node [mass = 7.7] \"a\" e [mass = 6.66] }");
BOOST_CHECK((test_graph<directedS,vecS>(gs,2,masses,weight_map_t())));
}
- {
+ BOOST_AUTO_TEST_CASE (basic_directed_graph_3) {
weight_map_t weights;
insert( weights )(make_pair("a","b"),0.0)
(make_pair("c","d"),7.7)(make_pair("e","f"),6.66)
@@ -162,7 +164,7 @@
}
// undirected graph with alternate node_id property name
- {
+ BOOST_AUTO_TEST_CASE (undirected_graph_alternate_node_id) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",7.7f) ("e", 6.66f);
gs_t gs("graph { a node [mass = 7.7] c e [mass = 6.66] }");
@@ -171,14 +173,14 @@
}
// Basic undirected graph tests
- {
+ BOOST_AUTO_TEST_CASE (basic_undirected_graph_1) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",7.7f) ("e", 6.66f);
gs_t gs("graph { a node [mass = 7.7] c e [mass =\\\n6.66] }");
BOOST_CHECK((test_graph<undirectedS,vecS>(gs,3,masses,weight_map_t())));
}
- {
+ BOOST_AUTO_TEST_CASE (basic_undirected_graph_2) {
weight_map_t weights;
insert( weights )(make_pair("a","b"),0.0)
(make_pair("c","d"),7.7)(make_pair("e","f"),6.66);
@@ -188,7 +190,7 @@
}
// Mismatch directed graph test
- {
+ BOOST_AUTO_TEST_CASE (mismatch_directed_graph) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",7.7f) ("e", 6.66f);
gs_t gs("graph { a nodE [mass = 7.7] c e [mass = 6.66] }");
@@ -199,7 +201,7 @@
}
// Mismatch undirected graph test
- {
+ BOOST_AUTO_TEST_CASE (mismatch_undirected_graph) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",7.7f) ("e", 6.66f);
gs_t gs("digraph { a node [mass = 7.7] c e [mass = 6.66] }");
@@ -210,7 +212,8 @@
}
// Complain about parallel edges
- {
+ BOOST_AUTO_TEST_CASE (complain_about_parallel_edges) {
+ BOOST_TEST_CHECKPOINT("Complain about parallel edges");
weight_map_t weights;
insert( weights )(make_pair("a","b"),7.7);
gs_t gs("diGraph { a -> b [weight = 7.7] a -> b [weight = 7.7] }");
@@ -221,7 +224,7 @@
}
// Handle parallel edges gracefully
- {
+ BOOST_AUTO_TEST_CASE (handle_parallel_edges_gracefully) {
weight_map_t weights;
insert( weights )(make_pair("a","b"),7.7);
gs_t gs("digraph { a -> b [weight = 7.7] a -> b [weight = 7.7] }");
@@ -229,7 +232,7 @@
}
// Graph Property Test 1
- {
+ BOOST_AUTO_TEST_CASE (graph_property_test_1) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",0.0f) ("e", 6.66f);
gs_t gs("digraph { graph [name=\"foo \\\"escaped\\\"\"] a c e [mass = 6.66] }");
@@ -239,7 +242,7 @@
}
// Graph Property Test 2
- {
+ BOOST_AUTO_TEST_CASE (graph_property_test_2) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",0.0f) ("e", 6.66f);
gs_t gs("digraph { name=\"fo\"+ \"\\\no\" a c e [mass = 6.66] }");
@@ -249,7 +252,7 @@
}
// Graph Property Test 3 (HTML)
- {
+ BOOST_AUTO_TEST_CASE (graph_property_test_3) {
mass_map_t masses;
insert ( masses ) ("a",0.0f) ("c",0.0f) ("e", 6.66f);
std::string graph_name = "<html title=\"x'\" title2='y\"'>foo<b><![CDATA[><bad tag&>]]>bar</b>\n<br/>\nbaz</html>";
@@ -259,7 +262,7 @@
}
// Comments embedded in strings
- {
+ BOOST_AUTO_TEST_CASE (comments_embedded_in_strings) {
gs_t gs(
"digraph { "
"a0 [ label = \"//depot/path/to/file_14#4\" ];"
@@ -268,5 +271,5 @@
"}");
BOOST_CHECK((test_graph<directedS,vecS>(gs,2,mass_map_t(),weight_map_t())));
}
- return 0;
-}
+// return 0;
+// }
Modified: branches/release/libs/graph/test/metric_tsp_approx.cpp
==============================================================================
--- branches/release/libs/graph/test/metric_tsp_approx.cpp (original)
+++ branches/release/libs/graph/test/metric_tsp_approx.cpp 2010-07-05 12:40:23 EDT (Mon, 05 Jul 2010)
@@ -91,9 +91,9 @@
typedef set<simple_point<double>, cmpPnt<double> > PointSet;
typedef vector< Vertex > Container;
- mt19937 rng(time(0));
+ boost::mt19937 rng(time(0));
uniform_real<> range(0.01, (numpts * 2));
- variate_generator<mt19937&, uniform_real<> >
+ variate_generator<boost::mt19937&, uniform_real<> >
pnt_gen(rng, range);
PointSet points;