Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions igf_data/utils/cosmxutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ def fov_range_to_list(fov_range: str) -> List[int]:
"""
try:
range_list = list()
if "," in fov_range:
range_list = fov_range.split(",")
range_list = [int(i) for i in range_list]
return range_list
range_match = re.match(r'^(\d+)-(\d+)$', fov_range)
if range_match:
start, end = map(int, range_match.groups())
Expand Down
14 changes: 13 additions & 1 deletion test/utils/test_cosmxutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
create_or_update_cosmx_slide_fov_annotation,
create_cosmx_slide_fov_count_qc,
validate_cosmx_count_file,
CosmxSlideType
CosmxSlideType,
fov_range_to_list
)

class Analysisadaptor_test1(unittest.TestCase):
Expand Down Expand Up @@ -403,5 +404,16 @@ def test_create_or_update_cosmx_slide_fov_count_qc(self):
self.assertEqual(str(results[2]), '76.45')
base.close_session()

def test_fov_range_to_list(self):
range_list = fov_range_to_list(fov_range="1-10")
assert isinstance(range_list, list)
assert len(range_list) == 10
assert 10 in range_list
range_list = fov_range_to_list(fov_range="1,2,3,4,5")
assert isinstance(range_list, list)
assert len(range_list) == 5
assert 5 in range_list


if __name__ == '__main__':
unittest.main()