Update dataset_utils.py

dataset_utils.py

@@ -75,39 +75,8 @@ def vocab(task,diag_flag,proc_flag,out_flag,chart_flag,med_flag,lab_flag):
             with open ('./data/dict/'+task+'/'+file, 'rb') as fp:
                 labVocabDict = pickle.load(fp)
         
-        return len(condVocabDict),len(procVocabDict),len(medVocabDict),len(outVocabDict),len(chartVocabDict),len(labVocabDict),ethVocabDict,genderVocabDict,ageVocabDict,insVocabDict
-
-def open_dict(task,cond, proc, out, chart, lab, med):
-    if cond:
-        with open("./data/dict/"+task+"/condVocab", 'rb') as fp:
-            condDict = pickle.load(fp)
-    else:
-        condDict = None
-    if proc:
-        with open("./data/dict/"+task+"/procVocab", 'rb') as fp:
-            procDict = pickle.load(fp)
-    else:
-        procDict = None
-    if out:
-        with open("./data/dict/"+task+"/outVocab", 'rb') as fp:
-            outDict = pickle.load(fp)
-    else:
-        outDict = None
-    if chart:
-        with open("./data/dict/"+task+"/chartVocab", 'rb') as fp:
-            chartDict = pickle.load(fp)
-    elif lab:
-        with open("./data/dict/"+task+"/labsVocab", 'rb') as fp:
-            chartDict = pickle.load(fp)
-    else:
-        chartDict = None
-    if med:
-        with open("./data/dict/"+task+"/medVocab", 'rb') as fp:
-            medDict = pickle.load(fp)
-    else:
-        medDict = None
-    
-    return condDict, procDict, outDict, chartDict, medDict
+        return (len(condVocabDict),len(procVocabDict),len(medVocabDict),len(outVocabDict),len(chartVocabDict),len(labVocabDict),
+                ethVocabDict,genderVocabDict,ageVocabDict,insVocabDict,condVocabDict,procVocabDict,medVocabDict,outVocabDict,chartVocabDict,labVocabDict)
 
 def concat_data(data,interval,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,feat_lab,condDict, procDict, outDict, chartDict, medDict):
     meds=data['Med']
@@ -136,11 +105,11 @@ def concat_data(data,interval,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,
             for p,v in zip(feat,proc_val):
                 proc_df[p]=v
             proc_df.columns=pd.MultiIndex.from_product([["PROC"], proc_df.columns])
-            print(proc_df)
         else:
             procedures=pd.DataFrame(procDict,columns=['PROC'])
             features=pd.DataFrame(np.zeros([interval,len(procedures)]),columns=procedures['PROC'])
             features.columns=pd.MultiIndex.from_product([["PROC"], features.columns])
+            proc_df=features.fillna(0)
 
     ##########OUT#########
     if (feat_out):
@@ -207,7 +176,7 @@ def concat_data(data,interval,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,
 
 
 
-def generate_deep(data,interval,task,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,feat_lab,condDict, procDict, outDict, chartDict, medDict):
+def generate_deep(data,interval,task,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,feat_lab,condDict, procDict, outDict, chartDict, medDict, eth_vocab,gender_vocab,age_vocab,ins_vocab):
     meds = []
     charts = []
     proc = []
@@ -215,8 +184,6 @@ def generate_deep(data,interval,task,feat_cond,feat_proc,feat_out,feat_chart,fea
     lab = []
     stat = []
     demo = []
-    
-    size_cond, size_proc, size_meds, size_out, size_chart, size_lab, eth_vocab,gender_vocab,age_vocab,ins_vocab=vocab(task.replace(" ","_"),feat_cond,feat_proc,feat_out,feat_chart,feat_meds,False)
     dyn,cond_df,demo=concat_data(data,interval,feat_cond,feat_proc,feat_out,feat_chart,feat_meds,feat_lab,condDict, procDict, outDict, chartDict, medDict)
     if feat_chart:
         charts = dyn['CHART'].fillna(0).values