Subject: [Boost-commit] svn:boost r75471 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/date_time boost/date_time/posix_time boost/detail boost/dynamic_bitset boost/filesystem boost/function boost/functional boost/fusion boost/geometry boost/geometry/algorithms boost/geometry/arithmetic boost/geometry/core boost/geometry/domains boost/geometry/geometries boost/geometry/iterators boost/geometry/multi boost/geometry/policies boost/geometry/strategies boost/geometry/util boost/geometry/views boost/gil boost/graph boost/graph/detail boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/locale boost/math boost/math/special_functions boost/msm boost/msm/back boost/msm/front boost/msm/front/detail boost/msm/front/euml boost/numeric/ublas boost/pool boost/program_options boost/program_options/detail 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 boost/xpressive doc libs libs/algorithm/string libs/array libs/array/test libs/bimap libs/config libs/date_time libs/date_time/data libs/date_time/example/gregorian libs/date_time/example/local_time libs/date_time/example/posix_time libs/date_time/example/tutorial libs/date_time/test/posix_time libs/date_time/xmldoc libs/detail libs/filesystem libs/function libs/functional libs/fusion libs/geometry libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/example libs/geometry/test libs/graph/doc libs/graph/example libs/graph/test libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html libs/icl/doc/html/header/boost/icl libs/icl/test libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/io libs/io/doc libs/iostreams libs/iterator libs/locale libs/locale/src libs/math libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/math/test libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/parameter/doc/html libs/phoenix/doc libs/phoenix/doc/examples libs/pool libs/program_options libs/program_options/test libs/property_tree libs/python libs/range libs/regex libs/serialization libs/serialization/example libs/serialization/src libs/serialization/test libs/signals libs/signals2 libs/signals2/doc 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 status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/quickbook tools/regression tools/regression/src tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2011-11-13 01:11:01
Author: jewillco
Date: 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
New Revision: 75471
URL: http://svn.boost.org/trac/boost/changeset/75471
Log:
Merged change r75431 from trunk; refs #6112
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/concept_check.hpp (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/cregex.hpp (props changed)
branches/release/boost/cstdint.hpp (props changed)
branches/release/boost/current_function.hpp (props changed)
branches/release/boost/date_time/c_time.hpp (props changed)
branches/release/boost/date_time/date_formatting.hpp (props changed)
branches/release/boost/date_time/filetime_functions.hpp (props changed)
branches/release/boost/date_time/gregorian_calendar.ipp (props changed)
branches/release/boost/date_time/posix_time/time_serialize.hpp (props changed)
branches/release/boost/date_time/strings_from_facet.hpp (props changed)
branches/release/boost/date_time/time_facet.hpp (props changed)
branches/release/boost/date_time/tz_db_base.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/interlocked.hpp (props changed)
branches/release/boost/dynamic_bitset/dynamic_bitset.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/boost/function/ (props changed)
branches/release/boost/function/function_template.hpp (props changed)
branches/release/boost/functional/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/geometry/ (props changed)
branches/release/boost/geometry/algorithms/ (props changed)
branches/release/boost/geometry/arithmetic/ (props changed)
branches/release/boost/geometry/core/ (props changed)
branches/release/boost/geometry/domains/ (props changed)
branches/release/boost/geometry/geometries/ (props changed)
branches/release/boost/geometry/geometry.hpp (props changed)
branches/release/boost/geometry/iterators/ (props changed)
branches/release/boost/geometry/multi/ (props changed)
branches/release/boost/geometry/policies/ (props changed)
branches/release/boost/geometry/strategies/ (props changed)
branches/release/boost/geometry/util/ (props changed)
branches/release/boost/geometry/views/ (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/integer.hpp (props changed)
branches/release/boost/integer_fwd.hpp (props changed)
branches/release/boost/integer_traits.hpp (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/ (props changed)
branches/release/boost/iterator/iterator_facade.hpp (props changed)
branches/release/boost/locale/ (props changed)
branches/release/boost/locale.hpp (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math/special_functions/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/msm/active_state_switching_policies.hpp (props changed)
branches/release/boost/msm/back/ (props changed)
branches/release/boost/msm/back/args.hpp (props changed)
branches/release/boost/msm/back/bind_helpers.hpp (props changed)
branches/release/boost/msm/back/common_types.hpp (props changed)
branches/release/boost/msm/back/copy_policies.hpp (props changed)
branches/release/boost/msm/back/default_compile_policy.hpp (props changed)
branches/release/boost/msm/back/dispatch_table.hpp (props changed)
branches/release/boost/msm/back/favor_compile_time.hpp (props changed)
branches/release/boost/msm/back/fold_to_list.hpp (props changed)
branches/release/boost/msm/back/history_policies.hpp (props changed)
branches/release/boost/msm/back/metafunctions.hpp (props changed)
branches/release/boost/msm/back/mpl_graph_fsm_check.hpp (props changed)
branches/release/boost/msm/back/no_fsm_check.hpp (props changed)
branches/release/boost/msm/back/queue_container_circular.hpp (props changed)
branches/release/boost/msm/back/queue_container_deque.hpp (props changed)
branches/release/boost/msm/back/state_machine.hpp (props changed)
branches/release/boost/msm/back/tools.hpp (props changed)
branches/release/boost/msm/common.hpp (props changed)
branches/release/boost/msm/front/ (props changed)
branches/release/boost/msm/front/common_states.hpp (props changed)
branches/release/boost/msm/front/completion_event.hpp (props changed)
branches/release/boost/msm/front/detail/ (props changed)
branches/release/boost/msm/front/detail/common_states.hpp (props changed)
branches/release/boost/msm/front/detail/row2_helper.hpp (props changed)
branches/release/boost/msm/front/euml/ (props changed)
branches/release/boost/msm/front/euml/algorithm.hpp (props changed)
branches/release/boost/msm/front/euml/common.hpp (props changed)
branches/release/boost/msm/front/euml/container.hpp (props changed)
branches/release/boost/msm/front/euml/euml.hpp (props changed)
branches/release/boost/msm/front/euml/euml_typeof.hpp (props changed)
branches/release/boost/msm/front/euml/guard_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/iteration.hpp (props changed)
branches/release/boost/msm/front/euml/operator.hpp (props changed)
branches/release/boost/msm/front/euml/phoenix_placeholders.hpp (props changed)
branches/release/boost/msm/front/euml/querying.hpp (props changed)
branches/release/boost/msm/front/euml/state_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/stl.hpp (props changed)
branches/release/boost/msm/front/euml/stt_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/transformation.hpp (props changed)
branches/release/boost/msm/front/functor_row.hpp (props changed)
branches/release/boost/msm/front/internal_row.hpp (props changed)
branches/release/boost/msm/front/row2.hpp (props changed)
branches/release/boost/msm/front/state_machine_def.hpp (props changed)
branches/release/boost/msm/front/states.hpp (props changed)
branches/release/boost/msm/msm_grammar.hpp (props changed)
branches/release/boost/msm/proto_config.hpp (props changed)
branches/release/boost/msm/row_tags.hpp (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/program_options/detail/parsers.hpp (props changed)
branches/release/boost/program_options/parsers.hpp (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/regex.h (props changed)
branches/release/boost/regex.hpp (props changed)
branches/release/boost/regex_fwd.hpp (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/static_assert.hpp (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/timer.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/type_traits.hpp (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/boost/xpressive/ (props changed)
branches/release/boostcpp.jam (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/algorithm/string/ (props changed)
branches/release/libs/array/ (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/date_time/data/date_time_zonespec.csv (props changed)
branches/release/libs/date_time/example/gregorian/days_between_new_years.cpp (props changed)
branches/release/libs/date_time/example/gregorian/days_since_year_start.cpp (props changed)
branches/release/libs/date_time/example/gregorian/days_till_new_year.cpp (props changed)
branches/release/libs/date_time/example/gregorian/month_add.cpp (props changed)
branches/release/libs/date_time/example/local_time/flight.cpp (props changed)
branches/release/libs/date_time/example/local_time/local_date_time.cpp (props changed)
branches/release/libs/date_time/example/posix_time/print_hours.cpp (props changed)
branches/release/libs/date_time/example/posix_time/time_math.cpp (props changed)
branches/release/libs/date_time/example/tutorial/io_tutorial.cpp (props changed)
branches/release/libs/date_time/test/posix_time/testtime_facet.cpp (props changed)
branches/release/libs/date_time/test/posix_time/testtime_input_facet.cpp (props changed)
branches/release/libs/date_time/xmldoc/date_class.xml (props changed)
branches/release/libs/date_time/xmldoc/usage_examples.xml (props changed)
branches/release/libs/detail/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/function/ (props changed)
branches/release/libs/functional/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/geometry/ (props changed)
branches/release/libs/geometry/doc/ (props changed)
branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
branches/release/libs/geometry/doc/about_documentation.qbk (props changed)
branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
branches/release/libs/geometry/doc/concept/ (props changed)
branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
branches/release/libs/geometry/doc/doxy/ (props changed)
branches/release/libs/geometry/doc/generated/ (props changed)
branches/release/libs/geometry/doc/geometry.qbk (props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/imports.qbk (props changed)
branches/release/libs/geometry/doc/introduction.qbk (props changed)
branches/release/libs/geometry/doc/make_qbk.py (props changed)
branches/release/libs/geometry/doc/matrix.qbk (props changed)
branches/release/libs/geometry/doc/quickref.xml (props changed)
branches/release/libs/geometry/doc/quickstart.qbk (props changed)
branches/release/libs/geometry/doc/readme.txt (props changed)
branches/release/libs/geometry/doc/reference/ (props changed)
branches/release/libs/geometry/doc/reference.qbk (props changed)
branches/release/libs/geometry/doc/src/ (props changed)
branches/release/libs/geometry/example/ (props changed)
branches/release/libs/geometry/index.html (props changed)
branches/release/libs/geometry/test/ (props changed)
branches/release/libs/graph/doc/ (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/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/test/ (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/io/ (props changed)
branches/release/libs/io/doc/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/iterator/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/locale/ (props changed)
branches/release/libs/locale/src/ (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/math/doc/sf_and_dist/faq.qbk (props changed)
branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (props changed)
branches/release/libs/math/test/s_.ipp (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/parameter/doc/html/index.html (props changed)
branches/release/libs/phoenix/doc/basics.qbk (props changed)
branches/release/libs/phoenix/doc/examples/extending_actors.qbk (props changed)
branches/release/libs/phoenix/doc/organisation.qbk (props changed)
branches/release/libs/pool/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/program_options/test/parsers_test.cpp (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/serialization/ (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/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/signals2/doc/ (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/assert.html (props changed)
branches/release/libs/utility/assert_test.cpp (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/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/expected_results.xml (props changed)
branches/release/status/explicit-failures-markup.xml (props changed)
branches/release/status/explicit-failures.xsd (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/mpi.jam (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/quickbook/ (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/boost/graph/chrobak_payne_drawing.hpp | 2
branches/release/boost/graph/closeness_centrality.hpp | 2
branches/release/boost/graph/degree_centrality.hpp | 2
branches/release/boost/graph/detail/geodesic.hpp | 2
branches/release/boost/graph/geodesic_distance.hpp | 2
branches/release/boost/graph/is_kuratowski_subgraph.hpp | 10 +++---
branches/release/boost/graph/is_straight_line_drawing.hpp | 2
branches/release/boost/graph/make_maximal_planar.hpp | 4 +-
branches/release/boost/graph/planar_canonical_ordering.hpp | 2
branches/release/boost/graph/planar_face_traversal.hpp | 4 +-
branches/release/boost/graph/push_relabel_max_flow.hpp | 4 +-
branches/release/boost/graph/tiernan_all_cycles.hpp | 6 ++--
branches/release/boost/graph/write_dimacs.hpp | 2
branches/release/libs/graph/example/canonical_ordering.cpp | 2
branches/release/libs/graph/example/closeness_centrality.cpp | 2
branches/release/libs/graph/example/clustering_coefficient.cpp | 2
branches/release/libs/graph/example/degree_centrality.cpp | 2
branches/release/libs/graph/example/implicit_graph.cpp | 10 +++---
branches/release/libs/graph/example/inclusive_mean_geodesic.cpp | 2
branches/release/libs/graph/example/influence_prestige.cpp | 2
branches/release/libs/graph/example/kuratowski_subgraph.cpp | 2
branches/release/libs/graph/example/make_biconnected_planar.cpp | 4 +-
branches/release/libs/graph/example/make_maximal_planar.cpp | 6 ++--
branches/release/libs/graph/example/matching_example.cpp | 4 +-
branches/release/libs/graph/example/mean_geodesic.cpp | 2
branches/release/libs/graph/example/planar_face_traversal.cpp | 2
branches/release/libs/graph/example/scaled_closeness_centrality.cpp | 2
branches/release/libs/graph/example/straight_line_drawing.cpp | 2
branches/release/libs/graph/test/all_planar_input_files_test.cpp | 4 +-
branches/release/libs/graph/test/basic_planarity_test.cpp | 2
branches/release/libs/graph/test/bellman-test.cpp | 2
branches/release/libs/graph/test/isomorphism.cpp | 57 ++++++++++++++++++++++++++++++++++++++++
branches/release/libs/graph/test/labeled_graph.cpp | 2
branches/release/libs/graph/test/make_bicon_planar_test.cpp | 6 ++--
branches/release/libs/graph/test/make_connected_test.cpp | 4 +-
branches/release/libs/graph/test/make_maximal_planar_test.cpp | 6 ++--
branches/release/libs/graph/test/parallel_edges_loops_test.cpp | 6 ++--
branches/release/libs/graph/test/test_construction.hpp | 2
branches/release/libs/graph/test/transitive_closure_test2.cpp | 2
39 files changed, 120 insertions(+), 63 deletions(-)
Modified: branches/release/boost/graph/chrobak_payne_drawing.hpp
==============================================================================
--- branches/release/boost/graph/chrobak_payne_drawing.hpp (original)
+++ branches/release/boost/graph/chrobak_payne_drawing.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -240,7 +240,7 @@
(*ordering_begin,0,g,x,delta_x,left,right);
vertex_iterator_t vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
drawing[v].x = x[v];
Modified: branches/release/boost/graph/closeness_centrality.hpp
==============================================================================
--- branches/release/boost/graph/closeness_centrality.hpp (original)
+++ branches/release/boost/graph/closeness_centrality.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -126,7 +126,7 @@
typedef typename property_traits<CentralityMap>::value_type Centrality;
typename graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
DistanceMap dm = get(dist, *i);
Centrality c = closeness_centrality(g, dm, measure);
put(cent, *i, c);
Modified: branches/release/boost/graph/degree_centrality.hpp
==============================================================================
--- branches/release/boost/graph/degree_centrality.hpp (original)
+++ branches/release/boost/graph/degree_centrality.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -101,7 +101,7 @@
typedef typename property_traits<CentralityMap>::value_type Centrality;
VertexIterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
Centrality c = degree_centrality(g, *i, measure);
put(cent, *i, c);
}
Modified: branches/release/boost/graph/detail/geodesic.hpp
==============================================================================
--- branches/release/boost/graph/detail/geodesic.hpp (original)
+++ branches/release/boost/graph/detail/geodesic.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -65,7 +65,7 @@
// zero, so it shouldn't be too problematic.
Distance ret = init;
VertexIterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
Vertex v = *i;
if(get(dist, v) != DistanceNumbers::infinity()) {
ret = combine(ret, get(dist, v));
Modified: branches/release/boost/graph/geodesic_distance.hpp
==============================================================================
--- branches/release/boost/graph/geodesic_distance.hpp (original)
+++ branches/release/boost/graph/geodesic_distance.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -156,7 +156,7 @@
Result inf = numeric_values<Result>::infinity();
Result sum = numeric_values<Result>::zero();
VertexIterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
DistanceMap dm = get(dist, *i);
Result r = mean_geodesic(g, dm, measure);
put(geo, *i, r);
Modified: branches/release/boost/graph/is_kuratowski_subgraph.hpp
==============================================================================
--- branches/release/boost/graph/is_kuratowski_subgraph.hpp (original)
+++ branches/release/boost/graph/is_kuratowski_subgraph.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -33,7 +33,7 @@
{
typename graph_traits<Graph>::vertex_iterator vi, vi_end, inner_vi;
Graph K_5(5);
- for(tie(vi,vi_end) = vertices(K_5); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(K_5); vi != vi_end; ++vi)
for(inner_vi = next(vi); inner_vi != vi_end; ++inner_vi)
add_edge(*vi, *inner_vi, K_5);
return K_5;
@@ -47,7 +47,7 @@
vi, vi_end, bipartition_start, inner_vi;
Graph K_3_3(6);
bipartition_start = next(next(next(vertices(K_3_3).first)));
- for(tie(vi, vi_end) = vertices(K_3_3); vi != bipartition_start; ++vi)
+ for(boost::tie(vi, vi_end) = vertices(K_3_3); vi != bipartition_start; ++vi)
for(inner_vi= bipartition_start; inner_vi != vi_end; ++inner_vi)
add_edge(*vi, *inner_vi, K_3_3);
return K_3_3;
@@ -158,7 +158,7 @@
{
vertex_iterator_t vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
@@ -242,7 +242,7 @@
if (max_size == 3)
{
// check to see whether we should go on to find a K_5
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
if (neighbors[*vi].size() == 4)
{
target_graph = detail::tg_k_5;
@@ -261,7 +261,7 @@
v_list_t main_vertices;
vertex_iterator_t vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
if (!neighbors[*vi].empty())
main_vertices.push_back(*vi);
Modified: branches/release/boost/graph/is_straight_line_drawing.hpp
==============================================================================
--- branches/release/boost/graph/is_straight_line_drawing.hpp (original)
+++ branches/release/boost/graph/is_straight_line_drawing.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -126,7 +126,7 @@
active_map_t active_edges;
edge_iterator_t ei, ei_end;
- for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
{
edge_t e(*ei);
vertex_t s(source(e,g));
Modified: branches/release/boost/graph/make_maximal_planar.hpp
==============================================================================
--- branches/release/boost/graph/make_maximal_planar.hpp (original)
+++ branches/release/boost/graph/make_maximal_planar.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -62,7 +62,7 @@
degree(degree_vector.begin(), vm)
{
vertex_iterator_t vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(degree, *vi, out_degree(*vi, g));
}
@@ -117,7 +117,7 @@
// Mark all of the min degree vertex's neighbors
adjacency_iterator_t ai, ai_end;
- for(tie(ai,ai_end) = adjacent_vertices(vertices_on_face.front(),g);
+ for(boost::tie(ai,ai_end) = adjacent_vertices(vertices_on_face.front(),g);
ai != ai_end; ++ai
)
{
Modified: branches/release/boost/graph/planar_canonical_ordering.hpp
==============================================================================
--- branches/release/boost/graph/planar_canonical_ordering.hpp (original)
+++ branches/release/boost/graph/planar_canonical_ordering.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -67,7 +67,7 @@
vertex_t first_vertex = *vertices(g).first;
vertex_t second_vertex;
adjacency_iterator_t ai, ai_end;
- for(tie(ai,ai_end) = adjacent_vertices(first_vertex,g); ai != ai_end; ++ai)
+ for(boost::tie(ai,ai_end) = adjacent_vertices(first_vertex,g); ai != ai_end; ++ai)
{
if (*ai == first_vertex)
continue;
Modified: branches/release/boost/graph/planar_face_traversal.hpp
==============================================================================
--- branches/release/boost/graph/planar_face_traversal.hpp (original)
+++ branches/release/boost/graph/planar_face_traversal.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -98,7 +98,7 @@
// PlanarEmbedding so that get(next_edge, e)[v] is the edge that comes
// after e in the clockwise embedding around vertex v.
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
pi_begin = embedding[v].begin();
@@ -122,7 +122,7 @@
std::vector<edge_t> edges_cache;
std::vector<vertex_t> vertices_in_edge;
- for(tie(fi,fi_end) = edges(g); fi != fi_end; ++fi)
+ for(boost::tie(fi,fi_end) = edges(g); fi != fi_end; ++fi)
{
edge_t e(*fi);
edges_cache.push_back(e);
Modified: branches/release/boost/graph/push_relabel_max_flow.hpp
==============================================================================
--- branches/release/boost/graph/push_relabel_max_flow.hpp (original)
+++ branches/release/boost/graph/push_relabel_max_flow.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -550,8 +550,8 @@
}
// do the bottom
u = bos;
- ai = out_edges(u, g).first;
- while (get(excess_flow, u) > 0) {
+ boost::tie(ai, a_end) = out_edges(u, g);
+ while (get(excess_flow, u) > 0 && ai != a_end) {
if (get(capacity, *ai) == 0 && is_residual_edge(*ai))
push_flow(*ai);
++ai;
Modified: branches/release/boost/graph/tiernan_all_cycles.hpp
==============================================================================
--- branches/release/boost/graph/tiernan_all_cycles.hpp (original)
+++ branches/release/boost/graph/tiernan_all_cycles.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -193,7 +193,7 @@
u = p.back(),
v = p.front();
OutIterator i, end;
- for(tie(i, end) = out_edges(u, g); i != end; ++i) {
+ for(boost::tie(i, end) = out_edges(u, g); i != end; ++i) {
if((target(*i, g) == v)) {
return true;
}
@@ -220,7 +220,7 @@
// AdjacencyIterator i, end;
OutIterator i, end;
- for(tie(i, end) = out_edges(u, g); i != end; ++i) {
+ for(boost::tie(i, end) = out_edges(u, g); i != end; ++i) {
Vertex v = target(*i, g);
// if we can actually extend along this edge,
@@ -324,7 +324,7 @@
typedef typename graph_traits<Graph>::vertex_iterator VertexIterator;
VertexIterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
detail::all_cycles_from_vertex(g, *i, vis, minlen, maxlen);
}
}
Modified: branches/release/boost/graph/write_dimacs.hpp
==============================================================================
--- branches/release/boost/graph/write_dimacs.hpp (original)
+++ branches/release/boost/graph/write_dimacs.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -64,7 +64,7 @@
//output the edges
edge_iterator ei, e_end;
- for(tie(ei,e_end) = edges(g); ei!=e_end; ++ei){
+ for(boost::tie(ei,e_end) = edges(g); ei!=e_end; ++ei){
out << "a " << idx[ source(*ei, g) ] + 1 << " " << idx[ target(*ei, g) ] + 1 << " " << get(capacity,*ei) << std::endl;
}
}
Modified: branches/release/libs/graph/example/canonical_ordering.cpp
==============================================================================
--- branches/release/libs/graph/example/canonical_ordering.cpp (original)
+++ branches/release/libs/graph/example/canonical_ordering.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -54,7 +54,7 @@
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
graph_traits<graph>::edges_size_type edge_count = 0;
graph_traits<graph>::edge_iterator ei, ei_end;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
Modified: branches/release/libs/graph/example/closeness_centrality.cpp
==============================================================================
--- branches/release/libs/graph/example/closeness_centrality.cpp (original)
+++ branches/release/libs/graph/example/closeness_centrality.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -75,7 +75,7 @@
// Print the closeness centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
Modified: branches/release/libs/graph/example/clustering_coefficient.cpp
==============================================================================
--- branches/release/libs/graph/example/clustering_coefficient.cpp (original)
+++ branches/release/libs/graph/example/clustering_coefficient.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -58,7 +58,7 @@
// Print the clustering coefficient of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
Modified: branches/release/libs/graph/example/degree_centrality.cpp
==============================================================================
--- branches/release/libs/graph/example/degree_centrality.cpp (original)
+++ branches/release/libs/graph/example/degree_centrality.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -57,7 +57,7 @@
// Print the degree centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setiosflags(ios::left) << setw(12)
<< g[*i].name << cm[*i] << endl;
}
Modified: branches/release/libs/graph/example/implicit_graph.cpp
==============================================================================
--- branches/release/libs/graph/example/implicit_graph.cpp (original)
+++ branches/release/libs/graph/example/implicit_graph.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -473,18 +473,18 @@
// 5 vertices
std::cout << "Vertices, outgoing edges, and adjacent vertices" << std::endl;
vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; vi++) {
+ for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; vi++) {
vertex_descriptor u = *vi;
std::cout << "Vertex " << u << ": ";
// Adjacenct edges
out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ei++)
+ for (boost::tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ei++)
std::cout << *ei << " ";
std::cout << " Adjacent vertices ";
// Adjacent vertices
// Here we want our adjacency_iterator and not boost::adjacency_iterator.
::adjacency_iterator ai, ai_end;
- for (tie(ai, ai_end) = adjacent_vertices(u, g); ai != ai_end; ai++) {
+ for (boost::tie(ai, ai_end) = adjacent_vertices(u, g); ai != ai_end; ai++) {
std::cout << *ai << " ";
}
std::cout << std::endl;
@@ -503,7 +503,7 @@
// 5 edges
std::cout << "Edges and weights" << std::endl;
edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ei++) {
+ for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ei++) {
edge_descriptor e = *ei;
std::cout << e << " weight " << get(edge_weight, g, e) << std::endl;
}
@@ -528,7 +528,7 @@
distance_map(&dist[0]) );
std::cout << "Dijkstra search from vertex " << source << std::endl;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
+ for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
vertex_descriptor u = *vi;
std::cout << "Vertex " << u << ": "
<< "parent "<< pred[*vi] << ", "
Modified: branches/release/libs/graph/example/inclusive_mean_geodesic.cpp
==============================================================================
--- branches/release/libs/graph/example/inclusive_mean_geodesic.cpp (original)
+++ branches/release/libs/graph/example/inclusive_mean_geodesic.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -121,7 +121,7 @@
cout << setw(12) << setiosflags(ios::left) << "excluding";
cout << setw(12) << setiosflags(ios::left) << "including" << endl;
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setw(12) << setiosflags(ios::left)
<< g[*i].name
<< setw(12) << get(exmap, *i)
Modified: branches/release/libs/graph/example/influence_prestige.cpp
==============================================================================
--- branches/release/libs/graph/example/influence_prestige.cpp (original)
+++ branches/release/libs/graph/example/influence_prestige.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -62,7 +62,7 @@
// Print the degree centrality of each vertex
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
Vertex v = *i;
cout << setiosflags(ios::left) << setw(12)
<< g[v].name << "\t"
Modified: branches/release/libs/graph/example/kuratowski_subgraph.cpp
==============================================================================
--- branches/release/libs/graph/example/kuratowski_subgraph.cpp (original)
+++ branches/release/libs/graph/example/kuratowski_subgraph.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -55,7 +55,7 @@
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
graph_traits<graph>::edges_size_type edge_count = 0;
graph_traits<graph>::edge_iterator ei, ei_end;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
Modified: branches/release/libs/graph/example/make_biconnected_planar.cpp
==============================================================================
--- branches/release/libs/graph/example/make_biconnected_planar.cpp (original)
+++ branches/release/libs/graph/example/make_biconnected_planar.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -51,7 +51,7 @@
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
graph_traits<graph>::edges_size_type edge_count = 0;
graph_traits<graph>::edge_iterator ei, ei_end;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
@@ -86,7 +86,7 @@
// Re-initialize the edge index, since we just added a few edges
edge_count = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
// Re-size the storage for the biconnected components, since we
Modified: branches/release/libs/graph/example/make_maximal_planar.cpp
==============================================================================
--- branches/release/libs/graph/example/make_maximal_planar.cpp (original)
+++ branches/release/libs/graph/example/make_maximal_planar.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -74,7 +74,7 @@
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
graph_traits<graph>::edges_size_type edge_count = 0;
graph_traits<graph>::edge_iterator ei, ei_end;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
@@ -94,7 +94,7 @@
// Re-initialize the edge index, since we just added a few edges
edge_count = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
@@ -116,7 +116,7 @@
// Re-initialize the edge index, since we just added a few edges
edge_count = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
// Test for planarity one final time; compute the planar embedding as a
Modified: branches/release/libs/graph/example/matching_example.cpp
==============================================================================
--- branches/release/libs/graph/example/matching_example.cpp (original)
+++ branches/release/libs/graph/example/matching_example.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -83,7 +83,7 @@
std::cout << "The matching is:" << std::endl;
graph_traits<my_graph>::vertex_iterator vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
if (mate[*vi] != graph_traits<my_graph>::null_vertex() && *vi < mate[*vi])
std::cout << "{" << *vi << ", " << mate[*vi] << "}" << std::endl;
@@ -109,7 +109,7 @@
std::cout << "The matching is:" << std::endl;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
if (mate[*vi] != graph_traits<my_graph>::null_vertex() && *vi < mate[*vi])
std::cout << "{" << *vi << ", " << mate[*vi] << "}" << std::endl;
Modified: branches/release/libs/graph/example/mean_geodesic.cpp
==============================================================================
--- branches/release/libs/graph/example/mean_geodesic.cpp (original)
+++ branches/release/libs/graph/example/mean_geodesic.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -77,7 +77,7 @@
// Print the mean geodesic distance of each vertex and finally,
// the graph itself.
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(gm, *i) << endl;
}
Modified: branches/release/libs/graph/example/planar_face_traversal.cpp
==============================================================================
--- branches/release/libs/graph/example/planar_face_traversal.cpp (original)
+++ branches/release/libs/graph/example/planar_face_traversal.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -94,7 +94,7 @@
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
graph_traits<graph>::edges_size_type edge_count = 0;
graph_traits<graph>::edge_iterator ei, ei_end;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
Modified: branches/release/libs/graph/example/scaled_closeness_centrality.cpp
==============================================================================
--- branches/release/libs/graph/example/scaled_closeness_centrality.cpp (original)
+++ branches/release/libs/graph/example/scaled_closeness_centrality.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -104,7 +104,7 @@
// Print the scaled closeness centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
- for(tie(i, end) = vertices(g); i != end; ++i) {
+ for(boost::tie(i, end) = vertices(g); i != end; ++i) {
cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
Modified: branches/release/libs/graph/example/straight_line_drawing.cpp
==============================================================================
--- branches/release/libs/graph/example/straight_line_drawing.cpp (original)
+++ branches/release/libs/graph/example/straight_line_drawing.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -122,7 +122,7 @@
std::cout << "The straight line drawing is: " << std::endl;
graph_traits<graph>::vertex_iterator vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
coord_t coord(get(straight_line_drawing,*vi));
std::cout << *vi << " -> (" << coord.x << ", " << coord.y << ")"
Modified: branches/release/libs/graph/test/all_planar_input_files_test.cpp
==============================================================================
--- branches/release/libs/graph/test/all_planar_input_files_test.cpp (original)
+++ branches/release/libs/graph/test/all_planar_input_files_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -137,7 +137,7 @@
// Initialize the interior edge index
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
e_size_t edge_count = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
// Initialize the interior vertex index - not needed if the vertices
@@ -145,7 +145,7 @@
/*
property_map<graph, vertex_index_t>::type v_index = get(vertex_index, g);
v_size_t vertex_count = 0;
- for(tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
put(v_index, *vi, vertex_count++);
*/
Modified: branches/release/libs/graph/test/basic_planarity_test.cpp
==============================================================================
--- branches/release/libs/graph/test/basic_planarity_test.cpp (original)
+++ branches/release/libs/graph/test/basic_planarity_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -25,7 +25,7 @@
typename property_map<Graph, vertex_index_t>::type index = get(vertex_index, g);
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
typename graph_traits<Graph>::vertices_size_type cnt = 0;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(index, *vi, cnt++);
}
};
Modified: branches/release/libs/graph/test/bellman-test.cpp
==============================================================================
--- branches/release/libs/graph/test/bellman-test.cpp (original)
+++ branches/release/libs/graph/test/bellman-test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -42,7 +42,7 @@
weight_pmap = get(edge_weight, g);
int i = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei, ++i)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei, ++i)
weight_pmap[*ei] = weight[i];
std::vector<int> parent(numVertex);
Modified: branches/release/libs/graph/test/isomorphism.cpp
==============================================================================
--- branches/release/libs/graph/test/isomorphism.cpp (original)
+++ branches/release/libs/graph/test/isomorphism.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -93,6 +93,63 @@
}
}
+void test_isomorphism2()
+{
+ typedef adjacency_list<vecS, vecS, bidirectionalS> graph1;
+ typedef adjacency_list<listS, listS, bidirectionalS,
+ property<vertex_index_t, int> > graph2;
+
+ graph1 g1(2);
+ add_edge(vertex(0, g1), vertex(1, g1), g1);
+ add_edge(vertex(1, g1), vertex(1, g1), g1);
+ graph2 g2;
+ randomly_permute_graph(g1, g2);
+
+ int v_idx = 0;
+ for (graph2::vertex_iterator v = vertices(g2).first;
+ v != vertices(g2).second; ++v) {
+ put(vertex_index_t(), g2, *v, v_idx++);
+ }
+
+ std::map<graph1::vertex_descriptor, graph2::vertex_descriptor> mapping;
+
+ bool isomorphism_correct;
+ clock_t start = clock();
+ BOOST_CHECK(isomorphism_correct = isomorphism
+ (g1, g2, isomorphism_map(make_assoc_property_map(mapping))));
+ clock_t end = clock();
+
+ std::cout << "Elapsed time (clock cycles): " << (end - start) << std::endl;
+
+ bool verify_correct;
+ BOOST_CHECK(verify_correct =
+ verify_isomorphism(g1, g2, make_assoc_property_map(mapping)));
+
+ if (!isomorphism_correct || !verify_correct) {
+ // Output graph 1
+ {
+ std::ofstream out("isomorphism_failure.bg1");
+ out << num_vertices(g1) << std::endl;
+ for (graph1::edge_iterator e = edges(g1).first;
+ e != edges(g1).second; ++e) {
+ out << get(vertex_index_t(), g1, source(*e, g1)) << ' '
+ << get(vertex_index_t(), g1, target(*e, g1)) << std::endl;
+ }
+ }
+
+ // Output graph 2
+ {
+ std::ofstream out("isomorphism_failure.bg2");
+ out << num_vertices(g2) << std::endl;
+ for (graph2::edge_iterator e = edges(g2).first;
+ e != edges(g2).second; ++e) {
+ out << get(vertex_index_t(), g2, source(*e, g2)) << ' '
+ << get(vertex_index_t(), g2, target(*e, g2)) << std::endl;
+ }
+ }
+ }
+}
+
void test_isomorphism(int n, double edge_probability)
{
typedef adjacency_list<vecS, vecS, bidirectionalS> graph1;
Modified: branches/release/libs/graph/test/labeled_graph.cpp
==============================================================================
--- branches/release/libs/graph/test/labeled_graph.cpp (original)
+++ branches/release/libs/graph/test/labeled_graph.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -62,7 +62,7 @@
typedef typename graph_traits<Graph>::vertex_iterator Iter;
Iter f, l;
int x = 0;
- for(tie(f, l) = vertices(g); f != l; ++f, ++x) {
+ for(boost::tie(f, l) = vertices(g); f != l; ++f, ++x) {
label_vertex(*f, x, g);
}
}
Modified: branches/release/libs/graph/test/make_bicon_planar_test.cpp
==============================================================================
--- branches/release/libs/graph/test/make_bicon_planar_test.cpp (original)
+++ branches/release/libs/graph/test/make_bicon_planar_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -25,7 +25,7 @@
typename property_map<Graph, edge_index_t>::type index = get(edge_index, g);
typename graph_traits<Graph>::edge_iterator ei, ei_end;
typename graph_traits<Graph>::edges_size_type cnt = 0;
- for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
put(index, *ei, cnt++);
}
@@ -54,7 +54,7 @@
typename property_map<Graph, vertex_index_t>::type index = get(vertex_index, g);
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
typename graph_traits<Graph>::vertices_size_type cnt = 0;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(index, *vi, cnt++);
}
};
@@ -87,7 +87,7 @@
embedding_t embedding(embedding_storage.begin(), get(vertex_index, g));
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
std::copy(out_edges(*vi,g).first, out_edges(*vi,g).second, std::back_inserter(embedding[*vi]));
BOOST_CHECK(biconnected_components(g, make_vector_property_map<int>(get(edge_index,g))) > 1);
Modified: branches/release/libs/graph/test/make_connected_test.cpp
==============================================================================
--- branches/release/libs/graph/test/make_connected_test.cpp (original)
+++ branches/release/libs/graph/test/make_connected_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -24,7 +24,7 @@
typename property_map<Graph, edge_index_t>::type index = get(edge_index, g);
typename graph_traits<Graph>::edge_iterator ei, ei_end;
typename graph_traits<Graph>::edges_size_type cnt = 0;
- for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
put(index, *ei, cnt++);
}
@@ -36,7 +36,7 @@
typename property_map<Graph, vertex_index_t>::type index = get(vertex_index, g);
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
typename graph_traits<Graph>::vertices_size_type cnt = 0;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(index, *vi, cnt++);
}
Modified: branches/release/libs/graph/test/make_maximal_planar_test.cpp
==============================================================================
--- branches/release/libs/graph/test/make_maximal_planar_test.cpp (original)
+++ branches/release/libs/graph/test/make_maximal_planar_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -24,7 +24,7 @@
typename property_map<Graph, edge_index_t>::type index = get(edge_index, g);
typename graph_traits<Graph>::edge_iterator ei, ei_end;
typename graph_traits<Graph>::edges_size_type cnt = 0;
- for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
put(index, *ei, cnt++);
}
@@ -56,7 +56,7 @@
typename property_map<Graph, vertex_index_t>::type index = get(vertex_index, g);
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
typename graph_traits<Graph>::vertices_size_type cnt = 0;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(index, *vi, cnt++);
}
};
@@ -89,7 +89,7 @@
embedding_t embedding(embedding_storage.begin(), get(vertex_index, g));
typename graph_traits<Graph>::vertex_iterator vi, vi_end;
- for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
std::copy(out_edges(*vi,g).first, out_edges(*vi,g).second, std::back_inserter(embedding[*vi]));
BOOST_CHECK(boyer_myrvold_planarity_test(g));
Modified: branches/release/libs/graph/test/parallel_edges_loops_test.cpp
==============================================================================
--- branches/release/libs/graph/test/parallel_edges_loops_test.cpp (original)
+++ branches/release/libs/graph/test/parallel_edges_loops_test.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -111,7 +111,7 @@
vertex_iterator_t vi, vi_end;
long count = 0;
long mult_count = 0;
- for(tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
{
if (count % vertex_stride == 0)
{
@@ -210,7 +210,7 @@
// Initialize the interior edge index
property_map<graph, edge_index_t>::type e_index = get(edge_index, g);
e_size_t edge_count = 0;
- for(tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+ for(boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
put(e_index, *ei, edge_count++);
// Initialize the interior vertex index - not needed if the vertices
@@ -218,7 +218,7 @@
/*
property_map<graph, vertex_index_t>::type v_index = get(vertex_index, g);
v_size_t vertex_count = 0;
- for(tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
+ for(boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
put(v_index, *vi, vertex_count++);
*/
Modified: branches/release/libs/graph/test/test_construction.hpp
==============================================================================
--- branches/release/libs/graph/test/test_construction.hpp (original)
+++ branches/release/libs/graph/test/test_construction.hpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -93,7 +93,7 @@
std::cout << "...connect_normal\n";
Pair *f, *l;
- for(tie(f, l) = edge_pairs(); f != l; ++f) {
+ for(boost::tie(f, l) = edge_pairs(); f != l; ++f) {
Pair const& e = *f;
add_edge(verts[e.first], verts[e.second], g);
}
Modified: branches/release/libs/graph/test/transitive_closure_test2.cpp
==============================================================================
--- branches/release/libs/graph/test/transitive_closure_test2.cpp (original)
+++ branches/release/libs/graph/test/transitive_closure_test2.cpp 2011-11-13 01:10:55 EST (Sun, 13 Nov 2011)
@@ -29,7 +29,7 @@
<< endl;
cout << "transitive closure: ";
graph_t::edge_iterator i,iend;
- for(tie(i,iend) = edges(g_TC);i!=iend;++i) {
+ for(boost::tie(i,iend) = edges(g_TC);i!=iend;++i) {
cout << source(*i,g_TC) << "->" << target(*i,g_TC) << " ";
}
cout << endl;