mirrors/mim
1
0
Fork 0
mirror of https://github.com/open-mmlab/mim.git synced 2025-06-03 14:59:11 +08:00
Code Issues Projects Releases Wiki Activity

[Enhancement] Support full match (#79)

Browse Source
This commit is contained in:
Zaida Zhou 2021-09-07 21:49:25 +08:00 committed by GitHub
parent c156e060ee
commit dd97fdf226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mim/commands/search.py
View File

@ -564,18 +564,21 @@ def sort_by(dataframe: DataFrame,
matched_fields = [] matched_fields = []
invalid_fields = set() invalid_fields = set()
for input_field in input_fields: for input_field in input_fields:
contain_index = valid_fields.str.contains(input_field) if any(valid_fields.isin([input_field])):
contain_fields = valid_fields[contain_index] matched_fields.append(input_field)
if len(contain_fields) == 1:
matched_fields.extend(contain_fields)
elif len(contain_fields) > 2:
raise ValueError(
highlighted_error(
f'{input_field} matchs {contain_fields}. However, '
'the number of matched fields should be 1, but got'
f' {len(contain_fields)}.'))
else: else:
invalid_fields.add(input_field) contain_index = valid_fields.str.contains(input_field)
contain_fields = valid_fields[contain_index]
if len(contain_fields) == 1:
matched_fields.extend(contain_fields)
elif len(contain_fields) > 2:
raise ValueError(
highlighted_error(
f'{input_field} matchs {contain_fields}. However, '
'the number of matched fields should be 1, but got'
f' {len(contain_fields)}.'))
else:
invalid_fields.add(input_field)
return matched_fields, invalid_fields return matched_fields, invalid_fields
if sorted_fields is None: if sorted_fields is None:
@ -620,14 +623,17 @@ def select_by(dataframe: DataFrame,
# not consistent with the input_fields # not consistent with the input_fields
seen_fields = set() seen_fields = set()
for input_field in input_fields: for input_field in input_fields:
contain_index = valid_fields.str.contains(input_field) if any(valid_fields.isin([input_field])):
contain_fields = valid_fields[contain_index] matched_fields.append(input_field)
if len(contain_fields) > 0:
matched_fields.extend(
field for field in (set(contain_fields) - seen_fields))
seen_fields.update(set(contain_fields))
else: else:
invalid_fields.add(input_field) contain_index = valid_fields.str.contains(input_field)
contain_fields = valid_fields[contain_index]
if len(contain_fields) > 0:
matched_fields.extend(
field for field in (set(contain_fields) - seen_fields))
seen_fields.update(set(contain_fields))
else:
invalid_fields.add(input_field)
return matched_fields, invalid_fields return matched_fields, invalid_fields
if shown_fields is None and unshown_fields is None: if shown_fields is None and unshown_fields is None: