Skip to content
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

Jump to bottom

Add distance summary plots #48

Merged
merged 9 commits into from
Dec 6, 2023
Merged

Add distance summary plots #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7097d88
Fix README spelling
kaitj Oct 23, 2023
105783e
Add MNI coordinates into resource templates
kaitj Oct 24, 2023
98b6746
Add connectome summary plotting functionality
kaitj Oct 24, 2023
2054a52
Add histogram summary plotting functionality
kaitj Oct 25, 2023
c7d31b2
Take actual value of distances (instead of abs)
kaitj Oct 30, 2023
3eba625
Add scatter summary plotting functionality
kaitj Oct 30, 2023
85860cf
Enable multicore testing, update test durations
kaitj Oct 30, 2023
4bcfe06
Add callable helper for slow data generation
kaitj Oct 30, 2023
7c8cc94
Fix test errors
kaitj Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ repos:
id: pyright
entry: poetry run pyright afids_utils/
language: system
types_or: [cython, pyi, python]
types_or: [cython, pyi, python]

exclude: 'typings/.*'
114 changes: 62 additions & 52 deletions .test_durations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,64 @@
{
"afids_utils/tests/test_afids.py::TestAfidPosition::test_invalid_label": 0.516035231999922,
"afids_utils/tests/test_afids.py::TestAfidPosition::test_mismatched_desc": 0.7973499300005642,
"afids_utils/tests/test_afids.py::TestAfidPosition::test_valid_position": 0.42362273300022935,
"afids_utils/tests/test_afids.py::TestAfidSet::test_incomplete_afid_set": 1.8158798170024966,
"afids_utils/tests/test_afids.py::TestAfidSet::test_repeated_afid_set": 13.254989364999346,
"afids_utils/tests/test_afids.py::TestAfidSet::test_repeated_incomplete_afid_set": 3.0836533769997914,
"afids_utils/tests/test_afids.py::TestAfidSet::test_valid_afid_set": 33.190432068999144,
"afids_utils/tests/test_afids.py::TestAfidsCore::test_invalid_get_afid": 0.2359580209995329,
"afids_utils/tests/test_afids.py::TestAfidsCore::test_valid_get_afid": 0.05908678199921269,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_diff_labels": 1.0696506990007038,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_get_invalid_component": 0.582587266997507,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_get_valid_component": 0.7093867439998576,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_same_labels": 0.5763800320000882,
"afids_utils/tests/test_afids.py::TestAfidsDistanceSet::test_mismatched_coords": 63.4320054489981,
"afids_utils/tests/test_afids.py::TestAfidsDistanceSet::test_valid_afid_set": 63.38973898199947,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_desc": 0.32898955100063176,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_ext": 0.25202644799901464,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_ext_save": 0.5661305979974713,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_fpath": 0.0011640309985523345,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_label_range": 0.0025701279992063064,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_save_invalid_coord_system": 30.781493640999543,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_update_coord_system": 32.6804895919995,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_valid_load": 0.12679835299968545,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_valid_save": 0.020033220998811885,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_fcsv_invalid_header": 0.0019067209977947641,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_get_valid_metadata": 0.011865579999721376,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_invalid_num_coord": 0.22160380400237045,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_invalid_str_coord": 0.30554167599984794,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_valid_get_afids": 0.04954493399782223,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_get_valid_metadata": 0.03630722899833927,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_invalid_num_coord": 0.6367282070004876,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_invalid_str_coord": 0.802429965000556,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_valid_get_afids": 0.06820937399970717,
"afids_utils/tests/test_ext.py::TestSaveFcsv::test_save_fcsv_invalid_template": 32.61258023999835,
"afids_utils/tests/test_ext.py::TestSaveFcsv::test_save_fcsv_valid_template": 33.66600117900089,
"afids_utils/tests/test_ext.py::TestSaveJson::test_save_json_invalid_template": 31.526470236998648,
"afids_utils/tests/test_ext.py::TestSaveJson::test_save_json_valid_template": 32.998259844998756,
"afids_utils/tests/test_metrics.py::TestMeanAfidSet::test_mismatched_coords": 31.869257291002214,
"afids_utils/tests/test_metrics.py::TestMeanAfidSet::test_valid_afid_sets": 31.89673476600001,
"afids_utils/tests/test_metrics.py::TestMeanDistances::test_valid_afid_sets": 64.52196360699963,
"afids_utils/tests/test_plotting.py::TestCreateAfidNii::test_create_nii": 0.5861031460008235,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_position": 158.66242906000116,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_positions": 155.6866413860007,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_voxel": 149.31890224499875,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_voxels": 149.9584682829991,
"afids_utils/tests/test_transforms.py::TestAfidRoundTripConvert::test_round_trip_voxel": 1.5513086240007397,
"afids_utils/tests/test_transforms.py::TestAfidRoundTripConvert::test_round_trip_world": 2.1651060869990033,
"afids_utils/tests/test_transforms.py::TestAfidVoxel2World::test_voxel_to_world_xfm": 1.263716284000111,
"afids_utils/tests/test_transforms.py::TestAfidWorld2Voxel::test_world_to_voxel_xfm": 1.8591545960007352,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_invalid_new_coord_system": 33.03689494500031,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_same_coord_system": 32.998226444000466,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_valid_new_coord_system": 32.84556014299778
"afids_utils/tests/test_afids.py::TestAfidPosition::test_invalid_label": 0.886881814996741,
"afids_utils/tests/test_afids.py::TestAfidPosition::test_mismatched_desc": 1.3743969589995686,
"afids_utils/tests/test_afids.py::TestAfidPosition::test_valid_position": 0.7220175910006219,
"afids_utils/tests/test_afids.py::TestAfidSet::test_incomplete_afid_set": 3.4180125989951193,
"afids_utils/tests/test_afids.py::TestAfidSet::test_repeated_afid_set": 31.244816406004247,
"afids_utils/tests/test_afids.py::TestAfidSet::test_repeated_incomplete_afid_set": 5.968827651999163,
"afids_utils/tests/test_afids.py::TestAfidSet::test_valid_afid_set": 54.292250590999174,
"afids_utils/tests/test_afids.py::TestAfidsCore::test_invalid_get_afid": 0.45180017099846737,
"afids_utils/tests/test_afids.py::TestAfidsCore::test_valid_get_afid": 0.1085489589968347,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_diff_labels": 2.4163215329972445,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_get_invalid_component": 1.1976575929984392,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_get_valid_component": 1.1962003899971023,
"afids_utils/tests/test_afids.py::TestAfidsDistance::test_same_labels": 1.2137972349992197,
"afids_utils/tests/test_afids.py::TestAfidsDistanceSet::test_mismatched_coords": 111.52201084300395,
"afids_utils/tests/test_afids.py::TestAfidsDistanceSet::test_valid_afid_set": 110.5741048570053,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_desc": 0.6716801219990884,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_ext": 0.5351324199982628,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_ext_save": 0.7839422899996862,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_fpath": 0.0023619449966645334,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_invalid_label_range": 0.005587881998508237,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_save_invalid_coord_system": 57.88715408900316,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_update_coord_system": 58.0304577939969,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_valid_load": 0.26275843899929896,
"afids_utils/tests/test_afids.py::TestAfidsIO::test_valid_save": 0.043234541997662745,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_fcsv_invalid_header": 0.003846688003250165,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_get_valid_metadata": 0.02120014899992384,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_invalid_num_coord": 0.347893179005041,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_invalid_str_coord": 0.5318061569960264,
"afids_utils/tests/test_ext.py::TestLoadFcsv::test_valid_get_afids": 0.10730542600140325,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_get_valid_metadata": 0.053003484001237666,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_invalid_num_coord": 1.152150336001796,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_invalid_str_coord": 1.444844950998231,
"afids_utils/tests/test_ext.py::TestLoadJson::test_json_valid_get_afids": 0.15575734800222563,
"afids_utils/tests/test_ext.py::TestSaveFcsv::test_save_fcsv_invalid_template": 57.804315600002155,
"afids_utils/tests/test_ext.py::TestSaveFcsv::test_save_fcsv_valid_template": 58.11521932699543,
"afids_utils/tests/test_ext.py::TestSaveJson::test_save_json_invalid_template": 56.888165319996915,
"afids_utils/tests/test_ext.py::TestSaveJson::test_save_json_valid_template": 57.90304225399814,
"afids_utils/tests/test_metrics.py::TestMeanAfidSet::test_mismatched_coords": 56.97482231400136,
"afids_utils/tests/test_metrics.py::TestMeanAfidSet::test_valid_afid_sets": 57.99380504800138,
"afids_utils/tests/test_metrics.py::TestMeanDistances::test_valid_afid_sets": 114.4440521309989,
"afids_utils/tests/test_plotting.py::TestCreateAfidNii::test_create_nii": 0.9214703240031668,
"afids_utils/tests/test_plotting.py::TestPlotConnectome::test_create_connectome_plot": 271.27352779199646,
"afids_utils/tests/test_plotting.py::TestPlotDistanceSummary::test_invalid_plot_type": 6.314148587000091,
"afids_utils/tests/test_plotting.py::TestPlotDistanceSummary::test_plot_summary[connectome-LYRZProjector]": 199.83376589399995,
"afids_utils/tests/test_plotting.py::TestPlotDistanceSummary::test_plot_summary[histogram-Figure]": 10.569039911995787,
"afids_utils/tests/test_plotting.py::TestPlotDistanceSummary::test_plot_summary[scatter-Figure]": 6.350444090006931,
"afids_utils/tests/test_plotting.py::TestPlotHistogram::test_create_histogram_plot_labels": 9.475596828997368,
"afids_utils/tests/test_plotting.py::TestPlotHistogram::test_create_histogram_plot_no_labels": 9.892150385992863,
"afids_utils/tests/test_plotting.py::TestPlotHistogram::test_do_binning": 8.936190328997327,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_position": 214.12261252000098,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_positions": 210.54680938800084,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_voxel": 210.028658534,
"afids_utils/tests/test_plotting.py::TestPlotOrtho::test_plot_ortho_afid_voxels": 165.3251402349997,
"afids_utils/tests/test_plotting.py::TestPlotScatter::test_create_scatter_plot_labels": 10.752642507999553,
"afids_utils/tests/test_plotting.py::TestPlotScatter::test_create_scatter_plot_no_labels": 11.173001188999478,
"afids_utils/tests/test_transforms.py::TestAfidRoundTripConvert::test_round_trip_voxel": 4.2457738510020135,
"afids_utils/tests/test_transforms.py::TestAfidRoundTripConvert::test_round_trip_world": 5.970750295004109,
"afids_utils/tests/test_transforms.py::TestAfidVoxel2World::test_voxel_to_world_xfm": 2.4747573000022385,
"afids_utils/tests/test_transforms.py::TestAfidWorld2Voxel::test_world_to_voxel_xfm": 2.8851820759955444,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_invalid_new_coord_system": 62.51047896599994,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_same_coord_system": 63.12293202600267,
"afids_utils/tests/test_transforms.py::TestXfmCoordSystem::test_valid_new_coord_system": 50.71925954999824
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ format code, which can be invoked by running the following:
poetry run poe setup
```

This sets up a pre-commit hook, which runs the ncessary checks every time
This sets up a pre-commit hook, which runs the necessary checks every time
a commit is performed. Alternatively, if you don't wish to use the pre-commit
hook, you can run the following manually, which performs the same checks:

Expand Down
Loading