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
e11f3535
Commit
e11f3535
authored
Nov 10, 2013
by
Tiago Peixoto
Browse files
Improve deletion of edges from python interface
This makes edge deletion O(1) if fast edge deletion is enabled for the graph.
parent
d6f00e98
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/graph/graph_adjacency.hh
View file @
e11f3535
...
...
@@ -760,6 +760,7 @@ inline void remove_edge(const typename adj_list<Vertex>::edge_descriptor& e,
typename
adj_list
<
Vertex
>::
edge_list_t
&
oes
=
g
.
_out_edges
[
s
];
typename
adj_list
<
Vertex
>::
edge_list_t
&
ies
=
g
.
_in_edges
[
t
];
bool
found
=
false
;
if
(
!
g
.
_keep_epos
)
// O(k_s + k_t)
{
for
(
size_t
i
=
0
;
i
<
oes
.
size
();
++
i
)
...
...
@@ -767,6 +768,7 @@ inline void remove_edge(const typename adj_list<Vertex>::edge_descriptor& e,
if
(
t
==
oes
[
i
].
first
&&
idx
==
oes
[
i
].
second
)
{
oes
.
erase
(
oes
.
begin
()
+
i
);
found
=
true
;
break
;
}
}
...
...
@@ -776,24 +778,34 @@ inline void remove_edge(const typename adj_list<Vertex>::edge_descriptor& e,
if
(
s
==
ies
[
i
].
first
&&
idx
==
ies
[
i
].
second
)
{
ies
.
erase
(
ies
.
begin
()
+
i
);
found
=
true
;
break
;
}
}
}
else
// O(1)
{
const
std
::
pair
<
int32_t
,
int32_t
>&
pos
=
g
.
_epos
[
idx
];
if
(
idx
<
g
.
_epos
.
size
())
{
const
std
::
pair
<
int32_t
,
int32_t
>&
pos
=
g
.
_epos
[
idx
];
g
.
_epos
[
oes
.
back
().
second
].
first
=
pos
.
first
;
oes
[
pos
.
first
]
=
oes
.
back
();
oes
.
pop_back
();
g
.
_epos
[
oes
.
back
().
second
].
first
=
pos
.
first
;
oes
[
pos
.
first
]
=
oes
.
back
();
oes
.
pop_back
();
g
.
_epos
[
ies
.
back
().
second
].
second
=
pos
.
second
;
ies
[
pos
.
second
]
=
ies
.
back
();
ies
.
pop_back
();
g
.
_epos
[
ies
.
back
().
second
].
second
=
pos
.
second
;
ies
[
pos
.
second
]
=
ies
.
back
();
ies
.
pop_back
();
found
=
true
;
}
}
if
(
found
)
{
g
.
_free_indexes
.
push_back
(
idx
);
g
.
_n_edges
--
;
}
g
.
_free_indexes
.
push_back
(
idx
);
g
.
_n_edges
--
;
}
...
...
src/graph/graph_python_interface.cc
View file @
e11f3535
...
...
@@ -210,12 +210,6 @@ struct get_edge_descriptor
PythonEdge
<
Graph
>&
pe
=
python
::
extract
<
PythonEdge
<
Graph
>&>
(
e
);
pe
.
CheckValid
();
pe
.
SetValid
(
false
);
typename
graph_traits
<
Graph
>::
out_edge_iterator
e_begin
,
e_end
;
tie
(
e_begin
,
e_end
)
=
out_edges
(
source
(
edge_t
(
pe
.
GetDescriptor
()),
g
),
g
);
while
(
e_begin
!=
e_end
&&
*
e_begin
!=
pe
.
GetDescriptor
())
++
e_begin
;
if
(
e_begin
==
e_end
)
return
;
// invalid edge descriptor
edge
=
pe
.
GetDescriptor
();
found
=
true
;
}
...
...
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