-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1002 from AFM-SPM/ns-rse/999-split-and-update-tests
Fixing all tests, required rebasing onto `main` and `ns-rse/994-unpin-topoly` to pull in updates to some unrelated tests.
- Loading branch information
Showing
10 changed files
with
157 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,7 +55,7 @@ dependencies = [ | |
| "snoop", | ||
| "tensorflow", | ||
| "tifffile", | ||
| "topoly==1.0.2", | ||
| "topoly", | ||
| "tqdm", | ||
| ] | ||
|
|
||
|
|
||
3 changes: 0 additions & 3 deletions
3
tests/resources/tracing/disordered_tracing/catenanes_disordered_tracing_grainstats.csv
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
tests/resources/tracing/disordered_tracing/catenanes_disordered_tracing_stats.csv
This file was deleted.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
tests/resources/tracing/disordered_tracing/rep_int_disordered_tracing_grainstats.csv
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
tests/resources/tracing/disordered_tracing/rep_int_disordered_tracing_stats.csv
This file was deleted.
Oops, something went wrong.
Binary file modified
BIN
-3 Bytes
(100%)
tests/resources/tracing/ordered_tracing/catenanes_ordered_tracing_data.pkl
Binary file not shown.
8 changes: 4 additions & 4 deletions
8
tests/resources/tracing/ordered_tracing/catenanes_ordered_tracing_molstats.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| ,image,grain_number,molecule_number,circular,topology,topology_flip,processing | ||
| 0,catenane,0,0,True,4^2_1,2^2_1,nodestats | ||
| 1,catenane,0,1,True,4^2_1,2^2_1,nodestats | ||
| 2,catenane,1,0,True,2^2_1,0_1U0_1,nodestats | ||
| 3,catenane,1,1,True,2^2_1,0_1U0_1,nodestats | ||
| 0,catenane,0,0,True,L4a1,L2a1,nodestats | ||
| 1,catenane,0,1,True,L4a1,L2a1,nodestats | ||
| 2,catenane,1,0,True,L2a1,0_1U0_1,nodestats | ||
| 3,catenane,1,1,True,L2a1,0_1U0_1,nodestats |
28 changes: 28 additions & 0 deletions
28
...test_outputs/test_disordered_tracing.test_trace_image_disordered_dataframes[catenane].out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| image grain_number grain_endpoints grain_junctions total_branch_lengths grain_width_mean | ||
| 0 test_image 0 0 14 5.7552e-07 4.3883e-09 | ||
| 1 test_image 1 0 12 5.7479e-07 4.4161e-09 | ||
| image grain_number branch_distance branch_type connected_segments mean_pixel_value stdev_pixel_value min_value median_value middle_value | ||
| 0 test_image 0 2.9858e+01 2 [1, 2, 6] 2.6683e+00 3.5767e-01 1.9935e+00 2.6465e+00 2.6744e+00 | ||
| 1 test_image 0 2.8645e+01 2 [0, 2, 6] 2.7290e+00 2.1545e-01 2.5507e+00 2.6838e+00 2.6580e+00 | ||
| 2 test_image 0 1.8683e+00 2 [0, 1, 3, 4] 4.0675e+00 1.6906e-01 3.7890e+00 4.1385e+00 4.1396e+00 | ||
| 3 test_image 0 1.4661e+02 2 [2, 4, 9] 2.6694e+00 2.9476e-01 1.2200e+00 2.7080e+00 2.9116e+00 | ||
| 4 test_image 0 2.6170e+01 2 [2, 3, 9] 2.8350e+00 3.4364e-01 2.5354e+00 2.7608e+00 2.7651e+00 | ||
| 5 test_image 0 2.2459e+02 2 [6, 7, 10, 11] 2.7010e+00 2.6534e-01 1.7874e+00 2.7330e+00 2.2574e+00 | ||
| 6 test_image 0 6.9504e+00 2 [0, 1, 5, 7] 3.6264e+00 6.4067e-01 2.5888e+00 3.8420e+00 3.8420e+00 | ||
| 7 test_image 0 3.1203e+01 2 [5, 6, 8, 11] 2.8436e+00 5.5729e-01 2.1307e+00 2.7052e+00 2.7530e+00 | ||
| 8 test_image 0 3.1287e+01 2 [7, 9, 10, 11] 2.7443e+00 3.8223e-01 2.4149e+00 2.6535e+00 2.4707e+00 | ||
| 9 test_image 0 5.5701e+00 2 [3, 4, 8, 10] 2.7309e+00 4.9010e-02 2.6526e+00 2.7379e+00 2.7495e+00 | ||
| 10 test_image 0 3.8188e+01 2 [5, 8, 9, 11] 2.7864e+00 1.5142e-01 2.4451e+00 2.7710e+00 2.6967e+00 | ||
| 11 test_image 0 4.5941e+00 2 [5, 7, 8, 10] 4.1266e+00 3.7134e-01 3.3511e+00 4.2387e+00 4.2387e+00 | ||
| 0 test_image 1 3.7700e+01 2 [1, 2, 3, 6] 2.7733e+00 1.3491e-01 2.4451e+00 2.7690e+00 2.7142e+00 | ||
| 1 test_image 1 2.2389e+02 2 [0, 2, 4, 9] 2.6966e+00 2.6111e-01 1.8203e+00 2.7314e+00 2.2744e+00 | ||
| 2 test_image 1 5.0821e+00 2 [0, 1, 3, 4] 4.0290e+00 4.6381e-01 3.0770e+00 4.1850e+00 4.1850e+00 | ||
| 3 test_image 1 3.1001e+01 2 [0, 2, 4, 6] 2.7462e+00 4.0205e-01 2.4439e+00 2.6516e+00 2.4439e+00 | ||
| 4 test_image 1 3.1405e+01 2 [1, 2, 3, 9] 2.8423e+00 5.6226e-01 2.1307e+00 2.6942e+00 2.7530e+00 | ||
| 5 test_image 1 1.4750e+02 2 [6, 7, 11] 2.6728e+00 2.9408e-01 1.2200e+00 2.7122e+00 2.9467e+00 | ||
| 6 test_image 1 5.7723e+00 2 [0, 3, 5, 7] 2.7226e+00 5.1362e-02 2.6526e+00 2.7128e+00 2.7181e+00 | ||
| 7 test_image 1 2.5682e+01 2 [5, 6, 11] 2.8513e+00 3.6310e-01 2.5354e+00 2.7618e+00 2.7705e+00 | ||
| 8 test_image 1 2.7871e+01 2 [9, 10, 11] 2.7169e+00 1.7984e-01 2.5507e+00 2.6864e+00 2.6580e+00 | ||
| 9 test_image 1 6.9504e+00 2 [1, 4, 8, 10] 3.6794e+00 5.9509e-01 2.6486e+00 3.8420e+00 3.8420e+00 | ||
| 10 test_image 1 2.9370e+01 2 [8, 9, 11] 2.6403e+00 3.1060e-01 1.9935e+00 2.6483e+00 2.6828e+00 | ||
| 11 test_image 1 2.5584e+00 2 [5, 7, 8, 10] 3.9748e+00 2.3924e-01 3.6041e+00 4.0751e+00 4.0751e+00 |
15 changes: 15 additions & 0 deletions
15
...t_disordered_tracing.test_trace_image_disordered_dataframes[replication_intermediate].out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| image grain_number grain_endpoints grain_junctions total_branch_lengths grain_width_mean | ||
| 0 test_image 0 0 13 9.6852e-07 3.0318e-09 | ||
| image grain_number branch_distance branch_type connected_segments mean_pixel_value stdev_pixel_value min_value median_value middle_value | ||
| 0 test_image 0 1.7269e+02 2 [1, 2, 3, 8] 2.1474e+00 1.8580e-01 1.4118e+00 2.1479e+00 2.1939e+00 | ||
| 1 test_image 0 3.3804e+02 2 [0, 2, 7, 11] 2.1262e+00 1.8417e-01 1.1279e+00 2.1329e+00 2.2363e+00 | ||
| 2 test_image 0 6.9014e-01 2 [0, 1, 3, 4] 3.5129e+00 2.4417e-01 3.2687e+00 3.5129e+00 3.5129e+00 | ||
| 3 test_image 0 7.5415e+01 2 [0, 2, 4, 8] 2.1781e+00 2.2953e-01 1.4118e+00 2.1784e+00 2.2734e+00 | ||
| 4 test_image 0 3.1893e+01 2 [2, 3, 5, 6] 2.1379e+00 3.3898e-01 1.7556e+00 2.0944e+00 2.2880e+00 | ||
| 5 test_image 0 5.1517e+01 2 [4, 6, 7] 2.2339e+00 2.3611e-01 1.7265e+00 2.2070e+00 2.0221e+00 | ||
| 6 test_image 0 1.1781e+00 2 [4, 5, 7] 3.4336e+00 2.9158e-01 3.0268e+00 3.5782e+00 3.6957e+00 | ||
| 7 test_image 0 1.5383e+02 2 [1, 5, 6, 11] 2.1708e+00 2.3399e-01 1.3202e+00 2.1774e+00 2.1908e+00 | ||
| 8 test_image 0 5.8754e+01 2 [0, 3, 10, 11] 2.0020e+00 3.3701e-01 8.8592e-01 2.0826e+00 2.2475e+00 | ||
| 9 test_image 0 3.8962e+01 3 [10] 2.2736e+00 1.7805e-01 2.0016e+00 2.2595e+00 2.2033e+00 | ||
| 10 test_image 0 4.8800e-01 2 [8, 9, 11] 2.8751e+00 9.8813e-03 2.8652e+00 2.8751e+00 2.8751e+00 | ||
| 11 test_image 0 4.5069e+01 2 [1, 7, 8, 10] 2.1855e+00 2.2638e-01 1.2893e+00 2.2271e+00 2.2271e+00 |
Oops, something went wrong.