Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tiago Peixoto
graph-tool
Commits
1f6f566f
Commit
1f6f566f
authored
Jul 02, 2013
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use filter stash internally, in favour of graph views
parent
7a401052
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
51 deletions
+36
-51
src/graph_tool/__init__.py
src/graph_tool/__init__.py
+5
-9
src/graph_tool/stats/__init__.py
src/graph_tool/stats/__init__.py
+1
-1
src/graph_tool/topology/__init__.py
src/graph_tool/topology/__init__.py
+30
-41
No files found.
src/graph_tool/__init__.py
View file @
1f6f566f
...
...
@@ -787,14 +787,12 @@ def group_vector_property(props, value_type=None, vprop=None, pos=None):
for
i
,
p
in
enumerate
(
props
):
if
k
!=
"g"
:
g
.
stash_filter
(
directed
=
True
,
reversed
=
True
)
g
.
set_directed
(
True
)
g
.
set_reversed
(
False
)
libcore
.
group_vector_property
(
g
.
_Graph__graph
,
_prop
(
k
,
g
,
vprop
),
u
=
GraphView
(
g
,
directed
=
True
)
u
.
set_reversed
(
False
)
libcore
.
group_vector_property
(
u
.
_Graph__graph
,
_prop
(
k
,
g
,
vprop
),
_prop
(
k
,
g
,
p
),
i
if
pos
==
None
else
pos
[
i
],
k
==
'e'
)
g
.
pop_filter
(
directed
=
True
,
reversed
=
True
)
else
:
vprop
[
g
][
i
if
pos
is
None
else
pos
[
i
]]
=
p
[
g
]
return
vprop
...
...
@@ -853,14 +851,12 @@ def ungroup_vector_property(vprop, pos, props=None):
raise
ValueError
(
"'props' must be of the same key type as 'vprop'."
)
if
k
!=
'g'
:
g
.
stash_filter
(
directed
=
True
,
reversed
=
True
)
g
.
set_directed
(
True
)
g
.
set_reversed
(
False
)
u
=
GraphView
(
g
,
directed
=
True
)
u
.
set_reversed
(
False
)
libcore
.
ungroup_vector_property
(
g
.
_Graph__graph
,
_prop
(
k
,
g
,
vprop
),
_prop
(
k
,
g
,
props
[
i
]),
p
,
k
==
'e'
)
g
.
pop_filter
(
directed
=
True
,
reversed
=
True
)
else
:
if
len
(
vprop
[
g
])
<=
pos
[
i
]:
vprop
[
g
].
resize
(
pos
[
i
]
+
1
)
...
...
src/graph_tool/stats/__init__.py
View file @
1f6f566f
...
...
@@ -49,7 +49,7 @@ from __future__ import division, absolute_import, print_function
from
..
dl_import
import
dl_import
dl_import
(
"from . import libgraph_tool_stats"
)
from
..
import
_degree
,
_prop
,
_get_rng
from
..
import
_degree
,
_prop
,
_get_rng
,
GraphView
from
numpy
import
*
import
numpy
import
sys
...
...
src/graph_tool/topology/__init__.py
View file @
1f6f566f
...
...
@@ -407,21 +407,17 @@ def min_spanning_tree(g, weights=None, root=None, tree_map=None):
if
tree_map
.
value_type
()
!=
"bool"
:
raise
ValueError
(
"edge property 'tree_map' must be of value type bool."
)
try
:
g
.
stash_filter
(
directed
=
True
)
g
.
set_directed
(
False
)
if
root
is
None
:
libgraph_tool_topology
.
\
get_kruskal_spanning_tree
(
g
.
_Graph__graph
,
_prop
(
"e"
,
g
,
weights
),
_prop
(
"e"
,
g
,
tree_map
))
else
:
libgraph_tool_topology
.
\
get_prim_spanning_tree
(
g
.
_Graph__graph
,
int
(
root
),
_prop
(
"e"
,
g
,
weights
),
_prop
(
"e"
,
g
,
tree_map
))
finally
:
g
.
pop_filter
(
directed
=
True
)
u
=
GraphView
(
g
,
directed
=
False
)
if
root
is
None
:
libgraph_tool_topology
.
\
get_kruskal_spanning_tree
(
u
.
_Graph__graph
,
_prop
(
"e"
,
g
,
weights
),
_prop
(
"e"
,
g
,
tree_map
))
else
:
libgraph_tool_topology
.
\
get_prim_spanning_tree
(
u
.
_Graph__graph
,
int
(
root
),
_prop
(
"e"
,
g
,
weights
),
_prop
(
"e"
,
g
,
tree_map
))
return
tree_map
...
...
@@ -1166,30 +1162,27 @@ def shortest_distance(g, source=None, target=None, weights=None, max_dist=None,
max_dist
=
0
if
directed
is
not
None
:
g
.
stash_filter
(
directed
=
True
)
g
.
set_directed
(
directed
)
u
=
GraphView
(
g
,
directed
=
directed
)
else
:
u
=
g
if
target
is
None
:
target
=
-
1
try
:
if
source
is
not
None
:
pmap
=
g
.
copy_property
(
g
.
vertex_index
,
value_type
=
"int64_t"
)
libgraph_tool_topology
.
get_dists
(
g
.
_Graph__graph
,
int
(
source
),
int
(
target
),
if
source
is
not
None
:
pmap
=
g
.
copy_property
(
u
.
vertex_index
,
value_type
=
"int64_t"
)
libgraph_tool_topology
.
get_dists
(
g
.
_Graph__graph
,
int
(
source
),
int
(
target
),
_prop
(
"v"
,
g
,
dist_map
),
_prop
(
"e"
,
g
,
weights
),
_prop
(
"v"
,
g
,
pmap
),
float
(
max_dist
))
else
:
libgraph_tool_topology
.
get_all_dists
(
u
.
_Graph__graph
,
_prop
(
"v"
,
g
,
dist_map
),
_prop
(
"e"
,
g
,
weights
),
_prop
(
"v"
,
g
,
pmap
),
float
(
max_dist
))
else
:
libgraph_tool_topology
.
get_all_dists
(
g
.
_Graph__graph
,
_prop
(
"v"
,
g
,
dist_map
),
_prop
(
"e"
,
g
,
weights
),
dense
)
_prop
(
"e"
,
g
,
weights
),
dense
)
finally
:
if
directed
is
not
None
:
g
.
pop_filter
(
directed
=
True
)
if
source
is
not
None
and
target
!=
-
1
:
dist_map
=
dist_map
[
target
]
...
...
@@ -1511,8 +1504,7 @@ def is_planar(g, embedding=False, kuratowski=False):
.. [boost-planarity] http://www.boost.org/libs/graph/doc/boyer_myrvold.html
"""
g
.
stash_filter
(
directed
=
True
)
g
.
set_directed
(
False
)
u
=
GraphView
(
g
,
directed
=
False
)
if
embedding
:
embed
=
g
.
new_vertex_property
(
"vector<int>"
)
...
...
@@ -1524,12 +1516,9 @@ def is_planar(g, embedding=False, kuratowski=False):
else
:
kur
=
None
try
:
is_planar
=
libgraph_tool_topology
.
is_planar
(
g
.
_Graph__graph
,
_prop
(
"v"
,
g
,
embed
),
_prop
(
"e"
,
g
,
kur
))
finally
:
g
.
pop_filter
(
directed
=
True
)
is_planar
=
libgraph_tool_topology
.
is_planar
(
u
.
_Graph__graph
,
_prop
(
"v"
,
g
,
embed
),
_prop
(
"e"
,
g
,
kur
))
ret
=
[
is_planar
]
if
embed
is
not
None
:
...
...
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