diff --git a/tools/2d_feature_extraction/2d_feature_extraction.xml b/tools/2d_feature_extraction/2d_feature_extraction.xml index bef49067..64d8b670 100644 --- a/tools/2d_feature_extraction/2d_feature_extraction.xml +++ b/tools/2d_feature_extraction/2d_feature_extraction.xml @@ -37,7 +37,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + diff --git a/tools/2d_feature_extraction/test-data/output/input11.tsv b/tools/2d_feature_extraction/test-data/output/input11.tsv index 60f530c1..bfd8df84 100644 --- a/tools/2d_feature_extraction/test-data/output/input11.tsv +++ b/tools/2d_feature_extraction/test-data/output/input11.tsv @@ -1,2 +1,2 @@ area mean_intensity perimeter -20825.0 129.36364945978391 590.399061660723 +20825.0 129.3636[0-9]+ 590.3990[0-9]+ diff --git a/tools/2d_feature_extraction/test-data/output/input12.tsv b/tools/2d_feature_extraction/test-data/output/input12.tsv index c988101b..9ac7f329 100644 --- a/tools/2d_feature_extraction/test-data/output/input12.tsv +++ b/tools/2d_feature_extraction/test-data/output/input12.tsv @@ -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 diff --git a/tools/2d_feature_extraction/test-data/output/input13-axis_major_length.tsv b/tools/2d_feature_extraction/test-data/output/input13-axis_major_length.tsv index 8cb03ad6..5f2833a4 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-axis_major_length.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-axis_major_length.tsv @@ -1,3 +1,3 @@ axis_major_length -57.723478758647246 -57.723478758647246 +57.7234[0-9]+ +57.7234[0-9]+ diff --git a/tools/2d_feature_extraction/test-data/output/input13-axis_minor_length.tsv b/tools/2d_feature_extraction/test-data/output/input13-axis_minor_length.tsv index a1efab28..48a871dd 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-axis_minor_length.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-axis_minor_length.tsv @@ -1,3 +1,3 @@ axis_minor_length -57.723478758647246 -57.723478758647246 +57.7234[0-9]+ +57.7234[0-9]+ diff --git a/tools/2d_feature_extraction/test-data/output/input13-bbox.tsv b/tools/2d_feature_extraction/test-data/output/input13-bbox.tsv index 418ce567..1af5e045 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-bbox.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-bbox.tsv @@ -1,3 +1,3 @@ bbox -[50, 60, 100, 110] -[150, 160, 200, 210] +\[50, 60, 100, 110\] +\[150, 160, 200, 210\] diff --git a/tools/2d_feature_extraction/test-data/output/input13-centroid.tsv b/tools/2d_feature_extraction/test-data/output/input13-centroid.tsv index b1310794..28ffa388 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-centroid.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-centroid.tsv @@ -1,3 +1,3 @@ centroid -[74.5, 84.5] -[174.5, 184.5] +\[74.5, 84.5\] +\[174.5, 184.5\] diff --git a/tools/2d_feature_extraction/test-data/output/input13-equivalent_diameter_area.tsv b/tools/2d_feature_extraction/test-data/output/input13-equivalent_diameter_area.tsv index c11fdac5..d28aa12f 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-equivalent_diameter_area.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-equivalent_diameter_area.tsv @@ -1,3 +1,3 @@ equivalent_diameter_area -56.41895835477563 -56.41895835477563 +56.4189[0-9]+ +56.4189[0-9]+ diff --git a/tools/2d_feature_extraction/test-data/output/input13-inertia_tensor_eigvals.tsv b/tools/2d_feature_extraction/test-data/output/input13-inertia_tensor_eigvals.tsv index 5e2ad7a1..c2d06151 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-inertia_tensor_eigvals.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-inertia_tensor_eigvals.tsv @@ -1,3 +1,3 @@ inertia_tensor_eigvals -[208.25, 208.25] -[208.25, 208.25] +\[208.25, 208.25\] +\[208.25, 208.25\] diff --git a/tools/2d_feature_extraction/test-data/output/input13-moments.tsv b/tools/2d_feature_extraction/test-data/output/input13-moments.tsv index 6020a26f..ad778bc1 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-moments.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-moments.tsv @@ -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\]\] diff --git a/tools/2d_feature_extraction/test-data/output/input13-moments_hu.tsv b/tools/2d_feature_extraction/test-data/output/input13-moments_hu.tsv index f1d6252c..faa2f790 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-moments_hu.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-moments_hu.tsv @@ -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\] diff --git a/tools/2d_feature_extraction/test-data/output/input13-orientation.tsv b/tools/2d_feature_extraction/test-data/output/input13-orientation.tsv index 87896115..7e8dcd04 100644 --- a/tools/2d_feature_extraction/test-data/output/input13-orientation.tsv +++ b/tools/2d_feature_extraction/test-data/output/input13-orientation.tsv @@ -1,3 +1,3 @@ orientation --0.7853981633974483 --0.7853981633974483 +-0.7853[0-9]+ +-0.7853[0-9]+