Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tiago Peixoto
graph-tool
Commits
ef15eea7
Commit
ef15eea7
authored
Feb 22, 2017
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
blockmodel.py: Store reference to rec_params/wparams
parent
02067e65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/graph/inference/graph_blockmodel.hh
src/graph/inference/graph_blockmodel.hh
+1
-1
src/graph_tool/inference/blockmodel.py
src/graph_tool/inference/blockmodel.py
+1
-1
No files found.
src/graph/inference/graph_blockmodel.hh
View file @
ef15eea7
...
@@ -84,7 +84,7 @@ enum weight_type
...
@@ -84,7 +84,7 @@ enum weight_type
((brec,, eprop_map_t<std::vector<double>>::type, 0)) \
((brec,, eprop_map_t<std::vector<double>>::type, 0)) \
((bdrec,, eprop_map_t<std::vector<double>>::type, 0)) \
((bdrec,, eprop_map_t<std::vector<double>>::type, 0)) \
((brecsum,, vprop_map_t<double>::type, 0)) \
((brecsum,, vprop_map_t<double>::type, 0)) \
((wparams,, std::vector<std::vector<double>>, 0))
\
((wparams,
&
, std::vector<std::vector<double>>
&
, 0)) \
((ignore_degrees,, typename vprop_map_t<uint8_t>::type, 0)) \
((ignore_degrees,, typename vprop_map_t<uint8_t>::type, 0)) \
((bignore_degrees,, typename vprop_map_t<uint8_t>::type, 0)) \
((bignore_degrees,, typename vprop_map_t<uint8_t>::type, 0)) \
((allow_empty,, bool, 0))
((allow_empty,, bool, 0))
...
...
src/graph_tool/inference/blockmodel.py
View file @
ef15eea7
...
@@ -470,7 +470,7 @@ class BlockState(object):
...
@@ -470,7 +470,7 @@ class BlockState(object):
ks
=
list
(
defaults
.
keys
())
ks
=
list
(
defaults
.
keys
())
defaults
.
update
(
rec_params
[
i
])
defaults
.
update
(
rec_params
[
i
])
rec_params
[
i
]
=
dict
(
**
defaults
)
rec_params
[
i
]
=
defaults
.
copy
(
)
for
k
in
ks
:
for
k
in
ks
:
ps
.
append
(
defaults
.
pop
(
k
))
ps
.
append
(
defaults
.
pop
(
k
))
if
len
(
defaults
)
>
0
:
if
len
(
defaults
)
>
0
:
...
...
Write
Preview
Markdown
is supported
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