3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-03 11:21:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] Graph: change default reverse direction in dfsOnDiscover()

Browse source
This commit is contained in:
Julien-Haudegond 2020-09-04 12:42:05 +02:00
parent 208749d897
commit b567d8ff5c
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meshroom/core/graph.py
View file

@ -380,7 +380,7 @@ class Graph(BaseObject):
Returns:
OrderedDict[Node, Node]: the source->duplicate map
"""
srcNodes, srcEdges = self.dfsOnDiscover(startNodes=[fromNode])
srcNodes, srcEdges = self.dfsOnDiscover(startNodes=[fromNode], reverse=True)
# use OrderedDict to keep duplicated nodes creation order
duplicates = OrderedDict()
@ -714,9 +714,9 @@ class Graph(BaseObject):
self.dfs(visitor=visitor, startNodes=startNodes)
return nodes, edges
def dfsOnDiscover(self, startNodes, filterTypes=None, longestPathFirst=False, reverse=True):
def dfsOnDiscover(self, startNodes, filterTypes=None, longestPathFirst=False, reverse=False):
"""
Return the node chain from startNodes to the graph leaves.
Return the node chain from startNodes to the graph roots/leaves.
Args:
startNodes (Node list): the nodes to start the visit from.
@ -725,10 +725,10 @@ class Graph(BaseObject):
longestPathFirst (bool): (optional) if multiple paths, nodes belonging to
the longest one will be visited first.
reverse (bool): (optional) direction of visit.
True is for getting nodes depending on the startNode.
False is for getting nodes required for the startNode.
True is for getting nodes depending on the startNodes (to leaves).
False is for getting nodes required for the startNodes (to roots).
Returns:
The list of nodes and edges, from startNodes to the graph leaves following edges.
The list of nodes and edges, from startNodes to the graph roots/leaves following edges.
"""
nodes = []
edges = []
@ -1074,7 +1074,7 @@ class Graph(BaseObject):
See Also:
Graph.update, Graph.updateInternals, Graph.updateStatusFromCache
"""
nodes, edges = self.dfsOnDiscover(startNodes=[fromNode])
nodes, edges = self.dfsOnDiscover(startNodes=[fromNode], reverse=True)
for node in nodes:
node.dirty = True
@ -1098,7 +1098,7 @@ class Graph(BaseObject):
@Slot(Node)
def clearDataFrom(self, startNode):
for node in self.dfsOnDiscover(startNodes=[startNode])[0]:
for node in self.dfsOnDiscover(startNodes=[startNode], reverse=True)[0]:
node.clearData()
def iterChunksByStatus(self, status):