Merge branch 'refactor' of github.com:OnnoKampman/FCEst-benchmarking …

…into refactor
OnnoKampman · Mar 22, 2024 · cbe13d4 · cbe13d4
2 parents 6494aac + d829d3c
commit cbe13d4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -20,9 +20,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install git+https://github.com/OnnoKampman/FCEst.git@v0.1.0
           pip install nilearn pandas==1.5.3 pylint
-      - name: Analyzing the code with pylint
+      - name: Analyze code with pylint
         run: |
           echo $PYTHONPATH
           pwd
+          ls -al
+          export PYTHONPATH=$PWD
           pylint $(git ls-files '*.py') --disable=line-too-long,missing-class-docstring,missing-function-docstring,missing-module-docstring --fail-under=7
         # continue-on-error: true
diff --git a/.../fmri/rs/HCP_PTN1200_recon2/TVFC_summary_measures/save_TVFC_estimates_summary_measures.py b/.../fmri/rs/HCP_PTN1200_recon2/TVFC_summary_measures/save_TVFC_estimates_summary_measures.py
@@ -9,9 +9,9 @@
 import numpy as np
 import pandas as pd
 
-from configs.configs import get_config_dict
-from helpers.array_operations import reconstruct_symmetric_summary_measure_matrix_from_tril
-from helpers.hcp import get_human_connectome_project_subjects
+from .configs.configs import get_config_dict
+from ..helpers.array_operations import reconstruct_symmetric_summary_measure_matrix_from_tril
+from ...helpers.hcp import get_human_connectome_project_subjects
 
 
 if __name__ == "__main__":
@@ -51,10 +51,11 @@
                 data_split, experiment_dimensionality, metric, model_name
             )
             for i_subject, subject_filename in enumerate(all_subjects_list):
-                print(f'\n> SUMMARY MEASURE: {tvfc_summary_measure:s}')
-                print(f'> MODEL NAME:      {model_name:s}')
-                print(f'> SCAN ID:         {scan_id:d}')
-                print(f'> SUBJECT {i_subject+1: 3d} / {n_subjects:d}: {subject_filename:s}')
+                print('')
+                logging.info(f'> SUMMARY MEASURE: {tvfc_summary_measure:s}')
+                logging.info(f'> MODEL NAME:      {model_name:s}')
+                logging.info(f'> SCAN ID:         {scan_id:d}')
+                logging.info(f'> SUBJECT {i_subject+1: 3d} / {n_subjects:d}: {subject_filename:s}')
 
                 # Load TVFC estimates - some may be missing.
                 tvfc_estimates_filepath = os.path.join(

diff --git a/datasets/fmri/rs/ic_to_rsn/results/ic_to_rsn_mapping_percent.csv b/datasets/fmri/rs/ic_to_rsn/results/ic_to_rsn_mapping_percent.csv
@@ -0,0 +1,16 @@
+medial_visual,occipital_pole,lateral_visual,default_mode,cerebellum,sensorimotor,auditory,executive_control,frontoparietal_right,frontoparietal_left
+16.4713744709289,19.1356649587881,54.4219202494988,3.79594564490978,2.48607707730007,4.59790599242593,0.850969035419915,4.06772109601248,10.8487413677879,8.35820895522388
+2.12759160463853,1.00309874452928,4.08906494585183,24.8889882758841,1.17241158994346,1.62604223237389,3.27125195668147,9.08858575855349,13.2830719100406,25.1030252691435
+28.5081200110102,16.9391687310762,15.8298926507019,7.64382053399394,1.78089733003028,9.82658959537572,4.81145059179741,4.04349022846133,8.68153041563446,9.72749793559042
+11.4043027222725,46.9679036413006,29.1304045115923,1.49690176147044,0.222794680776996,10.3529903223561,7.89528650003481,1.55260043166469,4.49766761818562,3.26533454013785
+6.91059580897327,2.05281481968075,10.2148065427314,5.54095776128227,1.45175064047822,25.2676870524864,22.8667148393878,2.80168166590028,9.02910070288379,3.79688629048151
+2.42582309720119,1.77800213135902,9.33871781928319,5.01149812103876,2.63335015985193,6.16691906444557,5.39850804868473,6.8848505244265,21.5323349598968,36.2134724325537
+1.36725758989449,0.671068685853729,3.01083757984641,11.6593698413838,1.02275174047226,2.9139453096964,3.95105146056126,14.9429412186894,48.0334457762147,6.12933323763726
+3.31617345166282,0.0410573855920159,7.20083378075356,7.10292770741875,0.161071281937909,7.52929286548969,16.6377159460569,9.72428386444746,21.9814925938793,20.6960805988062
+6.65168539325843,3.33767001774098,11.3873447664104,20.1963335304554,1.99645180366647,4.47545830869308,4.76404494382022,9.25606150206978,19.1176818450621,13.8308693081017
+0.916486092856382,0.6465134453483,3.01943092607723,11.5377784092927,1.58431316827111,0.916486092856382,14.3689389364499,8.26613619409612,18.2338105218287,18.8376967070442
+7.80223218942318,4.37050172108063,19.1300719724627,0.0104307916970898,24.3037446542193,0,0.0730155418796287,2.49295921560446,0.719724627099197,4.57911755502243
+1.71710378838825,2.01748486886348,16.0860793544048,0.26003138309796,2.68997982515131,26.6263169692894,5.19166106254203,0.905626541134275,14.8217888365837,16.6375252185609
+0.983717774762551,0.314983523938748,1.52161271564257,6.2415196743555,3.23706144601667,2.0934289591006,1.84628804031789,28.3727466563287,16.5729792595464,28.8379530916844
+11.3362614858128,1.1371291530813,11.7916520708146,21.0988655654658,4.83953544771092,8.25631214464714,11.7458435504298,13.3787825712053,18.4554444773787,16.9949610627577
+7.46922563822691,6.87951003577709,11.792796070584,9.25808016493845,4.64950579103754,9.53247225759505,11.6654538839367,14.4215026378024,16.9107391910739,12.2657813352738