Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tiago Peixoto
graph-tool
Commits
248b0861
Commit
248b0861
authored
Dec 24, 2015
by
Tiago Peixoto
Browse files
Fix std::placeholder vs. boost::placeholder ambiguity in boost 1.60
parent
ee3b35bc
Pipeline
#85
failed with stage
Changes
83
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/graph/centrality/graph_closeness.cc
View file @
248b0861
...
...
@@ -34,17 +34,17 @@ void do_get_closeness(GraphInterface& gi, boost::any weight,
if
(
weight
.
empty
())
{
run_action
<>
()(
gi
,
std
::
bind
(
get_closeness
(),
placeholders
::
_1
,
std
::
bind
(
get_closeness
(),
std
::
placeholders
::
_1
,
gi
.
get_vertex_index
(),
no_weightS
(),
placeholders
::
_2
,
harmonic
,
norm
),
std
::
placeholders
::
_2
,
harmonic
,
norm
),
writable_vertex_scalar_properties
())(
closeness
);
}
else
{
run_action
<>
()(
gi
,
std
::
bind
(
get_closeness
(),
placeholders
::
_1
,
gi
.
get_vertex_index
(),
placeholders
::
_2
,
placeholders
::
_3
,
harmonic
,
norm
),
std
::
bind
(
get_closeness
(),
std
::
placeholders
::
_1
,
gi
.
get_vertex_index
(),
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
harmonic
,
norm
),
edge_scalar_properties
(),
writable_vertex_scalar_properties
())(
weight
,
closeness
);
}
...
...
src/graph/centrality/graph_eigenvector.cc
View file @
248b0861
...
...
@@ -42,8 +42,8 @@ long double eigenvector(GraphInterface& g, boost::any w, boost::any c,
long
double
eig
=
0
;
run_action
<>
()
(
g
,
std
::
bind
(
get_eigenvector
(),
placeholders
::
_1
,
g
.
get_vertex_index
(),
placeholders
::
_2
,
placeholders
::
_3
,
epsilon
,
max_iter
,
(
g
,
std
::
bind
(
get_eigenvector
(),
std
::
placeholders
::
_1
,
g
.
get_vertex_index
(),
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
epsilon
,
max_iter
,
std
::
ref
(
eig
)),
weight_props_t
(),
vertex_floating_properties
())(
w
,
c
);
...
...
src/graph/centrality/graph_hits.cc
View file @
248b0861
...
...
@@ -68,8 +68,8 @@ long double hits(GraphInterface& g, boost::any w, boost::any x, boost::any y,
long
double
eig
=
0
;
run_action
<>
()
(
g
,
std
::
bind
(
get_hits_dispatch
(),
placeholders
::
_1
,
g
.
get_vertex_index
(),
placeholders
::
_2
,
placeholders
::
_3
,
y
,
epsilon
,
max_iter
,
(
g
,
std
::
bind
(
get_hits_dispatch
(),
std
::
placeholders
::
_1
,
g
.
get_vertex_index
(),
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
y
,
epsilon
,
max_iter
,
std
::
ref
(
eig
)),
weight_props_t
(),
vertex_floating_properties
())(
w
,
x
);
...
...
src/graph/centrality/graph_katz.cc
View file @
248b0861
...
...
@@ -53,9 +53,9 @@ void katz(GraphInterface& g, boost::any w, boost::any c, boost::any beta,
if
(
beta
.
empty
())
beta
=
beta_map_t
(
1.
);
run_action
<>
()(
g
,
std
::
bind
(
get_katz
(),
placeholders
::
_1
,
g
.
get_vertex_index
(),
placeholders
::
_2
,
placeholders
::
_3
,
placeholders
::
_4
,
alpha
,
epsilon
,
max_iter
),
run_action
<>
()(
g
,
std
::
bind
(
get_katz
(),
std
::
placeholders
::
_1
,
g
.
get_vertex_index
(),
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
std
::
placeholders
::
_4
,
alpha
,
epsilon
,
max_iter
),
weight_props_t
(),
vertex_floating_properties
(),
beta_props_t
())(
w
,
c
,
beta
);
...
...
src/graph/centrality/graph_pagerank.cc
View file @
248b0861
...
...
@@ -57,8 +57,8 @@ size_t pagerank(GraphInterface& g, boost::any rank, boost::any pers,
size_t
iter
;
run_action
<>
()
(
g
,
std
::
bind
(
get_pagerank
(),
placeholders
::
_1
,
g
.
get_vertex_index
(),
placeholders
::
_2
,
placeholders
::
_3
,
placeholders
::
_4
,
d
,
std
::
placeholders
::
_1
,
g
.
get_vertex_index
(),
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
std
::
placeholders
::
_4
,
d
,
epsilon
,
max_iter
,
std
::
ref
(
iter
)),
vertex_floating_properties
(),
pers_props_t
(),
weight_props_t
())(
rank
,
pers
,
weight
);
...
...
src/graph/clustering/graph_extended_clustering.cc
View file @
248b0861
...
...
@@ -36,7 +36,7 @@ struct prop_vector
{
boost
::
any
prop_vec
;
boost
::
mpl
::
for_each
<
PropertySequence
>
(
std
::
bind
(
get_prop_vector
(),
placeholders
::
_1
,
std
::
ref
(
props
),
(
std
::
bind
(
get_prop_vector
(),
std
::
placeholders
::
_1
,
std
::
ref
(
props
),
std
::
ref
(
prop_vec
),
size
));
return
prop_vec
;
}
...
...
@@ -92,8 +92,8 @@ void extended_clustering(GraphInterface& g, boost::python::list props)
properties_vector
;
run_action
<>
()
(
g
,
std
::
bind
<
void
>
(
get_extended_clustering
(),
placeholders
::
_1
,
(
g
,
std
::
bind
<
void
>
(
get_extended_clustering
(),
std
::
placeholders
::
_1
,
any_cast
<
GraphInterface
::
vertex_index_map_t
>
(
g
.
get_vertex_index
()),
placeholders
::
_2
),
std
::
placeholders
::
_2
),
properties_vector
())
(
vprop
);
}
src/graph/clustering/graph_motifs.cc
View file @
248b0861
...
...
@@ -81,7 +81,7 @@ void get_motifs(GraphInterface& g, size_t k, boost::python::list subgraph_list,
GraphInterface
&
sub
=
boost
::
python
::
extract
<
GraphInterface
&>
(
subgraph_list
[
i
]);
run_action
<>
()(
sub
,
std
::
bind
(
append_to_list
(),
placeholders
::
_1
,
std
::
placeholders
::
_1
,
std
::
ref
(
list
)))();
}
}
...
...
@@ -114,8 +114,8 @@ void get_motifs(GraphInterface& g, size_t k, boost::python::list subgraph_list,
run_action
<>
()
(
g
,
std
::
bind
(
get_all_motifs
(
collect_vmaps
,
plist
[
0
],
comp_iso
,
fill_list
,
rng
),
placeholders
::
_1
,
k
,
std
::
ref
(
list
),
std
::
ref
(
phist
),
std
::
ref
(
vmaps
),
placeholders
::
_2
),
std
::
placeholders
::
_1
,
k
,
std
::
ref
(
list
),
std
::
ref
(
phist
),
std
::
ref
(
vmaps
),
std
::
placeholders
::
_2
),
boost
::
mpl
::
vector
<
sample_all
,
sample_some
>
())(
sampler
);
for
(
size_t
i
=
0
;
i
<
phist
.
size
();
++
i
)
...
...
@@ -146,7 +146,7 @@ void get_motifs(GraphInterface& g, size_t k, boost::python::list subgraph_list,
boost
::
mpl
::
bool_
<
false
>
,
boost
::
mpl
::
bool_
<
true
>
,
boost
::
mpl
::
bool_
<
true
>
>::
type
gviews
;
run_action
<
gviews
>
()
(
sub
,
std
::
bind
(
retrieve_from_list
(),
placeholders
::
_1
,
(
sub
,
std
::
bind
(
retrieve_from_list
(),
std
::
placeholders
::
_1
,
std
::
ref
(
list
),
std
::
ref
(
done
)))();
if
(
!
done
)
subgraph_list
.
append
(
sub
);
...
...
src/graph/community/graph_blockmodel.cc
View file @
248b0861
...
...
@@ -131,7 +131,7 @@ double do_get_ent(GraphInterface& gi, boost::any omrs, boost::any omrp,
double
S
=
0
;
run_action
<>
()
(
gi
,
std
::
bind
(
entropy
(),
mrs
,
mrp
,
mrm
,
wr
,
deg_corr
,
placeholders
::
_1
,
std
::
placeholders
::
_1
,
std
::
ref
(
S
)))();
return
S
;
}
...
...
@@ -151,7 +151,7 @@ double do_get_ent_dense(GraphInterface& gi, boost::any omrs, boost::any owr,
double
S
=
0
;
run_action
<>
()
(
gi
,
std
::
bind
(
entropy_dense
(),
mrs
,
wr
,
multigraph
,
placeholders
::
_1
,
std
::
ref
(
S
)))();
std
::
placeholders
::
_1
,
std
::
ref
(
S
)))();
return
S
;
}
...
...
@@ -165,7 +165,7 @@ double do_get_ent_parallel(GraphInterface& gi, boost::any oweight)
double
S
=
0
;
run_action
<>
()
(
gi
,
std
::
bind
(
entropy_parallel_edges
(),
placeholders
::
_1
,
weight
,
std
::
ref
(
S
)))();
std
::
placeholders
::
_1
,
weight
,
std
::
ref
(
S
)))();
return
S
;
}
...
...
@@ -181,7 +181,7 @@ boost::any do_create_emat(GraphInterface& gi, boost::any ob,
if
(
gi
.
get_directed
())
{
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_emat
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_emat
(),
std
::
placeholders
::
_1
,
std
::
ref
(
b
),
std
::
ref
(
bgi
.
get_graph
()),
std
::
ref
(
emat
)))();
...
...
@@ -189,7 +189,7 @@ boost::any do_create_emat(GraphInterface& gi, boost::any ob,
else
{
UndirectedAdaptor
<
GraphInterface
::
multigraph_t
>
ug
(
bgi
.
get_graph
());
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_emat
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_emat
(),
std
::
placeholders
::
_1
,
std
::
ref
(
b
),
std
::
ref
(
ug
),
std
::
ref
(
emat
)))();
...
...
@@ -208,7 +208,7 @@ boost::any do_create_ehash(GraphInterface& gi, boost::any ob,
if
(
gi
.
get_directed
())
{
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_ehash
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_ehash
(),
std
::
placeholders
::
_1
,
std
::
ref
(
b
),
std
::
ref
(
bgi
.
get_graph
()),
std
::
ref
(
emat
),
...
...
@@ -217,7 +217,7 @@ boost::any do_create_ehash(GraphInterface& gi, boost::any ob,
else
{
UndirectedAdaptor
<
GraphInterface
::
multigraph_t
>
ug
(
bgi
.
get_graph
());
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_ehash
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
create_ehash
(),
std
::
placeholders
::
_1
,
std
::
ref
(
b
),
std
::
ref
(
ug
),
std
::
ref
(
emat
),
...
...
@@ -492,7 +492,7 @@ boost::python::object do_move_sweep(GraphInterface& gi, GraphInterface& bgi,
beta
,
sequential
,
parallel
,
random_move
,
c
,
verbose
,
gi
.
get_edge_index_range
(),
nmerges
,
niter
,
merge_map
,
partition_stats
,
rng
,
S
,
nmoves
,
bgi
),
mrs
,
mrp
,
mrm
,
wr
,
b
,
placeholders
::
_1
,
mrs
,
mrp
,
mrm
,
wr
,
b
,
std
::
placeholders
::
_1
,
std
::
ref
(
emat
),
sampler
,
cavity_sampler
,
weighted
))();
return
boost
::
python
::
make_tuple
(
S
,
nmoves
);
}
...
...
@@ -535,7 +535,7 @@ boost::any do_build_egroups(GraphInterface& gi, GraphInterface& bgi,
esrcpos
.
get_unchecked
(
gi
.
get_edge_index_range
()),
etgtpos
.
get_unchecked
(
gi
.
get_edge_index_range
()),
eweights
.
get_unchecked
(
gi
.
get_edge_index_range
()),
placeholders
::
_1
,
bgi
.
get_vertex_index
(),
std
::
placeholders
::
_1
,
bgi
.
get_vertex_index
(),
bgi
.
get_num_vertices
(),
weighted
,
empty
))();
return
oegroups
;
}
...
...
@@ -550,7 +550,7 @@ boost::any do_init_neighbour_sampler(GraphInterface& gi, boost::any oeweights,
boost
::
any
osampler
;
run_action
<
graph_tool
::
detail
::
all_graph_views
,
boost
::
mpl
::
true_
>
()
(
gi
,
std
::
bind
(
init_neighbour_sampler
(),
placeholders
::
_1
,
eweights
,
(
gi
,
std
::
bind
(
init_neighbour_sampler
(),
std
::
placeholders
::
_1
,
eweights
,
self_loops
,
empty
,
std
::
ref
(
osampler
)))();
return
osampler
;
}
...
...
@@ -580,7 +580,7 @@ void do_collect_edge_marginals(GraphInterface& gi, GraphInterface& gbi,
run_action
<
graph_tool
::
detail
::
all_graph_views
,
boost
::
mpl
::
true_
>
()
(
gi
,
std
::
bind
<
void
>
(
collect_edge_marginals_dispatch
(),
placeholders
::
_1
,
B
,
b
,
p
,
std
::
placeholders
::
_1
,
B
,
b
,
p
,
std
::
tuple
<
boost
::
any
,
GraphInterface
&>
(
gbi
.
get_graph_view
(),
gbi
)))();
}
...
...
@@ -599,7 +599,7 @@ boost::python::tuple do_bethe_entropy(GraphInterface& gi, size_t B, boost::any o
double
H
=
0
,
sH
=
0
,
Hmf
=
0
,
sHmf
=
0
;
run_action
<
graph_tool
::
detail
::
all_graph_views
,
boost
::
mpl
::
true_
>
()
(
gi
,
std
::
bind
<
void
>
(
bethe_entropy
(),
placeholders
::
_1
,
B
,
p
,
pv
,
std
::
ref
(
H
),
std
::
ref
(
sH
),
std
::
placeholders
::
_1
,
B
,
p
,
pv
,
std
::
ref
(
H
),
std
::
ref
(
sH
),
std
::
ref
(
Hmf
),
std
::
ref
(
sHmf
)))();
return
boost
::
python
::
make_tuple
(
H
,
sH
,
Hmf
,
sHmf
);
}
...
...
@@ -626,7 +626,7 @@ void do_collect_vertex_marginals(GraphInterface& gi, boost::any ob,
run_action
<
graph_tool
::
detail
::
all_graph_views
,
boost
::
mpl
::
true_
>
()
(
gi
,
std
::
bind
(
collect_vertex_marginals_dispatch
(),
placeholders
::
_1
,
b
,
placeholders
::
_2
),
std
::
placeholders
::
_1
,
b
,
std
::
placeholders
::
_2
),
vertex_scalar_vector_properties
())(
op
);
}
...
...
@@ -700,7 +700,7 @@ double do_get_deg_entropy_term(GraphInterface& gi, boost::any ob,
vmap_t
b
=
any_cast
<
vmap_t
>
(
ob
);
run_action
<>
()
(
gi
,
std
::
bind
(
get_deg_entropy_term_overlap
(),
placeholders
::
_1
,
b
,
std
::
ref
(
overlap_stats
),
N
,
std
::
placeholders
::
_1
,
b
,
std
::
ref
(
overlap_stats
),
N
,
std
::
ref
(
S
)))();
}
else
...
...
@@ -709,7 +709,7 @@ double do_get_deg_entropy_term(GraphInterface& gi, boost::any ob,
vimap_t
ignore_degrees
=
any_cast
<
vimap_t
>
(
aignore_degrees
);
run_action
<>
()
(
gi
,
std
::
bind
(
get_deg_entropy_term
(),
placeholders
::
_1
,
eweight
,
ignore_degrees
,
std
::
placeholders
::
_1
,
eweight
,
ignore_degrees
,
std
::
ref
(
S
)))();
}
...
...
@@ -810,7 +810,7 @@ do_get_partition_stats(GraphInterface& gi, boost::any ob, boost::any aeweight,
mvmap_t
ignore_degrees
=
any_cast
<
mvmap_t
>
(
aignore_degrees
);
run_action
<>
()(
gi
,
std
::
bind
(
get_partition_stats
(),
placeholders
::
_1
,
b
,
eweight
,
N
,
B
,
edges_dl
,
std
::
placeholders
::
_1
,
b
,
eweight
,
N
,
B
,
edges_dl
,
std
::
ref
(
partition_stats
),
ignore_degrees
))();
return
partition_stats
;
}
...
...
src/graph/community/graph_blockmodel_covariates.cc
View file @
248b0861
...
...
@@ -610,7 +610,7 @@ boost::python::object do_cov_move_sweep(GraphInterface& gi,
partition_stats
,
overlap_partition_stats
,
overlap_stats
,
master
,
slave
,
rng
,
S
,
nmoves
,
bgi
,
bmap
,
brmap
,
free_blocks
,
B
),
std
::
ref
(
mrs
),
std
::
ref
(
mrp
),
std
::
ref
(
mrm
),
std
::
ref
(
wr
),
std
::
ref
(
b
),
std
::
ref
(
bs
),
std
::
ref
(
bgi
),
placeholders
::
_1
,
std
::
ref
(
gis
),
std
::
ref
(
b
),
std
::
ref
(
bs
),
std
::
ref
(
bgi
),
std
::
placeholders
::
_1
,
std
::
ref
(
gis
),
std
::
ref
(
emat
),
std
::
ref
(
sampler
),
std
::
ref
(
cavity_sampler
),
weighted
))();
return
boost
::
python
::
make_tuple
(
S
,
nmoves
);
...
...
@@ -636,14 +636,14 @@ double do_covariate_entropy(GraphInterface& gi, boost::any omrs)
double
S
=
0
;
run_action
<>
()
(
gi
,
std
::
bind
(
covariate_entropy
(),
placeholders
::
_1
,
mrs
,
std
::
ref
(
S
)))();
std
::
placeholders
::
_1
,
mrs
,
std
::
ref
(
S
)))();
return
S
;
}
// void do_create_echash(GraphInterface& gi, size_t l, size_t L,
// boost::any& emat_orig, boost::any& emat)
// {
// run_action<>()(gi, std::bind<void>(create_echash(), placeholders::_1, l, L,
// run_action<>()(gi, std::bind<void>(create_echash(),
std::
placeholders::_1, l, L,
// std::ref(emat_orig), std::ref(emat)))();
// }
...
...
@@ -654,8 +654,8 @@ void do_ec_hist(GraphInterface& gi, boost::any& aevc, boost::any& aec)
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
(),
placeholders
::
_1
,
placeholders
::
_2
,
std
::
ref
(
ec
)),
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
ec_hist
(),
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
ref
(
ec
)),
edge_properties
())(
aevc
);
}
...
...
@@ -695,7 +695,7 @@ void do_split_graph(GraphInterface& gi, boost::any& aec, boost::any& ab,
auto
rbmap
=
from_any_list
<
vmap_t
>
(
obrmap
);
auto
uvmap
=
from_any_list
<
vmap_t
>
(
ouvmap
);
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
split_graph
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
split_graph
(),
std
::
placeholders
::
_1
,
std
::
ref
(
ec
),
std
::
ref
(
b
),
std
::
ref
(
eweight
),
std
::
ref
(
vweight
),
std
::
ref
(
vc
),
...
...
src/graph/community/graph_blockmodel_overlap.cc
View file @
248b0861
...
...
@@ -328,7 +328,7 @@ do_move_sweep_overlap(GraphInterface& gi, GraphInterface& bgi, boost::any& emat,
random_move
,
c
,
node_coherent
,
verbose
,
gi
.
get_edge_index_range
(),
nmerges
,
niter
,
merge_map
,
overlap_stats
,
partition_stats
,
rng
,
S
,
nmoves
,
bgi
),
mrs
,
mrp
,
mrm
,
wr
,
b
,
placeholders
::
_1
,
mrs
,
mrp
,
mrm
,
wr
,
b
,
std
::
placeholders
::
_1
,
std
::
ref
(
emat
),
sampler
,
cavity_sampler
,
weighted
))();
return
boost
::
python
::
make_tuple
(
S
,
nmoves
);
}
...
...
@@ -366,7 +366,7 @@ do_get_overlap_stats(GraphInterface& gi, boost::any ob,
vvmap_t
half_edges
=
any_cast
<
vvmap_t
>
(
ohalf_edges
);
vimap_t
node_index
=
any_cast
<
vimap_t
>
(
onode_index
);
run_action
<>
()(
gi
,
std
::
bind
(
get_overlap_stats
(),
placeholders
::
_1
,
b
,
run_action
<>
()(
gi
,
std
::
bind
(
get_overlap_stats
(),
std
::
placeholders
::
_1
,
b
,
half_edges
.
get_unchecked
(
NN
),
node_index
,
B
,
std
::
ref
(
overlap_stats
)))();
return
overlap_stats
;
...
...
@@ -402,7 +402,7 @@ do_get_overlap_partition_stats(GraphInterface& gi, boost::any ob,
emap_t
eweight
=
any_cast
<
emap_t
>
(
aeweight
);
run_action
<>
()(
gi
,
std
::
bind
(
get_overlap_partition_stats
(),
placeholders
::
_1
,
b
,
eweight
,
N
,
B
,
edges_dl
,
std
::
placeholders
::
_1
,
b
,
eweight
,
N
,
B
,
edges_dl
,
std
::
ref
(
overlap_stats
),
std
::
ref
(
partition_stats
)))();
...
...
@@ -415,7 +415,7 @@ double do_get_overlap_parallel_entropy(GraphInterface& gi,
double
S
=
0
;
run_action
<>
()
(
gi
,
std
::
bind
(
entropy_parallel_edges_overlap
(),
placeholders
::
_1
,
std
::
ref
(
overlap_stats
),
std
::
placeholders
::
_1
,
std
::
ref
(
overlap_stats
),
std
::
ref
(
S
)))();
return
S
;
}
...
...
@@ -476,7 +476,7 @@ void do_get_eg_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe,
vvmap_t
half_edges
=
any_cast
<
vvmap_t
>
(
ohalf_edges
);
emap_t
eindex
=
any_cast
<
emap_t
>
(
oeindex
);
run_action
<>
()(
gi
,
std
::
bind
(
get_eg_overlap
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
(
get_eg_overlap
(),
std
::
placeholders
::
_1
,
std
::
ref
(
egi
.
get_graph
()),
be
,
b
,
node_index
,
half_edges
,
eindex
))();
}
...
...
@@ -534,7 +534,7 @@ void do_get_be_overlap(GraphInterface& gi, GraphInterface& egi, boost::any obe,
evmap_t
be
=
any_cast
<
evmap_t
>
(
obe
);
vimap_t
node_index
=
any_cast
<
vimap_t
>
(
onode_index
);
run_action
<>
()(
gi
,
std
::
bind
(
get_be_overlap
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
(
get_be_overlap
(),
std
::
placeholders
::
_1
,
std
::
ref
(
egi
.
get_graph
()),
be
,
b
,
node_index
))();
}
...
...
@@ -569,7 +569,7 @@ void do_get_be_from_b_overlap(GraphInterface& gi, boost::any obe, boost::any ob)
vmap_t
b
=
any_cast
<
vmap_t
>
(
ob
);
evmap_t
be
=
any_cast
<
evmap_t
>
(
obe
);
run_action
<>
()(
gi
,
std
::
bind
(
get_be_from_b_overlap
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
(
get_be_from_b_overlap
(),
std
::
placeholders
::
_1
,
be
,
b
))();
}
...
...
@@ -663,7 +663,7 @@ void do_get_bv_overlap(GraphInterface& gi, boost::any ob, boost::any onode_inde
vvmap_t
bc_out
=
any_cast
<
vvmap_t
>
(
obc_out
);
vvmap_t
bc_total
=
any_cast
<
vvmap_t
>
(
obc_total
);
run_action
<>
()(
gi
,
std
::
bind
(
get_bv_overlap
(),
placeholders
::
_1
,
b
,
run_action
<>
()(
gi
,
std
::
bind
(
get_bv_overlap
(),
std
::
placeholders
::
_1
,
b
,
node_index
,
bv
,
bc_in
,
bc_out
,
bc_total
))();
}
...
...
@@ -693,7 +693,7 @@ void do_get_wr_overlap(GraphInterface& gi, boost::any obv,
vvmap_t
bv
=
any_cast
<
vvmap_t
>
(
obv
);
vmap_t
wr
=
any_cast
<
vmap_t
>
(
owr
);
run_action
<>
()(
gi
,
std
::
bind
(
get_wr_overlap
(),
placeholders
::
_1
,
bv
,
wr
))();
run_action
<>
()(
gi
,
std
::
bind
(
get_wr_overlap
(),
std
::
placeholders
::
_1
,
bv
,
wr
))();
}
struct
get_nodeset_overlap
...
...
@@ -726,7 +726,7 @@ void do_get_nodeset_overlap(GraphInterface& gi, boost::any onode_index,
vmap_t
node_index
=
any_cast
<
vmap_t
>
(
onode_index
);
vvmap_t
half_edges
=
any_cast
<
vvmap_t
>
(
ohalf_edges
);
run_action
<>
()(
gi
,
std
::
bind
(
get_nodeset_overlap
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
(
get_nodeset_overlap
(),
std
::
placeholders
::
_1
,
node_index
,
half_edges
))();
}
...
...
@@ -783,7 +783,7 @@ void do_get_augmented_overlap(GraphInterface& gi, boost::any ob,
vimap_t
node_index
=
any_cast
<
vimap_t
>
(
onode_index
);
vmap_t
br_map
=
any_cast
<
vmap_t
>
(
obr_map
);
run_action
<>
()(
gi
,
std
::
bind
(
get_augmented_overlap
(),
placeholders
::
_1
,
run_action
<>
()(
gi
,
std
::
bind
(
get_augmented_overlap
(),
std
::
placeholders
::
_1
,
b
,
node_index
,
br_map
,
std
::
ref
(
br_b
),
std
::
ref
(
br_ni
)))();
}
...
...
@@ -820,7 +820,7 @@ void do_get_overlap_split(GraphInterface& gi, boost::any obv, boost::any ob)
vmap_t
b
=
any_cast
<
vmap_t
>
(
ob
);
run_action
<>
()(
gi
,
std
::
bind
(
get_overlap_split
(),
placeholders
::
_1
,
bv
,
b
))();
std
::
placeholders
::
_1
,
bv
,
b
))();
}
...
...
@@ -859,7 +859,7 @@ void do_get_maj_overlap(GraphInterface& gi, boost::any obv,
vvmap_t
bv
=
any_cast
<
vvmap_t
>
(
obv
);
vvmap_t
bc_total
=
any_cast
<
vvmap_t
>
(
obc_total
);
run_action
<>
()(
gi
,
std
::
bind
(
get_maj_overlap
(),
placeholders
::
_1
,
bv
,
run_action
<>
()(
gi
,
std
::
bind
(
get_maj_overlap
(),
std
::
placeholders
::
_1
,
bv
,
bc_total
,
b
))();
}
...
...
src/graph/community/graph_community.cc
View file @
248b0861
...
...
@@ -67,7 +67,7 @@ void community_structure(GraphInterface& g, double gamma, string corr_name,
run_action
<
graph_tool
::
detail
::
never_directed
>
()
(
g
,
std
::
bind
(
get_communities_selector
(
corr
,
g
.
get_vertex_index
()),
placeholders
::
_1
,
placeholders
::
_2
,
placeholders
::
_3
,
gamma
,
n_iter
,
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
gamma
,
n_iter
,
make_pair
(
Tmin
,
Tmax
),
Nspins
,
std
::
ref
(
rng
),
make_pair
(
verbose
,
history_file
)),
weight_properties
(),
allowed_spin_properties
())
...
...
@@ -87,8 +87,8 @@ double modularity(GraphInterface& g, boost::any weight, boost::any property)
weight
=
weight_map_t
(
1
);
run_action
<
graph_tool
::
detail
::
never_directed
>
()
(
g
,
std
::
bind
(
get_modularity
(),
placeholders
::
_1
,
placeholders
::
_2
,
placeholders
::
_3
,
std
::
ref
(
modularity
)),
(
g
,
std
::
bind
(
get_modularity
(),
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
std
::
ref
(
modularity
)),
edge_props_t
(),
vertex_scalar_properties
())
(
weight
,
property
);
return
modularity
;
...
...
src/graph/community/graph_community_network.cc
View file @
248b0861
...
...
@@ -101,9 +101,9 @@ void community_network(GraphInterface& gi, GraphInterface& cgi,
run_action
<>
()
(
gi
,
std
::
bind
(
get_community_network_vertices_dispatch
(),
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
placeholders
::
_2
,
condensed_community_property
,
placeholders
::
_3
,
vertex_count
),
std
::
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
std
::
placeholders
::
_2
,
condensed_community_property
,
std
::
placeholders
::
_3
,
vertex_count
),
writable_vertex_properties
(),
vweight_properties
())
(
community_property
,
vweight
);
...
...
src/graph/community/graph_community_network_eavg.cc
View file @
248b0861
...
...
@@ -90,8 +90,8 @@ void community_network_eavg(GraphInterface& gi, GraphInterface& cgi,
// compute weighted values to temp
run_action
<
graph_tool
::
detail
::
always_directed
>
()
(
gi
,
std
::
bind
(
get_weighted_edge_property_dispatch
(),
placeholders
::
_1
,
placeholders
::
_2
,
placeholders
::
_3
,
temp
),
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
temp
),
eweight_properties
(),
eprops_t
())
(
eweight
,
eprop
);
...
...
src/graph/community/graph_community_network_eavg_imp1.cc
View file @
248b0861
...
...
@@ -68,9 +68,9 @@ void sum_eprops(GraphInterface& gi, GraphInterface& cgi,
run_action
<
graph_tool
::
detail
::
always_directed
>
()
(
gi
,
std
::
bind
(
get_edge_sum_dispatch
(),
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
placeholders
::
_2
,
condensed_community_property
,
placeholders
::
_3
,
ceprop
,
std
::
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
std
::
placeholders
::
_2
,
condensed_community_property
,
std
::
placeholders
::
_3
,
ceprop
,
self_loops
),
writable_vertex_properties
(),
eprops_t
())
(
community_property
,
eprop
);
...
...
src/graph/community/graph_community_network_edges.cc
View file @
248b0861
...
...
@@ -76,9 +76,9 @@ void community_network_edges(GraphInterface& gi, GraphInterface& cgi,
run_action
<>
()
(
gi
,
std
::
bind
(
get_community_network_edges_dispatch
(
self_loops
,
parallel_edges
),
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
cgi
.
get_edge_index
(),
placeholders
::
_2
,
condensed_community_property
,
placeholders
::
_3
,
edge_count
),
std
::
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
cgi
.
get_edge_index
(),
std
::
placeholders
::
_2
,
condensed_community_property
,
std
::
placeholders
::
_3
,
edge_count
),
writable_vertex_properties
(),
eweight_properties
())
(
community_property
,
eweight
);
}
src/graph/community/graph_community_network_vavg.cc
View file @
248b0861
...
...
@@ -99,18 +99,18 @@ void community_network_vavg(GraphInterface& gi, GraphInterface& cgi,
// compute weighted values to temp
run_action
<
graph_tool
::
detail
::
always_directed_never_reversed
>
()
(
gi
,
std
::
bind
(
get_weighted_vertex_property_dispatch
(),
placeholders
::
_1
,
placeholders
::
_2
,
placeholders
::
_3
,
temp
),
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
temp
),
vweight_properties
(),
vprops_t
())
(
vweight
,
vprop
);
// sum weighted values
run_action
<
graph_tool
::
detail
::
always_directed_never_reversed
>
()
(
gi
,
std
::
bind
(
get_vertex_sum_dispatch
(),
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
placeholders
::
_2
,
std
::
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
std
::
placeholders
::
_2
,
condensed_community_property
,
placeholders
::
_3
,
cvprop
),
std
::
placeholders
::
_3
,
cvprop
),
writable_vertex_properties
(),
vprops_t
())
(
community_property
,
temp
);
}
...
...
@@ -119,10 +119,10 @@ void community_network_vavg(GraphInterface& gi, GraphInterface& cgi,
// sum unweighted values
run_action
<
graph_tool
::
detail
::
always_directed_never_reversed
>
()
(
gi
,
std
::
bind
(
get_vertex_sum_dispatch
(),
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
placeholders
::
_2
,
std
::
placeholders
::
_1
,
std
::
ref
(
cgi
.
get_graph
()),
std
::
placeholders
::
_2
,
condensed_community_property
,
placeholders
::
_3
,
cvprop
),
std
::
placeholders
::
_3
,
cvprop
),
writable_vertex_properties
(),
vprops_t
())
(
community_property
,
vprop
);
}
...
...
src/graph/correlations/graph_assortativity.cc
View file @
248b0861
...
...
@@ -31,7 +31,7 @@ assortativity_coefficient(GraphInterface& gi,
{
double
a
,
a_err
;
run_action
<>
()(
gi
,
std
::
bind
(
get_assortativity_coefficient
(),
placeholders
::
_1
,
placeholders
::
_2
,
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
ref
(
a
),
std
::
ref
(
a_err
)),
scalar_selectors
())
(
degree_selector
(
deg
));
...
...
@@ -44,7 +44,7 @@ scalar_assortativity_coefficient(GraphInterface& gi,
{
double
a
,
a_err
;
run_action
<>
()(
gi
,
std
::
bind
(
get_scalar_assortativity_coefficient
(),
placeholders
::
_1
,
placeholders
::
_2
,
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
ref
(
a
),
std
::
ref
(
a_err
)),
scalar_selectors
())
(
degree_selector
(
deg
));
...
...
src/graph/draw/graph_cairo_draw.cc
View file @
248b0861
...
...
@@ -1818,7 +1818,7 @@ size_t cairo_draw(GraphInterface& gi,
populate_defaults
(
ovdefaults
,
vdefaults
);
run_action
<
graph_tool
::
detail
::
always_directed
>
()
(
gi
,
std
::
bind
(
populate_edge_attrs
(),
placeholders
::
_1
,
oeattrs
,
(
gi
,
std
::
bind
(
populate_edge_attrs
(),
std
::
placeholders
::
_1
,
oeattrs
,
std
::
ref
(
eattrs
),
oedefaults
,
std
::
ref
(
edefaults
)))();
typedef
boost
::
mpl
::
push_back
<
vertex_scalar_properties
,
no_order
>::
type
...
...
@@ -1841,8 +1841,8 @@ size_t cairo_draw(GraphInterface& gi,
Cairo
::
Context
cr
(
PycairoContext_GET
(
ocr
.
ptr
()));
if
(
nodesfirst
)
run_action
<
graph_tool
::
detail
::
always_directed
>
()
(
gi
,
std
::
bind
(
do_cairo_draw_vertices
(),
placeholders
::
_1
,
placeholders
::
_2
,
placeholders
::
_3
,
(
gi
,
std
::
bind
(
do_cairo_draw_vertices
(),
std
::
placeholders
::
_1
,
std
::
placeholders
::
_2
,
std
::
placeholders
::
_3
,
std
::
ref
(
vattrs
),
std
::
ref
(
eattrs
),
std
::
ref
(
vdefaults
),
std
::
ref
(
edefaults
),
offset
,
mtime
,
std
::
ref
(
count
),
std
::
ref
(
cr
)),
...
...
@@ -1853,8 +1853,8 @@ size_t cairo_draw(GraphInterface& gi,
return
count
;
run_action
<
graph_tool
::
detail
::
always_directed
>
()