Skip to content

Commit

Permalink
update delimiter to match looptrace
Browse files Browse the repository at this point in the history
  • Loading branch information
@vreuter
vreuter committed Nov 27, 2024
1 parent 889bd29 commit 0440381
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.4.0] - 2024-11-27

### Changed
* Updated expected _intra_-field, _inter_-value delimiter to match changes in `looptrace`

## [v0.3.2] - 2024-11-21

### Changed
Expand Down
2 changes: 1 addition & 1 deletion looptrace_regionals_vis/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from numpydoc_decorator import doc # type: ignore[import-untyped]

__version__ = "0.3.2"
__version__ = "0.4.0"

_PACKAGE_NAME = package = Path(__file__).parent.name

Expand Down
14 changes: 7 additions & 7 deletions looptrace_regionals_vis/examples/P0001_rois.proximity_rejected.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
index,fieldOfView,timepoint,spotChannel,zc,yc,xc,intensityMean,zMin,zMax,yMin,yMax,xMin,xMax,tooCloseRois
0,P0001.zarr,79,0,3.907628987532479,231.9874778925304,871.9833511648726,118.26726920593931,-2.092371012467521,9.90762898753248,219.9874778925304,243.9874778925304,859.9833511648726,883.9833511648726,1;2
1,P0001.zarr,79,0,17.994259347453493,24.042015416774795,1360.0069098862991,117.13946884917321,11.994259347453493,23.994259347453493,12.042015416774795,36.042015416774795,1348.0069098862991,1372.0069098862991,0;2
2,P0001.zarr,79,0,23.009102422189756,231.98008711401275,871.9596645390719,116.14075915047447,17.009102422189756,29.009102422189756,219.98008711401275,243.98008711401275,859.9596645390719,883.9596645390719,0;1
0,P0001.zarr,79,0,3.907628987532479,231.9874778925304,871.9833511648726,118.26726920593931,-2.092371012467521,9.90762898753248,219.9874778925304,243.9874778925304,859.9833511648726,883.9833511648726,1 2
1,P0001.zarr,79,0,17.994259347453493,24.042015416774795,1360.0069098862991,117.13946884917321,11.994259347453493,23.994259347453493,12.042015416774795,36.042015416774795,1348.0069098862991,1372.0069098862991,0 2
2,P0001.zarr,79,0,23.009102422189756,231.98008711401275,871.9596645390719,116.14075915047447,17.009102422189756,29.009102422189756,219.98008711401275,243.98008711401275,859.9596645390719,883.9596645390719,0 1
3,P0001.zarr,79,0,16.527137137619988,422.5165732477932,667.2129969610728,157.0530303030303,10.527137137619988,22.527137137619988,410.5165732477932,434.5165732477932,655.2129969610728,679.2129969610728,8
4,P0001.zarr,79,0,16.950424004488077,118.88259896330818,349.6540530977019,161.81065410400436,10.950424004488077,22.950424004488077,106.88259896330818,130.88259896330817,337.6540530977019,361.6540530977019,5;6;7
5,P0001.zarr,79,0,18.177805530982404,445.45646697850475,607.9657421380375,160.33961681087763,12.177805530982404,24.177805530982404,433.45646697850475,457.45646697850475,595.9657421380375,619.9657421380375,4;6;7
6,P0001.zarr,79,0,17.83959674876146,1006.0753359579252,306.5263466292306,160.1254275940707,11.839596748761458,23.83959674876146,994.0753359579252,1018.0753359579252,294.5263466292306,318.5263466292306,4;5;7
7,P0001.zarr,79,0,17.70877472362621,1040.482813665982,290.6567022086824,163.12094117647058,11.70877472362621,23.70877472362621,1028.482813665982,1052.482813665982,278.6567022086824,302.6567022086824,4;5;6
4,P0001.zarr,79,0,16.950424004488077,118.88259896330818,349.6540530977019,161.81065410400436,10.950424004488077,22.950424004488077,106.88259896330818,130.88259896330817,337.6540530977019,361.6540530977019,5 6 7
5,P0001.zarr,79,0,18.177805530982404,445.45646697850475,607.9657421380375,160.33961681087763,12.177805530982404,24.177805530982404,433.45646697850475,457.45646697850475,595.9657421380375,619.9657421380375,4 6 7
6,P0001.zarr,79,0,17.83959674876146,1006.0753359579252,306.5263466292306,160.1254275940707,11.839596748761458,23.83959674876146,994.0753359579252,1018.0753359579252,294.5263466292306,318.5263466292306,4 5 7
7,P0001.zarr,79,0,17.70877472362621,1040.482813665982,290.6567022086824,163.12094117647058,11.70877472362621,23.70877472362621,1028.482813665982,1052.482813665982,278.6567022086824,302.6567022086824,4 5 6
8,P0001.zarr,79,0,17.294947508199503,1701.3423124347908,1665.0076588607058,152.65736930345983,11.294947508199503,23.294947508199503,1689.3423124347908,1713.3423124347908,1653.0076588607058,1677.0076588607058,3
10 changes: 5 additions & 5 deletions looptrace_regionals_vis/examples/P0001_rois.with_trace_ids.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
index,fieldOfView,timepoint,spotChannel,zc,yc,xc,intensityMean,zMin,zMax,yMin,yMax,xMin,xMax,mergePartners,nucleusNumber,traceId,tracePartners
3,P0001.zarr,79,0,16.527137137619988,422.5165732477932,667.2129969610728,157.0530303030303,10.527137137619988,22.527137137619988,410.5165732477932,434.5165732477932,655.2129969610728,679.2129969610728,100;101,3,13,5
3,P0001.zarr,79,0,16.527137137619988,422.5165732477932,667.2129969610728,157.0530303030303,10.527137137619988,22.527137137619988,410.5165732477932,434.5165732477932,655.2129969610728,679.2129969610728,100 101,3,13,5
4,P0001.zarr,79,0,16.950424004488077,118.88259896330818,349.6540530977019,161.81065410400436,10.950424004488076,22.95042400448808,106.88259896330818,130.88259896330817,337.6540530977019,361.6540530977019,,2,14,
5,P0001.zarr,79,0,18.177805530982404,445.4564669785048,607.9657421380375,160.33961681087763,12.177805530982404,24.177805530982404,433.4564669785048,457.4564669785048,595.9657421380375,619.9657421380375,,3,13,3
6,P0001.zarr,79,0,17.83959674876146,1006.0753359579252,306.5263466292306,160.1254275940707,11.839596748761458,23.83959674876146,994.0753359579252,1018.0753359579252,294.5263466292306,318.5263466292306,102;110,7,16,7;12
7,P0001.zarr,79,0,17.70877472362621,1040.482813665982,290.6567022086824,163.12094117647058,11.70877472362621,23.70877472362621,1028.482813665982,1052.482813665982,278.6567022086824,302.6567022086824,,7,16,6;12
6,P0001.zarr,79,0,17.83959674876146,1006.0753359579252,306.5263466292306,160.1254275940707,11.839596748761458,23.83959674876146,994.0753359579252,1018.0753359579252,294.5263466292306,318.5263466292306,102 110,7,16,7 12
7,P0001.zarr,79,0,17.70877472362621,1040.482813665982,290.6567022086824,163.12094117647058,11.70877472362621,23.70877472362621,1028.482813665982,1052.482813665982,278.6567022086824,302.6567022086824,,7,16,6 12
8,P0001.zarr,79,0,17.294947508199503,1701.3423124347908,1665.0076588607058,152.65736930345983,11.294947508199504,23.294947508199503,1689.3423124347908,1713.3423124347908,1653.0076588607058,1677.0076588607058,,4,17,
10,P0001.zarr,79,0,18.5289337545209,28.24453371789589,1634.215648033695,149.63521150882,12.5289337545209,24.5289337545209,16.244533717895894,40.24453371789589,1622.215648033695,1646.215648033695,,0,18,
11,P0001.zarr,79,0,18.266489401564822,533.7770489058973,1747.1225533182217,159.3707150612688,12.266489401564826,24.266489401564822,521.7770489058973,545.7770489058973,1735.1225533182217,1759.1225533182217,121;131,4,19,
12,P0001.zarr,79,0,18.09858176406764,863.1257478224696,984.5327240679828,146.90628445424477,12.09858176406764,24.09858176406764,851.1257478224696,875.1257478224696,972.5327240679828,996.5327240679828,,5,16,6;7
11,P0001.zarr,79,0,18.266489401564822,533.7770489058973,1747.1225533182217,159.3707150612688,12.266489401564826,24.266489401564822,521.7770489058973,545.7770489058973,1735.1225533182217,1759.1225533182217,121 131,4,19,
12,P0001.zarr,79,0,18.09858176406764,863.1257478224696,984.5327240679828,146.90628445424477,12.09858176406764,24.09858176406764,851.1257478224696,875.1257478224696,972.5327240679828,996.5327240679828,,5,16,6 7
2 changes: 1 addition & 1 deletion looptrace_regionals_vis/reader.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def _parse_roi_ids_field(
row: pd.Series, # type: ignore[type-arg]
*,
key: str,
intra_field_delimiter: str = ";",
intra_field_delimiter: str = " ",
) -> set[RoiId]:
raw_value: object = row[key]
result: set[RoiId]
Expand Down

0 comments on commit 0440381

Please sign in to comment.