diff options
Diffstat (limited to 'taskflow/patterns')
| -rw-r--r-- | taskflow/patterns/graph_flow.py | 11 | ||||
| -rw-r--r-- | taskflow/patterns/linear_flow.py | 6 | ||||
| -rw-r--r-- | taskflow/patterns/unordered_flow.py | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/taskflow/patterns/graph_flow.py b/taskflow/patterns/graph_flow.py index ea45f85..52c8178 100644 --- a/taskflow/patterns/graph_flow.py +++ b/taskflow/patterns/graph_flow.py @@ -224,7 +224,7 @@ class Flow(flow.Flow): retry_provides.add(value) provided[value].append(self._retry) - for node in self._graph.nodes_iter(): + for node in self._graph.nodes: for value in self._unsatisfied_requires(node, self._graph, retry_provides): required[value].append(node) @@ -292,12 +292,12 @@ class Flow(flow.Flow): yield n def iter_links(self): - return self._get_subgraph().edges_iter(data=True) + return self._get_subgraph().edges(data=True) def iter_nodes(self): g = self._get_subgraph() for n in g.topological_sort(): - yield n, g.node[n] + yield n, g.nodes[n] @property def requires(self): @@ -307,7 +307,7 @@ class Flow(flow.Flow): requires.update(self._retry.requires) retry_provides.update(self._retry.provides) g = self._get_subgraph() - for node in g.nodes_iter(): + for node in g.nodes: requires.update(self._unsatisfied_requires(node, g, retry_provides)) return frozenset(requires) @@ -367,6 +367,7 @@ class TargetedFlow(Flow): return self._graph nodes = [self._target] nodes.extend(self._graph.bfs_predecessors_iter(self._target)) - self._subgraph = gr.DiGraph(data=self._graph.subgraph(nodes)) + self._subgraph = gr.DiGraph( + incoming_graph_data=self._graph.subgraph(nodes)) self._subgraph.freeze() return self._subgraph diff --git a/taskflow/patterns/linear_flow.py b/taskflow/patterns/linear_flow.py index 747f4d2..d12904d 100644 --- a/taskflow/patterns/linear_flow.py +++ b/taskflow/patterns/linear_flow.py @@ -55,7 +55,7 @@ class Flow(flow.Flow): return len(self._graph) def __iter__(self): - for item in self._graph.nodes_iter(): + for item in self._graph.nodes: yield item @property @@ -71,9 +71,9 @@ class Flow(flow.Flow): return frozenset(requires) def iter_nodes(self): - for (n, n_data) in self._graph.nodes_iter(data=True): + for (n, n_data) in self._graph.nodes(data=True): yield (n, n_data) def iter_links(self): - for (u, v, e_data) in self._graph.edges_iter(data=True): + for (u, v, e_data) in self._graph.edges(data=True): yield (u, v, e_data) diff --git a/taskflow/patterns/unordered_flow.py b/taskflow/patterns/unordered_flow.py index 3de005c..58fb5c0 100644 --- a/taskflow/patterns/unordered_flow.py +++ b/taskflow/patterns/unordered_flow.py @@ -44,11 +44,11 @@ class Flow(flow.Flow): yield item def iter_links(self): - for (u, v, e_data) in self._graph.edges_iter(data=True): + for (u, v, e_data) in self._graph.edges(data=True): yield (u, v, e_data) def iter_nodes(self): - for n, n_data in self._graph.nodes_iter(data=True): + for n, n_data in self._graph.nodes(data=True): yield (n, n_data) @property |