Skip to content
GitLab
Menu
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
2291b947
Commit
2291b947
authored
Jul 17, 2015
by
Tiago Peixoto
Browse files
Fix bug in CovariateBlockState with filtered graphs
parent
c592d964
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/graph/community/graph_blockmodel_covariates.cc
View file @
2291b947
...
...
@@ -139,7 +139,8 @@ struct cov_move_sweep_dispatch
vector
<
std
::
reference_wrapper
<
Vprop
>>&
mrm
,
vector
<
std
::
reference_wrapper
<
Vprop
>>&
wr
,
Vprop
&
b
,
vector
<
std
::
reference_wrapper
<
Vprop
>>&
bs
,
vector
<
std
::
reference_wrapper
<
GraphInterface
>>&
bgis
,
Graph
&
g
,
vector
<
std
::
reference_wrapper
<
GraphInterface
>>&
bgis
,
Graph
&
g
,
vector
<
std
::
reference_wrapper
<
GraphInterface
>>&
ags
,
vector
<
std
::
reference_wrapper
<
boost
::
any
>>&
emat
,
vector
<
std
::
reference_wrapper
<
boost
::
any
>>&
sampler
,
...
...
@@ -686,7 +687,8 @@ void do_split_graph(GraphInterface& gi, boost::any& aec, boost::any& ab,
auto
uvmap
=
from_any_list
<
vmap_t
>
(
ouvmap
);
run_action
<>
()(
gi
,
std
::
bind
<
void
>
(
split_graph
(),
placeholders
::
_1
,
std
::
ref
(
ec
),
std
::
ref
(
b
),
std
::
ref
(
eweight
),
std
::
ref
(
ec
),
std
::
ref
(
b
),
std
::
ref
(
eweight
),
std
::
ref
(
vweight
),
std
::
ref
(
vc
),
std
::
ref
(
vmap
),
std
::
ref
(
us
),
std
::
ref
(
ub
),
...
...
src/graph_tool/community/covariate_blockmodel.py
View file @
2291b947
...
...
@@ -171,7 +171,9 @@ class CovariateBlockState(BlockState):
self
.
bmap
,
[
_prop
(
"v"
,
u
,
u
.
vp
[
"brmap"
])
for
u
in
self
.
gs
],
[
_prop
(
"v"
,
u
,
u
.
vp
[
"vmap"
])
for
u
in
self
.
gs
])
if
self
.
g
.
get_vertex_filter
()[
0
]
is
not
None
:
for
u
in
self
.
gs
:
u
.
set_vertex_filter
(
u
.
new_vertex_property
(
"bool"
,
True
))
if
not
self
.
layers
:
total_state
.
master
=
True
total_state
.
slave
=
False
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment