Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,13 @@ target_link_libraries(boost_graph
Boost::concept_check
Boost::config
Boost::container_hash
Boost::conversion
Boost::core
Boost::detail
Boost::foreach
Boost::function
Boost::integer
Boost::iterator
Boost::lexical_cast
Boost::math
Boost::move
Boost::mpl
Boost::multi_index
Boost::multiprecision
Expand All @@ -52,7 +49,6 @@ target_link_libraries(boost_graph
Boost::tti
Boost::tuple
Boost::type_traits
Boost::typeof
Boost::unordered
Boost::utility
Boost::xpressive
Expand Down
5 changes: 0 additions & 5 deletions build.jam
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,16 @@ constant boost_dependencies :
/boost/array//boost_array
/boost/assert//boost_assert
/boost/bimap//boost_bimap
/boost/bind//boost_bind
/boost/concept_check//boost_concept_check
/boost/config//boost_config
/boost/container_hash//boost_container_hash
/boost/conversion//boost_conversion
/boost/core//boost_core
/boost/detail//boost_detail
/boost/foreach//boost_foreach
/boost/function//boost_function
/boost/integer//boost_integer
/boost/iterator//boost_iterator
/boost/lexical_cast//boost_lexical_cast
/boost/math//boost_math_tr1
/boost/move//boost_move
/boost/mpl//boost_mpl
/boost/multi_index//boost_multi_index
/boost/multiprecision//boost_multiprecision
Expand All @@ -42,7 +38,6 @@ constant boost_dependencies :
/boost/tti//boost_tti
/boost/tuple//boost_tuple
/boost/type_traits//boost_type_traits
/boost/typeof//boost_typeof
/boost/unordered//boost_unordered
/boost/utility//boost_utility
/boost/xpressive//boost_xpressive ;
Expand Down
1 change: 0 additions & 1 deletion include/boost/graph/buffer_concepts.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#define BOOST_GRAPH_BUFFER_CONCEPTS_HPP 1
#include <boost/concept_check.hpp>
#include <boost/property_map/property_map.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/remove_reference.hpp>
Expand Down
5 changes: 2 additions & 3 deletions include/boost/graph/depth_first_search.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/detail/mpi_include.hpp>
#include <boost/ref.hpp>
#include <boost/implicit_cast.hpp>
#include <boost/optional.hpp>
#include <boost/parameter.hpp>
#include <boost/concept/assert.hpp>
Expand Down Expand Up @@ -275,7 +274,7 @@ void depth_first_search(const VertexListGraph& g, DFSVisitor vis,
typename graph_traits< VertexListGraph >::vertex_iterator ui, ui_end;
for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui)
{
Vertex u = implicit_cast< Vertex >(*ui);
Vertex u = *ui;
put(color, u, Color::white());
vis.initialize_vertex(u, g);
}
Expand All @@ -289,7 +288,7 @@ void depth_first_search(const VertexListGraph& g, DFSVisitor vis,

for (boost::tie(ui, ui_end) = vertices(g); ui != ui_end; ++ui)
{
Vertex u = implicit_cast< Vertex >(*ui);
Vertex u = *ui;
ColorValue u_color = get(color, u);
if (u_color == Color::white())
{
Expand Down
5 changes: 2 additions & 3 deletions include/boost/graph/graphviz.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <boost/static_assert.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/xpressive/xpressive_static.hpp>
#include <boost/foreach.hpp>

namespace boost
{
Expand Down Expand Up @@ -843,13 +842,13 @@ namespace detail
edge_permutation_from_sorting[temp[e]] = e;
}
typedef boost::tuple< id_t, bgl_vertex_t, id_t > v_prop;
BOOST_FOREACH (const v_prop& t, vertex_props)
for (const v_prop& t : vertex_props)
{
put(boost::get< 0 >(t), dp_, boost::get< 1 >(t),
boost::get< 2 >(t));
}
typedef boost::tuple< id_t, bgl_edge_t, id_t > e_prop;
BOOST_FOREACH (const e_prop& t, edge_props)
for (const e_prop& t : edge_props)
{
put(boost::get< 0 >(t), dp_,
edge_permutation_from_sorting[boost::get< 1 >(t)],
Expand Down
43 changes: 21 additions & 22 deletions include/boost/graph/hawick_circuits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@

#include <algorithm>
#include <boost/assert.hpp>
#include <boost/foreach.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/one_bit_color_map.hpp>
#include <boost/graph/properties.hpp>
#include <boost/move/utility.hpp>
#include <boost/property_map/property_map.hpp>
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
#include <boost/range/iterator.hpp>
#include <boost/range/iterator_range.hpp>
#include <boost/tuple/tuple.hpp> // for boost::tie
#include <boost/type_traits/remove_reference.hpp>
#include <boost/utility/result_of.hpp>
Expand Down Expand Up @@ -48,11 +47,11 @@ namespace hawick_circuits_detail

template < typename Vertex, typename Graph >
typename result< get_all_adjacent_vertices(
BOOST_FWD_REF(Vertex), BOOST_FWD_REF(Graph)) >::type
operator()(BOOST_FWD_REF(Vertex) v, BOOST_FWD_REF(Graph) g) const
Vertex&&, Graph&&) >::type
operator()(Vertex&& v, Graph&& g) const
{
return adjacent_vertices(
boost::forward< Vertex >(v), boost::forward< Graph >(g));
std::forward< Vertex >(v), std::forward< Graph >(g));
}
};

Expand Down Expand Up @@ -134,7 +133,7 @@ namespace hawick_circuits_detail
// documented above.
bool blocked_map_starts_all_unblocked() const
{
BOOST_FOREACH (Vertex v, vertices(graph_))
for (Vertex v : boost::make_iterator_range(vertices(graph_)))
if (is_blocked(v))
return false;
return true;
Expand All @@ -144,7 +143,7 @@ namespace hawick_circuits_detail
// sharing data structures between iterations does not break the code.
bool all_closed_rows_are_empty() const
{
BOOST_FOREACH (typename ClosedMatrix::reference row, closed_)
for (typename ClosedMatrix::reference row : closed_)
if (!row.empty())
return false;
return true;
Expand Down Expand Up @@ -347,34 +346,34 @@ namespace hawick_circuits_detail

template < typename GetAdjacentVertices, typename Graph, typename Visitor >
void call_hawick_circuits(
Graph const& graph, BOOST_FWD_REF(Visitor) visitor,
Graph const& graph, Visitor&& visitor,
unsigned int max_length)
{
call_hawick_circuits< GetAdjacentVertices >(graph,
boost::forward< Visitor >(visitor), get(vertex_index, graph),
std::forward< Visitor >(visitor), get(vertex_index, graph),
max_length);
}
} // end namespace hawick_circuits_detail

//! Enumerate all the elementary circuits in a directed multigraph.
template < typename Graph, typename Visitor, typename VertexIndexMap >
void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
void hawick_circuits(Graph&& graph, Visitor&& visitor,
VertexIndexMap&& vertex_index_map,
unsigned int max_length = 0)
{
hawick_circuits_detail::call_hawick_circuits<
hawick_circuits_detail::get_all_adjacent_vertices >(
boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
boost::forward< VertexIndexMap >(vertex_index_map), max_length);
std::forward< Graph >(graph), std::forward< Visitor >(visitor),
std::forward< VertexIndexMap >(vertex_index_map), max_length);
}

template < typename Graph, typename Visitor >
void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
void hawick_circuits(Graph&& graph, Visitor&& visitor,
unsigned int max_length = 0)
{
hawick_circuits_detail::call_hawick_circuits<
hawick_circuits_detail::get_all_adjacent_vertices >(
boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
std::forward< Graph >(graph), std::forward< Visitor >(visitor),
max_length);
}

Expand All @@ -383,25 +382,25 @@ void hawick_circuits(BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
* edges will not be considered. Each circuit will be considered only once.
*/
template < typename Graph, typename Visitor, typename VertexIndexMap >
void hawick_unique_circuits(BOOST_FWD_REF(Graph) graph,
BOOST_FWD_REF(Visitor) visitor,
BOOST_FWD_REF(VertexIndexMap) vertex_index_map,
void hawick_unique_circuits(Graph&& graph,
Visitor&& visitor,
VertexIndexMap&& vertex_index_map,
unsigned int max_length = 0)
{
hawick_circuits_detail::call_hawick_circuits<
hawick_circuits_detail::get_unique_adjacent_vertices >(
boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
boost::forward< VertexIndexMap >(vertex_index_map), max_length);
std::forward< Graph >(graph), std::forward< Visitor >(visitor),
std::forward< VertexIndexMap >(vertex_index_map), max_length);
}

template < typename Graph, typename Visitor >
void hawick_unique_circuits(
BOOST_FWD_REF(Graph) graph, BOOST_FWD_REF(Visitor) visitor,
Graph&& graph, Visitor&& visitor,
unsigned int max_length = 0)
{
hawick_circuits_detail::call_hawick_circuits<
hawick_circuits_detail::get_unique_adjacent_vertices >(
boost::forward< Graph >(graph), boost::forward< Visitor >(visitor),
std::forward< Graph >(graph), std::forward< Visitor >(visitor),
max_length);
}
} // end namespace boost
Expand Down
1 change: 0 additions & 1 deletion include/boost/graph/is_straight_line_drawing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/planar_detail/bucket_sort.hpp>
#include <boost/multiprecision/cpp_int.hpp>
#include <boost/numeric/conversion/cast.hpp>

#include <algorithm>
#include <vector>
Expand Down
19 changes: 9 additions & 10 deletions src/graphml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// Tiago de Paula Peixoto

#define BOOST_GRAPH_SOURCE
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/throw_exception.hpp>
#include <boost/graph/graphml.hpp>
Expand Down Expand Up @@ -44,7 +43,7 @@ class graphml_reader
using boost::property_tree::ptree;
size_t current_idx = 0;
bool is_first = is_root;
BOOST_FOREACH (const ptree::value_type& n, top)
for (const ptree::value_type& n : top)
{
if (n.first == "graph")
{
Expand All @@ -54,7 +53,7 @@ class graphml_reader
if (is_first)
{
is_first = false;
BOOST_FOREACH (const ptree::value_type& attr, n.second)
for (const ptree::value_type& attr : n.second)
{
if (attr.first != "data")
continue;
Expand Down Expand Up @@ -83,7 +82,7 @@ class graphml_reader
| boost::property_tree::xml_parser::trim_whitespace);
ptree gml = pt.get_child(path("graphml"));
// Search for attributes
BOOST_FOREACH (const ptree::value_type& child, gml)
for (const ptree::value_type& child : gml)
{
if (child.first != "key")
continue;
Expand Down Expand Up @@ -127,17 +126,17 @@ class graphml_reader
std::vector< const ptree* > graphs;
handle_graph();
get_graphs(gml, desired_idx, true, graphs);
BOOST_FOREACH (const ptree* gr, graphs)
for (const ptree* gr : graphs)
{
// Search for nodes
BOOST_FOREACH (const ptree::value_type& node, *gr)
for (const ptree::value_type& node : *gr)
{
if (node.first != "node")
continue;
std::string id
= node.second.get< std::string >(path("<xmlattr>/id"));
handle_vertex(id);
BOOST_FOREACH (const ptree::value_type& attr, node.second)
for (const ptree::value_type& attr : node.second)
{
if (attr.first != "data")
continue;
Expand All @@ -148,13 +147,13 @@ class graphml_reader
}
}
}
BOOST_FOREACH (const ptree* gr, graphs)
for (const ptree* gr : graphs)
{
bool default_directed
= gr->get< std::string >(path("<xmlattr>/edgedefault"))
== "directed";
// Search for edges
BOOST_FOREACH (const ptree::value_type& edge, *gr)
for (const ptree::value_type& edge : *gr)
{
if (edge.first != "edge")
continue;
Expand All @@ -180,7 +179,7 @@ class graphml_reader
}
size_t old_edges_size = m_edge.size();
handle_edge(source, target);
BOOST_FOREACH (const ptree::value_type& attr, edge.second)
for (const ptree::value_type& attr : edge.second)
{
if (attr.first != "data")
continue;
Expand Down
Loading