Handle subdatasets with property decorators

dataset.py

@@ -95,17 +95,17 @@ class NumpyCSVDataset(Dataset):
         # filter the clinical file in order to keep files that are really on disk
         clinical = clinical.loc[clinical['filename'].isin(available_files)]
 
-        self._filenames_full = clinical['filename'].values
-        self._patients_full = clinical['patient'].values
-        self._labels_full = clinical[label_col].values
+        self._filenames = clinical['filename'].values
+        self._patients = clinical['patient'].values
+        self._labels = clinical[label_col].values
 
-        self.indices = np.arange(len(self._filenames_full))
+        self.indices = np.arange(len(self._filenames))
 
     def __getitem__(self, idx):
-        label = self._labels_full[self.indices[idx]]
-        filename = self._filenames_full[self.indices[idx]]
-        patient = self._patients_full[self.indices[idx]]
-        data_file = self.data_dir / self._filenames_full[self.indices[idx]]
+        label = self._labels[self.indices[idx]]
+        filename = self._filenames[self.indices[idx]]
+        patient = self._patients[self.indices[idx]]
+        data_file = self.data_dir / self._filenames[self.indices[idx]]
         data = np.load(data_file)
 
         data = self.transforms(data, self.mode, self.size)
@@ -118,21 +118,24 @@ class NumpyCSVDataset(Dataset):
         }
         return output
 
-    def get_labels(self):
-        return self._labels_full[self.indices]
+    @property
+    def labels(self):
+        return self._labels[self.indices]
 
-    def get_files(self):
-        return self._filenames_full[self.indices]
+    @property
+    def filenames(self):
+        return self._filenames[self.indices]
 
-    def get_patients(self):
-        return self._patients_full[self.indices]
+    @property
+    def patients(self):
+        return self._patients[self.indices]
 
     def __len__(self):
         return len(self.indices)
 
     def __shuffle__(self):
         idx_permut = np.random.permutation(self.__len__())
-        self._filenames_full = self._filenames_full[idx_permut]
-        self._labels_full = self._labels_full[idx_permut]
-        self._patients_full = self._patients_full[idx_permut]
+        self._filenames = self._filenames[idx_permut]
+        self._labels = self._labels[idx_permut]
+        self._patients = self._patients[idx_permut]
         self.indices = self.indices[idx_permut]