Skip to content

Commit

Permalink
fix logic finding (#112)
Browse files Browse the repository at this point in the history
Co-authored-by: J.R. Angevaare <joran.angevaare@gmail.com>
  • Loading branch information
JoranAngevaare and J.R. Angevaare committed Aug 9, 2023
1 parent 0f6a590 commit 3eb52b8
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions optim_esm_tools/analyze/find_matches.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ def find_matches(
seen[group] = defaultdict(list)
seen_members = seen[group]

if (
len(seen_members) == max_versions
and len(seen_members.get(version, [])) == max_members
):
if (len(seen_members) == max_versions and version not in seen_members) or len(
seen_members.get(version, [])
) == max_members:
continue # pragma: no cover
if required_file and required_file not in os.listdir(
candidate
Expand All @@ -107,13 +106,18 @@ def find_matches(
log.info(f'{candidate} is excluded')
continue
seen_members[version].append(candidate)
assert all(len(group) <= max_versions for group in seen.values())
assert all(
len(members) <= max_members
for group in seen.values()
for members in group.values()
)
result = [
folder
for group_dict in seen.values()
for versions in group_dict.values()
for folder in versions
]
assert len(result) <= max_members * max_versions
return result


Expand Down

0 comments on commit 3eb52b8

Please sign in to comment.