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

[core] Graph: raise error in dfs() with longestPathFirst

Browse source
This commit is contained in:
Julien-Haudegond 2020-09-02 12:37:40 +02:00
parent 5f444e6810
commit eb52459bbf
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
meshroom/core/graph.py
View file

@ -653,6 +653,11 @@ class Graph(BaseObject):
for u in self._nodes: for u in self._nodes:
colors[u] = WHITE colors[u] = WHITE
if longestPathFirst and reverse:
# Because we have no knowledge of the node's count between a node and its leaves,
# it is not possible to handle this case at the moment
raise NotImplementedError("Graph.dfs(): longestPathFirst=True and reverse=True are not compatible yet.")
nodes = startNodes or self.getLeaves() nodes = startNodes or self.getLeaves()
if longestPathFirst: if longestPathFirst:
@ -873,7 +878,7 @@ class Graph(BaseObject):
flowEdges.append(link) flowEdges.append(link)
return flowEdges return flowEdges
def nodesFromNode(self, startNode, filterTypes=None, reverse=True): def nodesFromNode(self, startNode, filterTypes=None, longestPathFirst=False, reverse=True):
""" """
Return the node chain from startNode to the graph leaves. Return the node chain from startNode to the graph leaves.
@ -881,6 +886,8 @@ class Graph(BaseObject):
startNode (Node): the node to start the visit from. startNode (Node): the node to start the visit from.
filterTypes (str list): (optional) only return the nodes of the given types filterTypes (str list): (optional) only return the nodes of the given types
(does not stop the visit, this is a post-process only) (does not stop the visit, this is a post-process only)
longestPathFirst (bool): (optional) if multiple paths, nodes belonging to
the longest one will be visited first.
reverse (bool): (optional) direction of visit. reverse (bool): (optional) direction of visit.
True is for getting nodes depending on the startNode. True is for getting nodes depending on the startNode.
False is for getting nodes required for the startNode. False is for getting nodes required for the startNode.
@ -897,7 +904,7 @@ class Graph(BaseObject):
visitor.discoverVertex = discoverVertex visitor.discoverVertex = discoverVertex
visitor.examineEdge = lambda edge, graph: edges.append(edge) visitor.examineEdge = lambda edge, graph: edges.append(edge)
self.dfs(visitor=visitor, startNodes=[startNode], reverse=reverse) self.dfs(visitor=visitor, startNodes=[startNode], longestPathFirst=longestPathFirst, reverse=reverse)
return nodes, edges return nodes, edges
def getInputNodes(self, node, recursive=False): def getInputNodes(self, node, recursive=False):