Commit 31999eb5 authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Implement convenience metafunctions to get property map types

parent a19d4056
......@@ -117,12 +117,8 @@ void clear_lgamma()
double do_get_ent(GraphInterface& gi, boost::any omrs, boost::any omrp,
boost::any omrm, boost::any owr, bool deg_corr)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t mrs = any_cast<emap_t>(omrs);
vmap_t mrp = any_cast<vmap_t>(omrp);
vmap_t mrm = any_cast<vmap_t>(omrm);
......@@ -139,12 +135,8 @@ double do_get_ent(GraphInterface& gi, boost::any omrs, boost::any omrp,
double do_get_ent_dense(GraphInterface& gi, boost::any omrs, boost::any owr,
bool multigraph)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t mrs = any_cast<emap_t>(omrs);
vmap_t wr = any_cast<vmap_t>(owr);
......@@ -157,9 +149,7 @@ double do_get_ent_dense(GraphInterface& gi, boost::any omrs, boost::any owr,
double do_get_ent_parallel(GraphInterface& gi, boost::any oweight)
{
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t weight = any_cast<emap_t>(oweight);
double S = 0;
......@@ -174,9 +164,7 @@ boost::any do_create_emat(GraphInterface& gi, boost::any ob,
GraphInterface& bgi)
{
boost::any emat;
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
vmap_t b = any_cast<vmap_t>(ob);
if (gi.get_directed())
......@@ -201,9 +189,7 @@ boost::any do_create_ehash(GraphInterface& gi, boost::any ob,
GraphInterface& bgi, rng_t& rng)
{
boost::any emat;
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
vmap_t b = any_cast<vmap_t>(ob);
if (gi.get_directed())
......@@ -458,15 +444,9 @@ boost::python::object do_move_sweep(GraphInterface& gi, GraphInterface& bgi,
partition_stats_t& partition_stats,
bool verbose, rng_t& rng)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
vemap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef eprop_map_t<int32_t>::type vemap_t;
emap_t mrs = any_cast<emap_t>(omrs);
vmap_t mrp = any_cast<vmap_t>(omrp);
vmap_t mrm = any_cast<vmap_t>(omrm);
......@@ -514,15 +494,9 @@ boost::any do_build_egroups(GraphInterface& gi, GraphInterface& bgi,
boost::any oesrcpos, boost::any oetgtpos,
bool weighted, bool empty)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
vemap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef eprop_map_t<int32_t>::type vemap_t;
vmap_t b = any_cast<vmap_t>(ob);
vemap_t esrcpos = any_cast<vemap_t>(oesrcpos);
......@@ -543,9 +517,7 @@ boost::any do_build_egroups(GraphInterface& gi, GraphInterface& bgi,
boost::any do_init_neighbour_sampler(GraphInterface& gi, boost::any oeweights,
bool self_loops, bool empty)
{
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t eweights = any_cast<emap_t>(oeweights);
boost::any osampler;
......@@ -567,12 +539,8 @@ struct collect_edge_marginals_dispatch
void do_collect_edge_marginals(GraphInterface& gi, GraphInterface& gbi,
size_t B, boost::any ob, boost::any op)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<vector<int32_t>>::type emap_t;
vmap_t b = any_cast<vmap_t>(ob);
emap_t p = any_cast<emap_t>(op);
......@@ -586,12 +554,8 @@ void do_collect_edge_marginals(GraphInterface& gi, GraphInterface& gbi,
boost::python::tuple do_bethe_entropy(GraphInterface& gi, size_t B, boost::any op,
boost::any opv)
{
typedef property_map_type::apply<vector<double>,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<vector<double>>::type vmap_t;
typedef eprop_map_t<vector<int32_t>>::type emap_t;
emap_t p = any_cast<emap_t>(op);
vmap_t pv = any_cast<vmap_t>(opv);
......@@ -618,9 +582,7 @@ struct collect_vertex_marginals_dispatch
void do_collect_vertex_marginals(GraphInterface& gi, boost::any ob,
boost::any op)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
vmap_t b = any_cast<vmap_t>(ob);
run_action<graph_tool::all_graph_views, boost::mpl::true_>()
......@@ -682,15 +644,9 @@ double do_get_deg_entropy_term(GraphInterface& gi, boost::any ob,
overlap_stats_t& overlap_stats, size_t N,
boost::any aeweight, boost::any aignore_degrees)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<uint8_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef vprop_map_t<uint8_t>::type vimap_t;
double S = 0;
......@@ -792,15 +748,9 @@ do_get_partition_stats(GraphInterface& gi, boost::any ob, boost::any aeweight,
size_t N, size_t B, bool edges_dl,
boost::any aignore_degrees)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<uint8_t,
GraphInterface::vertex_index_map_t>::type
mvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef vprop_map_t<uint8_t>::type mvmap_t;
partition_stats_t partition_stats;
......
......@@ -751,10 +751,7 @@ struct get_emat_t
{
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef multi_array<edge_t, 2> mat_t;
typedef typename property_map_type
::apply<edge_t,
typename property_map<Graph,
edge_index_t>::type>::type bedge_t;
typedef typename eprop_map_t<edge_t>::type bedge_t;
typedef struct
{
mat_t mat;
......@@ -859,10 +856,7 @@ struct get_ehash_t
typedef typename graph_traits<Graph>::edge_descriptor edge_t;
typedef gt_hash_map<vertex_t, edge_t, perfect_hash_t<vertex_t>> ehash_t;
typedef std::vector<ehash_t> vhash_t;
typedef typename property_map_type
::apply<edge_t,
typename property_map<Graph,
edge_index_t>::type>::type bedge_t;
typedef typename eprop_map_t<edge_t>::type bedge_t;
class type
{
private:
......
......@@ -538,15 +538,9 @@ boost::python::object do_cov_move_sweep(GraphInterface& gi,
boost::python::object& ooverlap_stats,
bool verbose, rng_t& rng)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
auto mrs = from_any_list<emap_t>(omrs);
auto mrp = from_any_list<vmap_t>(omrp);
auto mrm = from_any_list<vmap_t>(omrm);
......@@ -628,9 +622,7 @@ struct covariate_entropy
double do_covariate_entropy(GraphInterface& gi, boost::any omrs)
{
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t mrs = any_cast<emap_t>(omrs);
double S = 0;
......@@ -649,9 +641,7 @@ double do_covariate_entropy(GraphInterface& gi, boost::any omrs)
void do_ec_hist(GraphInterface& gi, boost::any& aevc, boost::any& aec)
{
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typename emap_t::unchecked_t ec =
any_cast<emap_t&>(aec).get_unchecked(gi.get_edge_index_range());
run_action<>()(gi, std::bind<void>(ec_hist(), std::placeholders::_1,
......@@ -670,15 +660,9 @@ void do_split_graph(GraphInterface& gi, boost::any& aec, boost::any& ab,
boost::python::object& obrmap,
boost::python::object& ouvmap)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
emap_t& ec = any_cast<emap_t&>(aec);
vmap_t& b = any_cast<vmap_t&>(ab);
......
......@@ -294,15 +294,9 @@ do_move_sweep_overlap(GraphInterface& gi, GraphInterface& bgi, boost::any& emat,
overlap_partition_stats_t& partition_stats, bool verbose,
rng_t& rng)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
vemap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
typedef eprop_map_t<int32_t>::type vemap_t;
emap_t mrs = any_cast<emap_t>(omrs);
vmap_t mrp = any_cast<vmap_t>(omrp);
vmap_t mrm = any_cast<vmap_t>(omrm);
......@@ -350,15 +344,9 @@ do_get_overlap_stats(GraphInterface& gi, boost::any ob,
boost::any ohalf_edges, boost::any onode_index,
size_t NN, size_t B)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef property_map_type::apply<vector<int64_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<int64_t>::type vimap_t;
typedef vprop_map_t<vector<int64_t>>::type vvmap_t;
overlap_stats_t overlap_stats;
......@@ -389,12 +377,8 @@ do_get_overlap_partition_stats(GraphInterface& gi, boost::any ob,
boost::any aeweight, size_t N, size_t B,
bool edges_dl, overlap_stats_t& overlap_stats)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<int32_t>::type emap_t;
overlap_partition_stats_t partition_stats;
......@@ -454,21 +438,11 @@ void do_get_eg_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe,
boost::any ob, boost::any onode_index,
boost::any ohalf_edges, boost::any oeindex)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef property_map_type::apply<vector<int64_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
evmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::edge_index_map_t>::type
emap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<int64_t>::type vimap_t;
typedef vprop_map_t<vector<int64_t>>::type vvmap_t;
typedef eprop_map_t<vector<int32_t>>::type evmap_t;
typedef eprop_map_t<int64_t>::type emap_t;
vmap_t b = any_cast<vmap_t>(ob);
evmap_t be = any_cast<evmap_t>(obe);
......@@ -520,15 +494,9 @@ struct get_be_overlap
void do_get_be_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe,
boost::any ob, boost::any onode_index)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
evmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<int64_t>::type vimap_t;
typedef eprop_map_t<vector<int32_t>>::type evmap_t;
vmap_t b = any_cast<vmap_t>(ob);
evmap_t be = any_cast<evmap_t>(obe);
......@@ -559,12 +527,8 @@ struct get_be_from_b_overlap
void do_get_be_from_b_overlap(GraphInterface& gi, boost::any obe, boost::any ob)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::edge_index_map_t>::type
evmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef eprop_map_t<vector<int32_t>>::type evmap_t;
vmap_t b = any_cast<vmap_t>(ob);
evmap_t be = any_cast<evmap_t>(obe);
......@@ -646,15 +610,9 @@ void do_get_bv_overlap(GraphInterface& gi, boost::any ob, boost::any onode_inde
boost::any obv, boost::any obc_in, boost::any obc_out,
boost::any obc_total)
{
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int64_t>::type vimap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
vmap_t b = any_cast<vmap_t>(ob);
vimap_t node_index = any_cast<vimap_t>(onode_index);
......@@ -683,12 +641,8 @@ struct get_wr_overlap
void do_get_wr_overlap(GraphInterface& gi, boost::any obv,
boost::any owr)
{
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
vvmap_t bv = any_cast<vvmap_t>(obv);
vmap_t wr = any_cast<vmap_t>(owr);
......@@ -716,12 +670,8 @@ struct get_nodeset_overlap
void do_get_nodeset_overlap(GraphInterface& gi, boost::any onode_index,
boost::any ohalf_edges)
{
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int64_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int64_t>::type vmap_t;
typedef vprop_map_t<vector<int64_t>>::type vvmap_t;
vmap_t node_index = any_cast<vmap_t>(onode_index);
vvmap_t half_edges = any_cast<vvmap_t>(ohalf_edges);
......@@ -772,12 +722,8 @@ void do_get_augmented_overlap(GraphInterface& gi, boost::any ob,
boost::any onode_index, boost::any obr_map,
vector<int32_t>& br_b, vector<int32_t>& br_ni)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type
vimap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<int64_t>::type vimap_t;
vmap_t b = any_cast<vmap_t>(ob);
vimap_t node_index = any_cast<vimap_t>(onode_index);
......@@ -809,12 +755,8 @@ struct get_overlap_split
void do_get_overlap_split(GraphInterface& gi, boost::any obv, boost::any ob)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
vvmap_t bv = any_cast<vvmap_t>(obv);
vmap_t b = any_cast<vmap_t>(ob);
......@@ -848,12 +790,8 @@ struct get_maj_overlap
void do_get_maj_overlap(GraphInterface& gi, boost::any obv,
boost::any obc_total, boost::any ob)
{
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type
vmap_t;
typedef property_map_type::apply<vector<int32_t>,
GraphInterface::vertex_index_map_t>::type
vvmap_t;
typedef vprop_map_t<int32_t>::type vmap_t;
typedef vprop_map_t<vector<int32_t>>::type vvmap_t;
vmap_t b = any_cast<vmap_t>(ob);
vvmap_t bv = any_cast<vvmap_t>(obv);
......
......@@ -37,14 +37,11 @@ class overlap_stats_t
public:
typedef pair<size_t, size_t> deg_t;
typedef property_map_type::apply<int32_t,
GraphInterface::vertex_index_map_t>::type::unchecked_t
typedef vprop_map_t<int32_t>::type ::unchecked_t
vmap_t;
typedef property_map_type::apply<int64_t,
GraphInterface::vertex_index_map_t>::type::unchecked_t
typedef vprop_map_t<int64_t>::type ::unchecked_t
vimap_t;
typedef property_map_type::apply<vector<int64_t>,
GraphInterface::vertex_index_map_t>::type::unchecked_t
typedef vprop_map_t<vector<int64_t>>::type ::unchecked_t
vvmap_t;
overlap_stats_t(): _enabled(false) {}
......
......@@ -35,8 +35,8 @@ using namespace graph_tool;
typedef UnityPropertyMap<int,GraphInterface::edge_t> no_eweight_map_t;
typedef UnityPropertyMap<int,GraphInterface::vertex_t> no_vweight_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::edge_index_map_t>::type::unchecked_t ecount_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::vertex_index_map_t>::type::unchecked_t vcount_map_t;
typedef eprop_map_t<int32_t>::type ::unchecked_t ecount_map_t;
typedef vprop_map_t<int32_t>::type ::unchecked_t vcount_map_t;
struct get_community_network_vertices_dispatch
{
......
......@@ -34,7 +34,7 @@ using namespace boost;
using namespace graph_tool;
typedef UnityPropertyMap<int,GraphInterface::edge_t> no_eweight_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::edge_index_map_t>::type ecount_map_t;
typedef eprop_map_t<int32_t>::type ecount_map_t;
struct get_weighted_edge_property_dispatch
{
......@@ -75,8 +75,7 @@ void community_network_eavg(GraphInterface& gi, GraphInterface& cgi,
boost::mpl::end<writable_edge_scalar_properties>::type,
edge_scalar_vector_properties>::type eprops_temp;
typedef boost::mpl::push_back<eprops_temp,
property_map_type::apply<boost::python::object,
GraphInterface::edge_index_map_t>::type>::type
eprop_map_t<boost::python::object>::type >::type
eprops_t;
for(int i = 0; i < boost::python::len(aeprops); ++i)
......
......@@ -34,7 +34,7 @@ using namespace boost;
using namespace graph_tool;
typedef UnityPropertyMap<int,GraphInterface::edge_t> no_eweight_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::edge_index_map_t>::type ecount_map_t;
typedef eprop_map_t<int32_t>::type ecount_map_t;
struct get_edge_sum_dispatch
{
......@@ -62,8 +62,7 @@ void sum_eprops(GraphInterface& gi, GraphInterface& cgi,
boost::mpl::end<writable_edge_scalar_properties>::type,
edge_scalar_vector_properties>::type eprops_temp;
typedef boost::mpl::push_back<eprops_temp,
property_map_type::apply<boost::python::object,
GraphInterface::edge_index_map_t>::type>::type
eprop_map_t<boost::python::object>::type >::type
eprops_t;
run_action<graph_tool::detail::always_directed>()
......
......@@ -34,7 +34,7 @@ using namespace boost;
using namespace graph_tool;
typedef UnityPropertyMap<int,GraphInterface::edge_t> no_eweight_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::edge_index_map_t>::type::unchecked_t ecount_map_t;
typedef eprop_map_t<int32_t>::type ::unchecked_t ecount_map_t;
struct get_community_network_edges_dispatch
{
......
......@@ -34,7 +34,7 @@ using namespace boost;
using namespace graph_tool;
typedef UnityPropertyMap<int,GraphInterface::vertex_t> no_vweight_map_t;
typedef property_map_type::apply<int32_t,GraphInterface::vertex_index_map_t>::type vcount_map_t;
typedef vprop_map_t<int32_t>::type vcount_map_t;
struct get_weighted_vertex_property_dispatch
......@@ -84,8 +84,7 @@ void community_network_vavg(GraphInterface& gi, GraphInterface& cgi,
boost::mpl::end<writable_vertex_scalar_properties>::type,
vertex_scalar_vector_properties>::type vprops_temp;
typedef boost::mpl::push_back<vprops_temp,
property_map_type::apply<boost::python::object,
GraphInterface::vertex_index_map_t>::type>::type
vprop_map_t<boost::python::object>::type >::type
vprops_t;
for(int i = 0; i < boost::python::len(avprops); ++i)
......
......@@ -238,12 +238,8 @@ struct do_get_cts
void get_cts(GraphInterface& gi, GraphInterface& tgi, boost::any otpos,
boost::any obeta, boost::any octs, bool is_tree, size_t max_depth)
{
typedef property_map_type::apply<vector<double>,
GraphInterface::edge_index_map_t>::type
eprop_t;
typedef property_map_type::apply<double,
GraphInterface::edge_index_map_t>::type
beprop_t;
typedef eprop_map_t<vector<double>>::type eprop_t;
typedef eprop_map_t<double>::type beprop_t;
eprop_t cts = boost