Update Mimic4Dataset.py

Mimic4Dataset.py

@@ -93,7 +93,7 @@ class Mimic4Dataset(datasets.GeneratorBasedBuilder):
     
     DEFAULT_CONFIG_NAME = "Mortality"
         
-    def create_cohort(self):
+    def init_cohort(self):
         if self.config_path==None:
             if self.config.name == 'Phenotype' : self.config_path = _CONFIG_URLS['phenotype'] 
             if self.config.name == 'Readmission' : self.config_path = _CONFIG_URLS['readmission'] 
@@ -147,17 +147,17 @@ class Mimic4Dataset(datasets.GeneratorBasedBuilder):
             shutil.move(file_path,'./config')
         with open(self.conf) as f:
             config = yaml.safe_load(f)
+
+            
         timeW = config['timeWindow']
         self.timeW=int(timeW.split()[1])
         self.bucket = config['timebucket']
         self.data_icu = config['icu_no_icu']=='ICU'
+        
         if self.data_icu:
             self.feat_cond, self.feat_chart, self.feat_proc, self.feat_meds, self.feat_out, self.lab = config['diagnosis'], config['chart'], config['proc'],  config['meds'], config['output'], False
-            self.feat_lab = False
         else:
             self.feat_cond, self.feat_lab, self.feat_proc, self.feat_meds, self.feat_chart, self.out = config['diagnosis'], config['lab'], config['proc'],  config['meds'], False, False
-            self.feat_out = False
-            self.feat_chart = False
 
         
         #####################downloads modules from hub
@@ -499,20 +499,14 @@ class Mimic4Dataset(datasets.GeneratorBasedBuilder):
                         'PROC': proc,
                         'CHART/LAB': lab,
                         'OUT': out,
-                        }
-            else:
-                continue
-            
+                        }          
     
 #############################################################################################################################
     def _info(self):
-        self.path = self.create_cohort()
+        self.path = self.init_cohort()
         self.size_cond, self.size_proc, self.size_meds, self.size_out, self.size_chart, self.size_lab, eth_vocab,gender_vocab,age_vocab,ins_vocab=vocab(self.config.name.replace(" ","_"),self.feat_cond,self.feat_proc,self.feat_out,self.feat_chart,self.feat_meds,self.feat_lab)
     
-        if self.encoding == 'concat' :
-            return self._info_encoded()
-
-        elif self.encoding == 'aggreg' :
+        if (self.encoding == 'concat' or self.encoding =='aggreg'):
             return self._info_encoded()
         
         elif self.encoding == 'tensor' :
@@ -538,10 +532,7 @@ class Mimic4Dataset(datasets.GeneratorBasedBuilder):
         
     def _generate_examples(self, filepath):
         
-        if self.encoding == 'concat' :
-            yield from self._generate_examples_encoded(filepath)
-        
-        elif self.encoding == 'aggreg' :
+        if (self.encoding == 'concat' or self.encoding == 'aggreg'):
             yield from self._generate_examples_encoded(filepath)
         
         elif self.encoding == 'tensor' :