Correct dataframe correlations fields

Author: youennmereljourdan

postprocess/correlation_service.py

@@ -9,15 +9,15 @@
 
 
 class CorrelationService:
-    def compute_correlations(self, image, images: List[str]) -> DataFrame:
+    def compute_correlations(self, image, images: List[str], method: str = 'spearman') -> DataFrame:
         print(f"Computing correlations from [{image}] to [{len(images)}] images... ", end='')
         dfs = []
         for img in images:
-            corr = self.get_correlation_coefficient(image, img, 'spearman')
-            dfs.append(pd.DataFrame([[image, img, corr]], columns=['source', 'target', 'correlation']))
+            corr = self.get_correlation_coefficient(image, img, method)
+            dfs.append(pd.DataFrame([[image, img, corr]], columns=['source', 'target', method]))
         merged = pd.concat(dfs, ignore_index=True)
         print("OK")
-        return merged.sort_values(by='correlation', ascending=False)
+        return merged.sort_values(by=method, ascending=False)
 
     def get_correlation_coefficient(self,
             file_1: str, file_2: str, method: str = 'pearson') -> float:

postprocess/postprocess_service.py

@@ -23,8 +23,8 @@ def get_dataset(self, path, corr: pd.DataFrame) -> pd.DataFrame:
             config = os.path.join(path, str(conf_id), 'config.csv')
             df = pd.read_csv(config, delimiter=';').astype(bool)
             df['id'] = conf_id
-            df['from_ref'] = corr.loc[(corr['source'] == conf_id) & (corr['target'] == 'ref'), 'correlation'].values[0]
-            df['from_mean'] = corr.loc[(corr['source'] == conf_id) & (corr['target'] == 'mean'), 'correlation'].values[
+            df['from_ref'] = corr.loc[(corr['source'] == conf_id) & (corr['target'] == 'ref'), 'spearman'].values[0]
+            df['from_mean'] = corr.loc[(corr['source'] == conf_id) & (corr['target'] == 'mean'), 'spearman'].values[
                 0]
             dataframes.append(df)
 
@@ -60,7 +60,7 @@ def get_all_correlations(self, path, ids: List[str]) -> pd.DataFrame:
             print(f"Processed correlations for [{i+1} / {n}] result")
         data.append(('mean', 'mean', 1.0, 1.0, 1.0))
         dataframe = pd.DataFrame(data, columns=['source', 'target', 'spearman', 'dice', 'jaccard'])
-        return dataframe.sort_values(by='correlation', ascending=False)
+        return dataframe.sort_values(by='spearman', ascending=False)
 
     def get_mean_image(self, inputs: list, batch_size: int) -> nib.Nifti1Image:
         total_sum = None