Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dirk.wintergruen
network_extensions
Commits
209a6b0c
Commit
209a6b0c
authored
Sep 17, 2019
by
dirk.wintergruen
Browse files
Merge branch 'master' of
https://gitlab.gwdg.de/dirk.wintergruen/network_extensions
parents
22e017f4
9b6aa830
Changes
2
Hide whitespace changes
Inline
Side-by-side
network_extensions/__init__.py
View file @
209a6b0c
__version__
=
"0.9.6.
4
"
__version__
=
"0.9.6.
5
"
network_extensions/igraphx/__init__.py
View file @
209a6b0c
...
...
@@ -201,7 +201,8 @@ def union(g_1, g_2, v_attr_name,e_attr_name = None, typ_field = None):
for
k
,
vs
in
n_vs
.
items
():
edges_list_new
.
append
((
e
[
0
],
e
[
1
]))
attributes
[
d
].
append
(
y
)
for
x
,
y
in
vs
:
attributes
[
x
].
append
(
y
)
# d = {x:y for x,y in vs}
# graph_merged.add_edge(e[0],e[1],**d)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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