|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67970 - in branches/release: . boost boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/fusion/container/list/detail boost/gil boost/graph boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/math boost/msm boost/numeric/ublas boost/pool 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/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/date_time libs/filesystem libs/functional/hash libs/fusion libs/graph/doc libs/graph/example libs/graph/src libs/graph/test libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html/header/boost/icl libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/math/build libs/math/config libs/math/doc libs/math/doc/complex libs/math/doc/distexplorer libs/math/doc/gcd libs/math/doc/html libs/math/doc/octonion libs/math/doc/quaternion libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/math/dot_net_example libs/math/example libs/math/minimax libs/math/performance libs/math/src libs/math/test libs/math/tools libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/pool libs/program_options libs/property_tree libs/python libs/range libs/regex libs/regex/build libs/serialization libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide 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/typeof/doc 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/inspect tools/quickbook tools/quickbook/src tools/quickbook/test tools/regression tools/regression/src tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2011-01-11 13:52:53
Author: jewillco
Date: 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
New Revision: 67970
URL: http://svn.boost.org/trac/boost/changeset/67970
Log:
Merged r66528,66559,66960,67010,67012,67033,67035,67038,67040,67069,67086,67723,67914 from trunk
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/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/concept_check.hpp (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/filesystem.hpp (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/fusion/container/list/detail/build_cons.hpp (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/icl/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/io/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/iterator/iterator_facade.hpp (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/pool/ (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/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/signals2.hpp (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/token_functions.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/typeof/message.hpp (props changed)
branches/release/boost/typeof/register_functions.hpp (props changed)
branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
branches/release/boost/typeof/typeof.hpp (props changed)
branches/release/boost/typeof/unsupported.hpp (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/Jamfile.v2 (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/array/test/array6.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/date_time/ (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/icl/ (props changed)
branches/release/libs/icl/doc/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/test/test_doc_code_/ (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/math/build/ (props changed)
branches/release/libs/math/config/ (props changed)
branches/release/libs/math/doc/ (props changed)
branches/release/libs/math/doc/complex/ (props changed)
branches/release/libs/math/doc/distexplorer/ (props changed)
branches/release/libs/math/doc/gcd/ (props changed)
branches/release/libs/math/doc/html/ (props changed)
branches/release/libs/math/doc/octonion/ (props changed)
branches/release/libs/math/doc/quaternion/ (props changed)
branches/release/libs/math/doc/sf_and_dist/ (props changed)
branches/release/libs/math/doc/sf_and_dist/html/ (props changed)
branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (props changed)
branches/release/libs/math/dot_net_example/ (props changed)
branches/release/libs/math/example/ (props changed)
branches/release/libs/math/minimax/ (props changed)
branches/release/libs/math/performance/ (props changed)
branches/release/libs/math/src/ (props changed)
branches/release/libs/math/test/ (props changed)
branches/release/libs/math/tools/ (props changed)
branches/release/libs/mpi/build/ (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/pool/ (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/range/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/regex/build/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/doc/ (props changed)
branches/release/libs/serialization/example/ (props changed)
branches/release/libs/serialization/src/ (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/serialization/vc7ide/ (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/typeof/doc/typeof.qbk (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/status/explicit-failures-markup.xml (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/user-config.jam (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/quickbook/src/ (props changed)
branches/release/tools/quickbook/test/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/src/library_status.cpp (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/libs/graph/doc/dijkstra_shortest_paths.html | 2 +-
branches/release/libs/graph/doc/dijkstra_shortest_paths_no_color_map.html | 2 +-
branches/release/libs/graph/doc/file_dependency_example.html | 2 +-
branches/release/libs/graph/doc/fruchterman_reingold.html | 2 +-
branches/release/libs/graph/example/Jamfile.v2 | 3 +++
branches/release/libs/graph/example/actor_clustering.cpp | 2 +-
branches/release/libs/graph/example/bfs-example.cpp | 2 +-
branches/release/libs/graph/example/bfs-example2.cpp | 2 +-
branches/release/libs/graph/example/dfs-example.cpp | 2 +-
branches/release/libs/graph/src/graphml.cpp | 1 -
branches/release/libs/graph/src/read_graphviz_new.cpp | 2 +-
branches/release/libs/graph/test/Jamfile.v2 | 2 +-
branches/release/libs/graph/test/graphviz_test.cpp | 2 ++
branches/release/libs/graph/test/stoer_wagner_test.cpp | 3 ++-
14 files changed, 17 insertions(+), 12 deletions(-)
Modified: branches/release/libs/graph/doc/dijkstra_shortest_paths.html
==============================================================================
--- branches/release/libs/graph/doc/dijkstra_shortest_paths.html (original)
+++ branches/release/libs/graph/doc/dijkstra_shortest_paths.html 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -390,7 +390,7 @@
<H3>Complexity</H3>
<P>
-The time complexity is <i>O(V log V)</i>.
+The time complexity is <i>O(V log V + E)</i>.
<h3>Visitor Event Points</h3>
Modified: branches/release/libs/graph/doc/dijkstra_shortest_paths_no_color_map.html
==============================================================================
--- branches/release/libs/graph/doc/dijkstra_shortest_paths_no_color_map.html (original)
+++ branches/release/libs/graph/doc/dijkstra_shortest_paths_no_color_map.html 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -322,7 +322,7 @@
<H3>Complexity</H3>
<P>
-The time complexity is <i>O(V log V)</i>.
+The time complexity is <i>O(V log V + E)</i>.
<h3>Visitor Event Points</h3>
Modified: branches/release/libs/graph/doc/file_dependency_example.html
==============================================================================
--- branches/release/libs/graph/doc/file_dependency_example.html (original)
+++ branches/release/libs/graph/doc/file_dependency_example.html 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -211,7 +211,7 @@
the time slot must be one more than the maximum time-slot of the files
it depends on.
-<P>We start be creating a vector <code>time</code> that will store the
+<P>We start by creating a vector <code>time</code> that will store the
time step at which each file can be built. We initialize every value
with time step zero.</p>
Modified: branches/release/libs/graph/doc/fruchterman_reingold.html
==============================================================================
--- branches/release/libs/graph/doc/fruchterman_reingold.html (original)
+++ branches/release/libs/graph/doc/fruchterman_reingold.html 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -216,7 +216,7 @@
<H3>Complexity</H3>
<P> The time complexity is <i>O(|V|<sup>2</sup> + |E|)</i> for each
-iteration of the algorithm in the worse case. The average case for the
+iteration of the algorithm in the worst case. The average case for the
grid variant is <i>O(|V| + |E|)</i>. The number of iterations is
determined by the cooling schedule.
Modified: branches/release/libs/graph/example/Jamfile.v2
==============================================================================
--- branches/release/libs/graph/example/Jamfile.v2 (original)
+++ branches/release/libs/graph/example/Jamfile.v2 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -30,3 +30,6 @@
exe implicit_graph : implicit_graph.cpp ;
exe astar_maze : astar_maze.cpp ;
exe stoer_wagner : stoer_wagner.cpp ;
+exe bfs-example : bfs-example.cpp ;
+exe bfs-example2 : bfs-example2.cpp ;
+exe dfs-example : dfs-example.cpp ;
Modified: branches/release/libs/graph/example/actor_clustering.cpp
==============================================================================
--- branches/release/libs/graph/example/actor_clustering.cpp (original)
+++ branches/release/libs/graph/example/actor_clustering.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -9,7 +9,7 @@
// This program performs betweenness centrality (BC) clustering on the
// actor collaboration graph available at
-// http://www.nd.edu/~networks/database/index.html and outputs the
+// http://www.nd.edu/~networks/resources/actor/actor.dat.gz and outputs the
// result of clustering in Pajek format.
//
// This program mimics the BC clustering algorithm program implemented
Modified: branches/release/libs/graph/example/bfs-example.cpp
==============================================================================
--- branches/release/libs/graph/example/bfs-example.cpp (original)
+++ branches/release/libs/graph/example/bfs-example.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -8,7 +8,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
#include <iostream>
Modified: branches/release/libs/graph/example/bfs-example2.cpp
==============================================================================
--- branches/release/libs/graph/example/bfs-example2.cpp (original)
+++ branches/release/libs/graph/example/bfs-example2.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -8,7 +8,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
#include <iostream>
Modified: branches/release/libs/graph/example/dfs-example.cpp
==============================================================================
--- branches/release/libs/graph/example/dfs-example.cpp (original)
+++ branches/release/libs/graph/example/dfs-example.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -7,7 +7,7 @@
//=======================================================================
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/depth_first_search.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
#include <boost/pending/indirect_cmp.hpp>
#include <iostream>
Modified: branches/release/libs/graph/src/graphml.cpp
==============================================================================
--- branches/release/libs/graph/src/graphml.cpp (original)
+++ branches/release/libs/graph/src/graphml.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -92,7 +92,6 @@
// Search for edges
BOOST_FOREACH(const ptree::value_type& edge, *gr) {
if (edge.first != "edge") continue;
- std::string id = edge.second.get<std::string>(path("<xmlattr>/id"));
std::string source = edge.second.get<std::string>(path("<xmlattr>/source"));
std::string target = edge.second.get<std::string>(path("<xmlattr>/target"));
std::string local_directed = edge.second.get(path("<xmlattr>/directed"), "");
Modified: branches/release/libs/graph/src/read_graphviz_new.cpp
==============================================================================
--- branches/release/libs/graph/src/read_graphviz_new.cpp (original)
+++ branches/release/libs/graph/src/read_graphviz_new.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -718,7 +718,7 @@
std::string rhs = "true";
if (peek().type == token::equal) {
get();
- if (peek().type != token::identifier) error("Wanted identifier as value of attributed");
+ if (peek().type != token::identifier) error("Wanted identifier as value of attribute");
rhs = get().normalized_value;
}
props[lhs] = rhs;
Modified: branches/release/libs/graph/test/Jamfile.v2
==============================================================================
--- branches/release/libs/graph/test/Jamfile.v2 (original)
+++ branches/release/libs/graph/test/Jamfile.v2 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -120,7 +120,7 @@
[ run incremental_components_test.cpp ]
[ run random_spanning_tree_test.cpp ../build//boost_graph ]
[ run graphml_test.cpp ../build//boost_graph : : "graphml_test.xml" ]
- [ run stoer_wagner_test.cpp ../../test/build : $(TEST_DIR) ]
+ [ run stoer_wagner_test.cpp ../../test/build//boost_unit_test_framework/<link>static : $(TEST_DIR) ]
;
# Run SDB tests only when -sSDB= is set.
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 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -97,6 +97,7 @@
std::string node_name = get(name,*i);
// - get its mass
float node_mass = get(mass,*i);
+ BOOST_CHECK(masses.find(node_name) != masses.end());
float ref_mass = masses.find(node_name)->second;
// - compare the mass to the result in the table
BOOST_CHECK_CLOSE(node_mass, ref_mass, 0.01f);
@@ -114,6 +115,7 @@
get(name, target(*i,graph)));
// - get its weight
double edge_weight = get(weight,*i);
+ BOOST_CHECK(weights.find(edge_name) != weights.end());
double ref_weight = weights.find(edge_name)->second;
// - compare the weight to teh result in the table
BOOST_CHECK_CLOSE(edge_weight, ref_weight, 0.01);
Modified: branches/release/libs/graph/test/stoer_wagner_test.cpp
==============================================================================
--- branches/release/libs/graph/test/stoer_wagner_test.cpp (original)
+++ branches/release/libs/graph/test/stoer_wagner_test.cpp 2011-01-11 13:52:51 EST (Tue, 11 Jan 2011)
@@ -3,6 +3,8 @@
// (See accompanying file LICENSE_1_0.txt or the copy at
// http://www.boost.org/LICENSE_1_0.txt)
+// #define BOOST_TEST_DYN_LINK 1
+#define BOOST_TEST_NO_LIB 1
#include <fstream>
#include <iostream>
#include <map>
@@ -16,7 +18,6 @@
#include <boost/graph/stoer_wagner_min_cut.hpp>
#include <boost/graph/property_maps/constant_property_map.hpp>
#include <boost/property_map/property_map.hpp>
-#define BOOST_TEST_DYN_LINK 1
#include <boost/test/unit_test.hpp>
#include <boost/tuple/tuple.hpp>
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