Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-10 01:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

solver: Refactor out a function to avoid duplicated code

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2019-01-19 18:33:23 +00:00
parent af20634b12
commit 2ed6161b49
No known key found for this signature in database
GPG Key ID: A65B78DBE67C7AAC
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
britney2/installability/solver.py
View File

@ -34,6 +34,19 @@ def compute_scc(graph):
low = {} low = {}
node_stack = [] node_stack = []
def _cannot_be_a_scc(graph_node):
if not graph[graph_node]['before'] or not graph[graph_node]['after']:
# Short-cut obviously isolated component
result.append((graph_node,))
# Set the item number so high that no other item might
# mistakenly assume that they can form a component via
# this item.
# (Replaces the "is w on the stack check" for us from
# the original algorithm)
low[graph_node] = len(graph) + 1
return True
return False
def _handle_succ(parent, parent_num, successors_remaining): def _handle_succ(parent, parent_num, successors_remaining):
while successors_remaining: while successors_remaining:
succ = successors_remaining.pop() succ = successors_remaining.pop()
@ -46,15 +59,7 @@ def compute_scc(graph):
continue continue
# It cannot be a part of a SCC if it does not have depends # It cannot be a part of a SCC if it does not have depends
# or reverse depends. # or reverse depends.
if not graph[succ]['before'] or not graph[succ]['after']: if _cannot_be_a_scc(succ):
# Short-cut obviously isolated component
result.append((succ,))
# Set the item number so high that no other item might
# mistakenly assume that they can form a component via
# this item.
# (Replaces the "is w on the stack check" for us from
# the original algorithm)
low[succ] = len(graph) + 1
continue continue
succ_num = len(low) succ_num = len(low)
low[succ] = succ_num low[succ] = succ_num
@ -69,15 +74,7 @@ def compute_scc(graph):
continue continue
# It cannot be a part of a SCC if it does not have depends # It cannot be a part of a SCC if it does not have depends
# or reverse depends. # or reverse depends.
if not graph[n]['before'] or not graph[n]['after']: if _cannot_be_a_scc(n):
# Short-cut obviously isolated component
result.append((n,))
# Set the item number so high that no other item might
# mistakenly assume that they can form a component via
# this item.
# (Replaces the "is w on the stack check" for us from
# the original algorithm)
low[n] = len(graph) + 1
continue continue
root_num = len(low) root_num = len(low)