Lubuntu
/
britney2-ubuntu
mirror of https://github.com/lubuntu-team/britney2-ubuntu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inst-tester: Move loop into resolve_choices

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
master
Niels Thykier 9 years ago
parent 97663ebaab
commit dceca2c666
1 changed files with 63 additions and 61 deletions
Show Stats Download Patch File Download Diff File

124
installability/tester.py
Unescape View File

@ -328,7 +328,7 @@ class InstallabilityTester(object):
# #
# * A package is installable if never and musts are disjointed # * A package is installable if never and musts are disjointed
# and both check and choices are empty. # and both check and choices are empty.
# - exception: resolve_choice may determine the installability # - exception: resolve_choices may determine the installability
# of t via recursion (calls _check_inst). In this case # of t via recursion (calls _check_inst). In this case
# check and choices are not (always) empty. # check and choices are not (always) empty.
@ -403,12 +403,12 @@ class InstallabilityTester(object):
verdict = False verdict = False
break break
while not check and rebuild: if not check and rebuild:
# We have to "guess" now, which is always fun, but not cheap. We # We have to "guess" now, which is always fun, but not cheap. We
# stop guessing: # stop guessing:
# - once we run out of choices to make (obviously), OR # - once we run out of choices to make (obviously), OR
# - if one of the choices exhaust all but one option # - if one of the choices exhaust all but one option
if self.resolve_choice(check, musts, never, rebuild): if self.resolve_choices(check, musts, never, rebuild):
# The recursive call have already updated the # The recursive call have already updated the
# cache so there is not point in doing it again. # cache so there is not point in doing it again.
return True return True
@ -423,73 +423,75 @@ class InstallabilityTester(object):
return verdict return verdict
def resolve_choice(self, check, musts, never, choices): def resolve_choices(self, check, musts, never, choices):
universe = self._universe universe = self._universe
testing = self._testing testing = self._testing
eqv_table = self._eqv_table eqv_table = self._eqv_table
stats = self._stats stats = self._stats
cbroken = self._cache_broken cbroken = self._cache_broken
choice = iter(choices.pop()) while choices:
last = next(choice) # pick one to go last choice_options = choices.pop()
for p in choice:
musts_copy = musts.copy() choice = iter(choice_options)
never_tmp = set() last = next(choice) # pick one to go last
choices_tmp = set() solved = False
check_tmp = set([p]) for p in choice:
if not self._check_loop(universe, testing, eqv_table, musts_copy = musts.copy()
stats, musts_copy, never_tmp, never_tmp = set()
cbroken, choices_tmp, choices_tmp = set()
check_tmp): check_tmp = set([p])
# p cannot be chosen/is broken (unlikely, but ...) if not self._check_loop(universe, testing, eqv_table,
continue stats, musts_copy, never_tmp,
cbroken, choices_tmp,
# Test if we can pick p without any consequences. check_tmp):
# - when we can, we avoid a backtrack point. # p cannot be chosen/is broken (unlikely, but ...)
if never_tmp <= never and choices_tmp <= choices: continue
# we can pick p without picking up new conflicts
# or unresolved choices. Therefore we commit to
# using p.
#
# NB: Optimally, we would go to the start of this
# routine, but to conserve stack-space, we return
# and expect to be called again later.
musts.update(musts_copy)
stats.choice_resolved_without_restore_point += 1
return False
if not musts.isdisjoint(never_tmp): # Test if we can pick p without any consequences.
# If we pick p, we will definitely end up making # - when we can, we avoid a backtrack point.
# t uninstallable, so p is a no-go. if never_tmp <= never and choices_tmp <= choices:
continue # we can pick p without picking up new conflicts
# or unresolved choices. Therefore we commit to
# using p.
musts.update(musts_copy)
stats.choice_resolved_without_restore_point += 1
solved = True
break
stats.backtrace_restore_point_created += 1 if not musts.isdisjoint(never_tmp):
# We are not sure that p is safe, setup a backtrack # If we pick p, we will definitely end up making
# point and recurse. # t uninstallable, so p is a no-go.
never_tmp |= never continue
choices_tmp |= choices
if self._check_inst(p, musts_copy, never_tmp,
choices_tmp):
# Success, p was a valid choice and made it all
# installable
return True
# If we get here, we failed to find something that stats.backtrace_restore_point_created += 1
# would satisfy choice (without breaking the # We are not sure that p is safe, setup a backtrack
# installability of t). This means p cannot be used # point and recurse.
# to satisfy the dependencies, so pretend to conflict never_tmp |= never
# with it - hopefully it will reduce future choices. choices_tmp |= choices
never.add(p) if self._check_inst(p, musts_copy, never_tmp,
stats.backtrace_restore_point_used += 1 choices_tmp):
# Success, p was a valid choice and made it all
# Optimization for the last case; avoid the recursive call # installable
# and just assume the last will lead to a solution. If it return True
# doesn't there is no solution and if it does, we don't
# have to back-track anyway. # If we get here, we failed to find something that
check.add(last) # would satisfy choice (without breaking the
musts.add(last) # installability of t). This means p cannot be used
stats.backtrace_last_option += 1 # to satisfy the dependencies, so pretend to conflict
return False # with it - hopefully it will reduce future choices.
never.add(p)
stats.backtrace_restore_point_used += 1
if not solved:
# Optimization for the last case; avoid the recursive call
# and just assume the last will lead to a solution. If it
# doesn't there is no solution and if it does, we don't
# have to back-track anyway.
check.add(last)
musts.add(last)
stats.backtrace_last_option += 1
return False
def _check_loop(self, universe, testing, eqv_table, stats, musts, never, def _check_loop(self, universe, testing, eqv_table, stats, musts, never,
cbroken, choices, check, len=len, cbroken, choices, check, len=len,

Write Preview
Loading…
Cancel
Save