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
baf6c4cc
Commit
baf6c4cc
authored
Jul 19, 2014
by
Tiago Peixoto
Browse files
Fix bug in graph_union() when using filtered graphs
parent
3c64c67b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/graph_tool/generation/__init__.py
View file @
baf6c4cc
...
...
@@ -1021,7 +1021,7 @@ def graph_union(g1, g2, intersection=None, props=None, include=False):
emask
,
emask_flip
=
g1
.
get_edge_filter
()
emask_flipped
=
False
if
emask
is
not
None
and
not
emask_flip
:
emask
.
a
=
not
emask
.
a
emask
.
a
=
numpy
.
logical_
not
(
emask
.
a
)
emask_flipped
=
True
g1
.
set_edge_filter
(
emask
,
True
)
...
...
@@ -1051,12 +1051,12 @@ def graph_union(g1, g2, intersection=None, props=None, include=False):
if
include
:
emask
,
emask_flip
=
g1
.
get_edge_filter
()
if
emask
is
not
None
and
emask_flipped
:
emask
.
a
=
not
emask
.
a
emask
.
a
=
numpy
.
logical_
not
(
emask
.
a
)
g1
.
set_edge_filter
(
emask
,
False
)
vmask
,
vmask_flip
=
g1
.
get_vertex_filter
()
if
vmask
is
not
None
and
vmask_flipped
:
vmask
.
a
=
not
vmask
.
a
vmask
.
a
=
numpy
.
logical_
not
(
vmask
.
a
)
g1
.
set_vertex_filter
(
vmask
,
False
)
n_props
=
[]
...
...
Tiago Peixoto
@count0
mentioned in issue
#151 (closed)
·
Aug 06, 2014
mentioned in issue
#151 (closed)
mentioned in issue #151
Toggle commit list
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