Commit c72bb4c0 authored by Tiago Peixoto's avatar Tiago Peixoto

Enable (and clear) more strict warnings during compilation

parent e0db25e0
...@@ -34,7 +34,7 @@ AC_PROG_INSTALL ...@@ -34,7 +34,7 @@ AC_PROG_INSTALL
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
dnl turn on warnings dnl turn on warnings
[CXXFLAGS="-Wall -Wextra -Wno-unused-local-typedefs -Wno-unused-parameter ${CXXFLAGS}"] [CXXFLAGS="-Wall -Wextra -ftemplate-backtrace-limit=0 ${CXXFLAGS}"]
dnl Checks for options dnl Checks for options
......
...@@ -305,7 +305,6 @@ namespace detail { namespace graph { ...@@ -305,7 +305,6 @@ namespace detail { namespace graph {
ShortestPaths shortest_paths) ShortestPaths shortest_paths)
{ {
typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator; typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor; typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
// Initialize centrality // Initialize centrality
...@@ -446,7 +445,6 @@ namespace detail { namespace graph { ...@@ -446,7 +445,6 @@ namespace detail { namespace graph {
VertexIndexMap vertex_index) VertexIndexMap vertex_index)
{ {
typedef typename graph_traits<Graph>::degree_size_type degree_size_type; typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap, typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value), dummy_property_map>::value),
...@@ -482,7 +480,6 @@ namespace detail { namespace graph { ...@@ -482,7 +480,6 @@ namespace detail { namespace graph {
VertexIndexMap vertex_index) VertexIndexMap vertex_index)
{ {
typedef typename graph_traits<Graph>::degree_size_type degree_size_type; typedef typename graph_traits<Graph>::degree_size_type degree_size_type;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor; typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
typedef typename mpl::if_c<(is_same<CentralityMap, typedef typename mpl::if_c<(is_same<CentralityMap,
dummy_property_map>::value), dummy_property_map>::value),
......
...@@ -173,7 +173,6 @@ namespace boost ...@@ -173,7 +173,6 @@ namespace boost
// We build a custom graph in this algorithm. // We build a custom graph in this algorithm.
typedef adjacency_list <vecS, vecS, directedS, no_property, no_property > MSTImpl; typedef adjacency_list <vecS, vecS, directedS, no_property, no_property > MSTImpl;
typedef graph_traits<MSTImpl>::edge_descriptor Edge;
typedef graph_traits<MSTImpl>::vertex_descriptor Vertex; typedef graph_traits<MSTImpl>::vertex_descriptor Vertex;
typedef graph_traits<MSTImpl>::vertex_iterator VItr; typedef graph_traits<MSTImpl>::vertex_iterator VItr;
......
...@@ -212,7 +212,6 @@ namespace boost { ...@@ -212,7 +212,6 @@ namespace boost {
inline typename boost::property_traits<WeightMap>::value_type inline typename boost::property_traits<WeightMap>::value_type
stoer_wagner_min_cut(const UndirectedGraph& g, WeightMap weights, const boost::bgl_named_params<P, T, R>& params) { stoer_wagner_min_cut(const UndirectedGraph& g, WeightMap weights, const boost::bgl_named_params<P, T, R>& params) {
typedef typename boost::graph_traits<UndirectedGraph>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<UndirectedGraph>::vertex_descriptor vertex_descriptor;
typedef typename std::vector<vertex_descriptor>::size_type heap_container_size_type;
typedef typename boost::property_traits<WeightMap>::value_type weight_type; typedef typename boost::property_traits<WeightMap>::value_type weight_type;
typedef boost::bgl_named_params<P, T, R> params_type; typedef boost::bgl_named_params<P, T, R> params_type;
......
...@@ -121,7 +121,7 @@ struct get_closeness ...@@ -121,7 +121,7 @@ struct get_closeness
: _comp_size(comp_size) { } : _comp_size(comp_size) { }
template <class Vertex, class Graph> template <class Vertex, class Graph>
void discover_vertex(Vertex u, const Graph&) void discover_vertex(Vertex, const Graph&)
{ {
++_comp_size; ++_comp_size;
} }
......
...@@ -46,7 +46,6 @@ struct get_eigenvector ...@@ -46,7 +46,6 @@ struct get_eigenvector
CentralityMap c, double epsilon, size_t max_iter, CentralityMap c, double epsilon, size_t max_iter,
long double& eig) const long double& eig) const
{ {
typedef typename property_traits<WeightMap>::value_type c_type;
typedef typename property_traits<CentralityMap>::value_type t_type; typedef typename property_traits<CentralityMap>::value_type t_type;
CentralityMap c_temp(vertex_index, num_vertices(g)); CentralityMap c_temp(vertex_index, num_vertices(g));
......
...@@ -46,7 +46,6 @@ struct get_hits ...@@ -46,7 +46,6 @@ struct get_hits
CentralityMap x, CentralityMap y, double epsilon, CentralityMap x, CentralityMap y, double epsilon,
size_t max_iter, long double& eig) const size_t max_iter, long double& eig) const
{ {
typedef typename property_traits<WeightMap>::value_type c_type;
typedef typename property_traits<CentralityMap>::value_type t_type; typedef typename property_traits<CentralityMap>::value_type t_type;
CentralityMap x_temp(vertex_index, num_vertices(g)); CentralityMap x_temp(vertex_index, num_vertices(g));
......
...@@ -46,7 +46,6 @@ struct get_katz ...@@ -46,7 +46,6 @@ struct get_katz
CentralityMap c, PersonalizationMap beta, long double alpha, CentralityMap c, PersonalizationMap beta, long double alpha,
long double epsilon, size_t max_iter) const long double epsilon, size_t max_iter) const
{ {
typedef typename property_traits<WeightMap>::value_type c_type;
typedef typename property_traits<CentralityMap>::value_type t_type; typedef typename property_traits<CentralityMap>::value_type t_type;
CentralityMap c_temp(vertex_index, num_vertices(g)); CentralityMap c_temp(vertex_index, num_vertices(g));
......
...@@ -100,8 +100,6 @@ struct get_trust_transitivity ...@@ -100,8 +100,6 @@ struct get_trust_transitivity
int64_t target, TrustMap c, InferredTrustMap t) const int64_t target, TrustMap c, InferredTrustMap t) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename property_traits<TrustMap>::value_type c_type;
typedef typename typedef typename
property_traits<InferredTrustMap>::value_type::value_type t_type; property_traits<InferredTrustMap>::value_type::value_type t_type;
......
...@@ -332,7 +332,6 @@ struct move_sweep_dispatch ...@@ -332,7 +332,6 @@ struct move_sweep_dispatch
sampler_map_t sampler = any_cast<sampler_map_t>(asampler); sampler_map_t sampler = any_cast<sampler_map_t>(asampler);
sampler_map_t cavity_sampler = any_cast<sampler_map_t>(acavity_sampler); sampler_map_t cavity_sampler = any_cast<sampler_map_t>(acavity_sampler);
ConstantPropertyMap<int, typename graph_traits<Graph>::edge_descriptor> ce(0);
ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor> cv({-1}); ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor> cv({-1});
IdentityArrayPropertyMap<typename graph_traits<Graph>::vertex_descriptor> vmap; IdentityArrayPropertyMap<typename graph_traits<Graph>::vertex_descriptor> vmap;
boost::typed_identity_property_map<int> identity; boost::typed_identity_property_map<int> identity;
...@@ -362,7 +361,7 @@ struct move_sweep_dispatch ...@@ -362,7 +361,7 @@ struct move_sweep_dispatch
move_sweep(states, m_entries, move_sweep(states, m_entries,
wr.get_unchecked(num_vertices(bg)), wr.get_unchecked(num_vertices(bg)),
b.get_unchecked(num_vertices(g)), b.get_unchecked(num_vertices(g)),
ce, cv, vmap, cv, vmap,
label.get_unchecked(num_vertices(bg)), vlist, deg_corr, label.get_unchecked(num_vertices(bg)), vlist, deg_corr,
dense, multigraph, beta, dense, multigraph, beta,
eweight.get_unchecked(max_edge_index), eweight.get_unchecked(max_edge_index),
...@@ -371,7 +370,7 @@ struct move_sweep_dispatch ...@@ -371,7 +370,7 @@ struct move_sweep_dispatch
nmerges, nmerges,
merge_map.get_unchecked(num_vertices(g)), merge_map.get_unchecked(num_vertices(g)),
niter, num_vertices(bg), niter, num_vertices(bg),
verbose, rng, S, nmoves, ostats); verbose, rng, S, nmoves);
} }
}; };
......
This diff is collapsed.
...@@ -324,7 +324,6 @@ struct cov_move_sweep_dispatch ...@@ -324,7 +324,6 @@ struct cov_move_sweep_dispatch
move_sweep(states, m_entries, move_sweep(states, m_entries,
wr[0].get().get_unchecked(B), wr[0].get().get_unchecked(B),
b.get_unchecked(num_vertices(g)), b.get_unchecked(num_vertices(g)),
ce.get_unchecked(meindex),
cv.get_unchecked(num_vertices(g)), cv.get_unchecked(num_vertices(g)),
vmap.get_unchecked(num_vertices(g)), vmap.get_unchecked(num_vertices(g)),
label.get_unchecked(B), label.get_unchecked(B),
...@@ -336,7 +335,7 @@ struct cov_move_sweep_dispatch ...@@ -336,7 +335,7 @@ struct cov_move_sweep_dispatch
nmerges, nmerges,
merge_map.get_unchecked(num_vertices(g)), merge_map.get_unchecked(num_vertices(g)),
niter, B, niter, B,
verbose, rng, S, nmoves, ostats); verbose, rng, S, nmoves);
} }
else else
{ {
...@@ -387,10 +386,9 @@ struct cov_move_sweep_dispatch ...@@ -387,10 +386,9 @@ struct cov_move_sweep_dispatch
{ {
move_sweep_overlap(states, m_entries, overlap_stats[0].get(), move_sweep_overlap(states, m_entries, overlap_stats[0].get(),
wr[0].get().get_unchecked(B), wr[0].get().get_unchecked(B),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), cv,
vmap, label.get_unchecked(B), vmap, label.get_unchecked(B),
vlist, deg_corr, dense, multigraph, beta, vlist, deg_corr, dense, multigraph, beta,
eweight[0].get().get_unchecked(max_edge_index[0]),
vweight[0].get().get_unchecked(num_vertices(g)), g, vweight[0].get().get_unchecked(num_vertices(g)), g,
sequential, parallel, random_move, c, niter, sequential, parallel, random_move, c, niter,
B, verbose, rng, S, nmoves); B, verbose, rng, S, nmoves);
...@@ -402,14 +400,13 @@ struct cov_move_sweep_dispatch ...@@ -402,14 +400,13 @@ struct cov_move_sweep_dispatch
m_entries.emplace_back(num_vertices(state.bg)); m_entries.emplace_back(num_vertices(state.bg));
coherent_move_sweep_overlap(states, m_entries, overlap_stats[0].get(), coherent_move_sweep_overlap(states, m_entries, overlap_stats[0].get(),
wr[0].get().get_unchecked(B), wr[0].get().get_unchecked(B),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), cv,
vmap, label.get_unchecked(B), vmap, label.get_unchecked(B),
vlist, deg_corr, dense, multigraph, beta, vlist, deg_corr, dense, multigraph, beta,
eweight[0].get().get_unchecked(max_edge_index[0]),
vweight[0].get().get_unchecked(num_vertices(g)), g, vweight[0].get().get_unchecked(num_vertices(g)), g,
sequential, parallel, random_move, c, sequential, random_move, c,
confine_layers, niter, confine_layers, niter,
B, verbose, rng, S, nmoves); B, rng, S, nmoves);
} }
} }
else else
...@@ -417,14 +414,10 @@ struct cov_move_sweep_dispatch ...@@ -417,14 +414,10 @@ struct cov_move_sweep_dispatch
merge_sweep_overlap(states, m_entries, overlap_stats[0].get(), merge_sweep_overlap(states, m_entries, overlap_stats[0].get(),
wr[0].get().get_unchecked(B), wr[0].get().get_unchecked(B),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), ce, cv,
vmap, label.get_unchecked(B), vmap, label.get_unchecked(B), vlist,
vlist, deg_corr, dense, multigraph, beta, deg_corr, dense, multigraph, g,
eweight[0].get().get_unchecked(max_edge_index[0]), random_move, confine_layers, nmerges, niter,
vweight[0].get().get_unchecked(num_vertices(g)), g, B, rng, S, nmoves);
sequential, parallel, random_move, c, confine_layers,
nmerges, niter,
merge_map.get_unchecked(num_vertices(g)),
B, verbose, rng, S, nmoves);
} }
} }
} }
......
...@@ -215,10 +215,9 @@ struct move_sweep_overlap_dispatch ...@@ -215,10 +215,9 @@ struct move_sweep_overlap_dispatch
{ {
move_sweep_overlap(states, m_entries, overlap_stats, move_sweep_overlap(states, m_entries, overlap_stats,
wr.get_unchecked(num_vertices(bg)), wr.get_unchecked(num_vertices(bg)),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), cv,
vmap, label.get_unchecked(num_vertices(bg)), vmap, label.get_unchecked(num_vertices(bg)),
vlist, deg_corr, dense, multigraph, beta, vlist, deg_corr, dense, multigraph, beta,
eweight.get_unchecked(max_edge_index),
vweight.get_unchecked(num_vertices(g)), g, vweight.get_unchecked(num_vertices(g)), g,
sequential, parallel, random_move, c, niter, sequential, parallel, random_move, c, niter,
num_vertices(bg), verbose, rng, S, nmoves); num_vertices(bg), verbose, rng, S, nmoves);
...@@ -228,29 +227,24 @@ struct move_sweep_overlap_dispatch ...@@ -228,29 +227,24 @@ struct move_sweep_overlap_dispatch
vector<EntrySet<Graph>> m_entries(1, EntrySet<Graph>(num_vertices(bg))); vector<EntrySet<Graph>> m_entries(1, EntrySet<Graph>(num_vertices(bg)));
coherent_move_sweep_overlap(states, m_entries, overlap_stats, coherent_move_sweep_overlap(states, m_entries, overlap_stats,
wr.get_unchecked(num_vertices(bg)), wr.get_unchecked(num_vertices(bg)),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), cv,
vmap, label.get_unchecked(num_vertices(bg)), vmap, label.get_unchecked(num_vertices(bg)),
vlist, deg_corr, dense, multigraph, beta, vlist, deg_corr, dense, multigraph, beta,
eweight.get_unchecked(max_edge_index),
vweight.get_unchecked(num_vertices(g)), g, vweight.get_unchecked(num_vertices(g)), g,
sequential, parallel, random_move, c, sequential, random_move, c,
false, niter, false, niter,
num_vertices(bg), verbose, rng, S, nmoves); num_vertices(bg), rng, S, nmoves);
} }
} }
else else
{ {
merge_sweep_overlap(states, m_entries, overlap_stats, merge_sweep_overlap(states, m_entries, overlap_stats,
wr.get_unchecked(num_vertices(bg)), wr.get_unchecked(num_vertices(bg)),
b.get_unchecked(num_vertices(g)), ce, cv, b.get_unchecked(num_vertices(g)), ce, cv, vmap,
vmap, label.get_unchecked(num_vertices(bg)), label.get_unchecked(num_vertices(bg)), vlist,
vlist, deg_corr, dense, multigraph, beta, deg_corr, dense, multigraph, g, random_move,
eweight.get_unchecked(max_edge_index), false, nmerges, niter,
vweight.get_unchecked(num_vertices(g)), g, num_vertices(bg), rng, S, nmoves);
sequential, parallel, random_move, c, false,
nmerges, niter,
merge_map.get_unchecked(num_vertices(g)),
num_vertices(bg), verbose, rng, S, nmoves);
} }
} }
}; };
...@@ -387,19 +381,13 @@ do_get_overlap_partition_stats(GraphInterface& gi, boost::any ob, ...@@ -387,19 +381,13 @@ do_get_overlap_partition_stats(GraphInterface& gi, boost::any ob,
return partition_stats; return partition_stats;
} }
double do_get_overlap_parallel_entropy(GraphInterface& gi, boost::any ob, double do_get_overlap_parallel_entropy(GraphInterface& gi,
overlap_stats_t& overlap_stats) overlap_stats_t& overlap_stats)
{ {
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
vmap_t b = any_cast<vmap_t>(ob);
double S = 0; double S = 0;
run_action<>() run_action<>()
(gi, std::bind(entropy_parallel_edges_overlap(), (gi, std::bind(entropy_parallel_edges_overlap(),
placeholders::_1, b, std::ref(overlap_stats), placeholders::_1, std::ref(overlap_stats),
std::ref(S)))(); std::ref(S)))();
return S; return S;
} }
...@@ -513,9 +501,6 @@ void do_get_be_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe, ...@@ -513,9 +501,6 @@ void do_get_be_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe,
typedef property_map_type::apply<vector<int32_t>, typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type GraphInterface::edge_index_map_t>::type
evmap_t; evmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
vmap_t b = any_cast<vmap_t>(ob); vmap_t b = any_cast<vmap_t>(ob);
evmap_t be = any_cast<evmap_t>(obe); evmap_t be = any_cast<evmap_t>(obe);
...@@ -642,9 +627,6 @@ void do_get_bv_overlap(GraphInterface& gi, boost::any ob, boost::any onode_inde ...@@ -642,9 +627,6 @@ void do_get_bv_overlap(GraphInterface& gi, boost::any ob, boost::any onode_inde
typedef property_map_type::apply<vector<int32_t>, typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type GraphInterface::vertex_index_map_t>::type
vvmap_t; vvmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
evmap_t;
vmap_t b = any_cast<vmap_t>(ob); vmap_t b = any_cast<vmap_t>(ob);
vimap_t node_index = any_cast<vimap_t>(onode_index); vimap_t node_index = any_cast<vimap_t>(onode_index);
...@@ -662,8 +644,6 @@ struct get_wr_overlap ...@@ -662,8 +644,6 @@ struct get_wr_overlap
template <class Graph, class VProp, class VVProp> template <class Graph, class VProp, class VVProp>
void operator()(Graph& g, VVProp bv, VProp wr) const void operator()(Graph& g, VVProp bv, VProp wr) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
for (auto v : vertices_range(g)) for (auto v : vertices_range(g))
{ {
for (size_t i = 0; i < bv[v].size(); ++i) for (size_t i = 0; i < bv[v].size(); ++i)
...@@ -728,9 +708,6 @@ struct get_augmented_overlap ...@@ -728,9 +708,6 @@ struct get_augmented_overlap
void operator()(Graph& g, VProp b, VIProp node_index, VProp br_map, void operator()(Graph& g, VProp b, VIProp node_index, VProp br_map,
vector<int32_t>& br_b, vector<int32_t>& br_ni) const vector<int32_t>& br_b, vector<int32_t>& br_ni) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
unordered_map<std::tuple<int, int>, size_t> idx_map; unordered_map<std::tuple<int, int>, size_t> idx_map;
vector<std::tuple<int, int>> idx_rmap; vector<std::tuple<int, int>> idx_rmap;
size_t pos = 0; size_t pos = 0;
...@@ -824,8 +801,6 @@ struct get_maj_overlap ...@@ -824,8 +801,6 @@ struct get_maj_overlap
template <class Graph, class VProp, class VVProp> template <class Graph, class VProp, class VVProp>
void operator()(Graph& g, VVProp bv, VVProp bc_total, VProp b) const void operator()(Graph& g, VVProp bv, VVProp bc_total, VProp b) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
for (auto v : vertices_range(g)) for (auto v : vertices_range(g))
{ {
if (bv[v].empty()) if (bv[v].empty())
......
...@@ -54,7 +54,6 @@ struct get_communities ...@@ -54,7 +54,6 @@ struct get_communities
pair<bool, string> verbose) const pair<bool, string> verbose) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename property_traits<WeightMap>::key_type weight_key_t; typedef typename property_traits<WeightMap>::key_type weight_key_t;
...@@ -490,10 +489,6 @@ struct get_modularity ...@@ -490,10 +489,6 @@ struct get_modularity
template <class Graph, class WeightMap, class CommunityMap> template <class Graph, class WeightMap, class CommunityMap>
void operator()(const Graph& g, WeightMap weights, CommunityMap b, double& Q) const void operator()(const Graph& g, WeightMap weights, CommunityMap b, double& Q) const
{ {
typedef typename property_traits<WeightMap>::key_type weight_key_t;
typedef typename property_traits<WeightMap>::value_type weight_val_t;
typedef typename property_traits<CommunityMap>::value_type s_val_t;
vector<double> er, err; vector<double> er, err;
double W = 0; double W = 0;
......
...@@ -45,15 +45,10 @@ struct get_community_network_vertices ...@@ -45,15 +45,10 @@ struct get_community_network_vertices
VertexProperty vertex_count) const VertexProperty vertex_count) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<CommunityGraph>::vertex_descriptor typedef typename graph_traits<CommunityGraph>::vertex_descriptor
cvertex_t; cvertex_t;
typedef typename graph_traits<CommunityGraph>::edge_descriptor
cedge_t;
typedef typename boost::property_traits<CommunityMap>::value_type typedef typename boost::property_traits<CommunityMap>::value_type
s_type; s_type;
typedef typename boost::property_traits<VertexProperty>::value_type
vprop_type;
#ifdef HAVE_SPARSEHASH #ifdef HAVE_SPARSEHASH
google::dense_hash_map<s_type, vertex_t, std::hash<s_type> > comms; google::dense_hash_map<s_type, vertex_t, std::hash<s_type> > comms;
...@@ -114,7 +109,6 @@ struct get_community_network_edges ...@@ -114,7 +109,6 @@ struct get_community_network_edges
bool self_loops, bool parallel_edges) const bool self_loops, bool parallel_edges) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<CommunityGraph>::vertex_descriptor typedef typename graph_traits<CommunityGraph>::vertex_descriptor
cvertex_t; cvertex_t;
typedef typename graph_traits<CommunityGraph>::edge_descriptor typedef typename graph_traits<CommunityGraph>::edge_descriptor
...@@ -262,9 +256,6 @@ struct get_vertex_community_property_sum ...@@ -262,9 +256,6 @@ struct get_vertex_community_property_sum
CCommunityMap cs_map, Vprop vprop, Vprop cvprop) const CCommunityMap cs_map, Vprop vprop, Vprop cvprop) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<CommunityGraph>::vertex_descriptor
cvertex_t;
typedef typename boost::property_traits<CommunityMap>::value_type typedef typename boost::property_traits<CommunityMap>::value_type
s_type; s_type;
...@@ -308,7 +299,6 @@ struct get_edge_community_property_sum ...@@ -308,7 +299,6 @@ struct get_edge_community_property_sum
bool self_loops) const bool self_loops) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t; typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef typename graph_traits<CommunityGraph>::vertex_descriptor typedef typename graph_traits<CommunityGraph>::vertex_descriptor
cvertex_t; cvertex_t;
typedef typename graph_traits<CommunityGraph>::edge_descriptor typedef typename graph_traits<CommunityGraph>::edge_descriptor
......
...@@ -57,7 +57,6 @@ void sum_eprops(GraphInterface& gi, GraphInterface& cgi, ...@@ -57,7 +57,6 @@ void sum_eprops(GraphInterface& gi, GraphInterface& cgi,
void community_network_eavg(GraphInterface& gi, GraphInterface& cgi, void community_network_eavg(GraphInterface& gi, GraphInterface& cgi,
boost::any community_property, boost::any community_property,
boost::any condensed_community_property, boost::any condensed_community_property,
boost::any edge_count,
boost::any eweight, boost::any eweight,
boost::python::list aeprops, boost::python::list aeprops,
bool self_loops) bool self_loops)
......
...@@ -67,7 +67,6 @@ struct get_vertex_sum_dispatch ...@@ -67,7 +67,6 @@ struct get_vertex_sum_dispatch
void community_network_vavg(GraphInterface& gi, GraphInterface& cgi, void community_network_vavg(GraphInterface& gi, GraphInterface& cgi,
boost::any community_property, boost::any community_property,
boost::any condensed_community_property, boost::any condensed_community_property,
boost::any vertex_count,
boost::any vweight, boost::any vweight,
boost::python::list avprops) boost::python::list avprops)
{ {
......
...@@ -33,9 +33,6 @@ struct get_line_graph ...@@ -33,9 +33,6 @@ struct get_line_graph
LineGraph& line_graph, EdgeIndexMap edge_index, LineGraph& line_graph, EdgeIndexMap edge_index,
LGVertexIndex vmap) const LGVertexIndex vmap) const
{ {
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
typedef boost::property<edge_index_t, size_t> EdgeProperty;
typedef typename graph_traits<LineGraph>::vertex_descriptor lg_vertex_t; typedef typename