Skip to content

Update ip_2d_feature_extraction: Fix remaining tests (add fp tolerance via regex) #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kostrykin merged 1 commit into from
Jan 5, 2026
Merged

Update ip_2d_feature_extraction: Fix remaining tests (add fp tolerance via regex) #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tools/2d_feature_extraction/2d_feature_extraction.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<param name="intensities" value="input/input1_uint8.tiff"/>
<param name="features" value="@FEATURE@"/>
</conditional>
<output name="output" ftype="tabular" value="output/input13-@FEATURE@.tsv"/>
<output name="output" ftype="tabular" value="output/input13-@FEATURE@.tsv" compare="re_match"/>
</test>
</xml>
</macros>
Expand Down Expand Up @@ -132,7 +132,7 @@
<param name="mode" value="without-intensities"/>
<param name="features" value="label,area,area_convex,solidity"/>
</conditional>
<output name="output" ftype="tabular" value="output/input12.tsv"/>
<output name="output" ftype="tabular" value="output/input12.tsv" compare="re_match"/>
</test>
<test>
<param name="labels" value="input/input11.tiff"/>
Expand All @@ -141,7 +141,7 @@
<param name="intensities" value="input/input1_uint8.tiff"/>
<param name="features" value="area,mean_intensity,perimeter"/>
</conditional>
<output name="output" ftype="tabular" value="output/input11.tsv"/>
<output name="output" ftype="tabular" value="output/input11.tsv" compare="re_match"/>
</test>
<!-- Single-channel 2-D Zarr (isolated features, verify that Dask arrays are converted to NumPy arrays whenever necessary) -->
<expand macro="zarr-isolated-feature-test" feature="area"/>
Expand Down
2 changes: 1 addition & 1 deletion tools/2d_feature_extraction/test-data/output/input11.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
area mean_intensity perimeter
20825.0 129.36364945978391 590.399061660723
20825.0 129.3636[0-9]+ 590.3990[0-9]+
18 changes: 9 additions & 9 deletions tools/2d_feature_extraction/test-data/output/input12.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
label area area_convex solidity
1 28.0 29.0 0.9655172413793104
1 28.0 29.0 0.9655[0-9]+
2 17.0 17.0 1.0
3 9.0 9.0 1.0
4 15.0 15.0 1.0
5 23.0 26.0 0.8846153846153846
5 23.0 26.0 0.8846[0-9]+
6 21.0 21.0 1.0
7 11.0 11.0 1.0
8 60.0 80.0 0.75
9 58.0 86.0 0.6744186046511628
9 58.0 86.0 0.6744[0-9]+
10 22.0 22.0 1.0
11 2.0 2.0 1.0
12 41.0 42.0 0.9761904761904762
13 74.0 102.0 0.7254901960784313
12 41.0 42.0 0.9761[0-9]+
13 74.0 102.0 0.7254[0-9]+
14 9.0 9.0 1.0
15 8.0 8.0 1.0
16 27.0 28.0 0.9642857142857143
16 27.0 28.0 0.9642[0-9]+
17 6.0 6.0 1.0
18 61.0 73.0 0.8356164383561644
19 55.0 72.0 0.7638888888888888
20 18.0 23.0 0.782608695652174
18 61.0 73.0 0.8356[0-9]+
19 55.0 72.0 0.7638[0-9]+
20 18.0 23.0 0.7826[0-9]+
21 1.0 1.0 1.0
22 4.0 4.0 1.0
23 10.0 10.0 1.0
Expand Down
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-axis_major_length.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
axis_major_length
57.723478758647246
57.723478758647246
57.7234[0-9]+
57.7234[0-9]+
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-axis_minor_length.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
axis_minor_length
57.723478758647246
57.723478758647246
57.7234[0-9]+
57.7234[0-9]+
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-bbox.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bbox
[50, 60, 100, 110]
[150, 160, 200, 210]
\[50, 60, 100, 110\]
\[150, 160, 200, 210\]
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-centroid.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
centroid
[74.5, 84.5]
[174.5, 184.5]
\[74.5, 84.5\]
\[174.5, 184.5\]
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-equivalent_diameter_area.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
equivalent_diameter_area
56.41895835477563
56.41895835477563
56.4189[0-9]+
56.4189[0-9]+
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-inertia_tensor_eigvals.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
inertia_tensor_eigvals
[208.25, 208.25]
[208.25, 208.25]
\[208.25, 208.25\]
\[208.25, 208.25\]
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-moments.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
moments
[[2500.0, 61250.0, 2021250.0, 75031250.0], [61250.0, 1500625.0, 49520625.0, 1838265625.0], [2021250.0, 49520625.0, 1634180625.0, 60662765625.0], [75031250.0, 1838265625.0, 60662765625.0, 2251875390625.0]]
[[2500.0, 61250.0, 2021250.0, 75031250.0], [61250.0, 1500625.0, 49520625.0, 1838265625.0], [2021250.0, 49520625.0, 1634180625.0, 60662765625.0], [75031250.0, 1838265625.0, 60662765625.0, 2251875390625.0]]
\[\[2500.0, 61250.0, 2021250.0, 75031250.0\], \[61250.0, 1500625.0, 49520625.0, 1838265625.0\], \[2021250.0, 49520625.0, 1634180625.0, 60662765625.0\], \[75031250.0, 1838265625.0, 60662765625.0, 2251875390625.0\]\]
\[\[2500.0, 61250.0, 2021250.0, 75031250.0\], \[61250.0, 1500625.0, 49520625.0, 1838265625.0\], \[2021250.0, 49520625.0, 1634180625.0, 60662765625.0\], \[75031250.0, 1838265625.0, 60662765625.0, 2251875390625.0\]\]
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-moments_hu.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
moments_hu
[0.1666, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
[0.1666, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
\[0.1666, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0\]
\[0.1666, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0\]
4 changes: 2 additions & 2 deletions tools/2d_feature_extraction/test-data/output/input13-orientation.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
orientation
-0.7853981633974483
-0.7853981633974483
-0.7853[0-9]+
-0.7853[0-9]+