From fea9fdaf440fe854d4e8d7ac5f51c50585851a7c Mon Sep 17 00:00:00 2001 From: hrf Date: Thu, 2 Sep 2021 11:04:54 +0000 Subject: [PATCH] Revert "Update SIV.py" This reverts commit e82c2dfd4c59316a7c389b8d1c8b710cf896b6fa --- SIV.py | 127 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 76 insertions(+), 51 deletions(-) diff --git a/SIV.py b/SIV.py index dd71b45..97c8937 100644 --- a/SIV.py +++ b/SIV.py @@ -1,3 +1,5 @@ +#COMMANDS FOR ANALYSES FROM PAPER: + #Main analyses and ablations: #for h in z noic; do for f in FULL DIASEND simglu;do for g in bo SIVFIRST SIVLAST;do python SIV.py $f $g $h PERSUB;done; for g in z SB norestrict nogate norecshift;do for a in 0 .5 1;do python SIV.py $a $f $g $h PERSUB tune;done;done;done;done; @@ -7,6 +9,9 @@ #Variation in variable uncertainty #or f in z bo;do for g in 0 .1 .15 .25 .35 .45; do python SIV.py simglu $g miss $f;done;done +#rerun of BLs where patience was cut +#for h in z noic; do for f in FULL DIASEND simglu;do for g in SB nogate;do for a in 0 .5 1;do python SIV.py $a $f $g $h PERSUB tune;done;done;done;done; + import os,datetime import sys import matplotlib.pyplot as plt @@ -49,10 +54,7 @@ if 'simglu' in sys.argv: LONGMIN=1000 PATIENCE=100 -SEED=1 -if 'seed' in sys.argv: - SEED=int(sys.argv[2]) - outstr+='.S'+sys.argv[2] + #-----------------------------------------------------------------Data set selection section @@ -66,16 +68,16 @@ if 'new' in sys.argv or 'new1s' in sys.argv: subjects=['540','544','552','567','584','596'] OLD=False outstr='2020' -TIDE=False -if 'tide' in sys.argv: - subjects=['sub1','sub2','sub3','sub4','sub5','sub6'] - TIDE=True - outstr='TIDE'+'h'+sys.argv[1] DIASEND=False if 'DIASEND' in sys.argv: outstr='DIASEND' DIASEND=True subjects=['sub1','sub2','sub3','sub4','sub5','sub6','sub7','sub8'] +TIDE=False +if 'tide' in sys.argv: + subjects=['sub1','sub2','sub3','sub4','sub5','sub6','sub7','sub8','sub9','sub10'] + TIDE=True + outstr='TIDE' FULL=False if 'FULL' in sys.argv: subjects=['559','563','570','575','588','591','540','544','552','567','584','596'] @@ -103,6 +105,11 @@ if 'simglu' in sys.argv: missval=float(sys.argv[2]) outstr+='.miss'+sys.argv[2] + +SEED=1 +if 'seed' in sys.argv: + SEED=int(sys.argv[1]) + outstr+='.S'+sys.argv[1] #-----------------------------------------------------------------Data processing options ################################## @@ -143,9 +150,7 @@ if 'SIVFIRST' in sys.argv: if 'SIVLAST' in sys.argv: outstr+='_SIVLAST' SUBSAMPLE=2 -if 'SIVMIX' in sys.argv: - outstr+='_SIVMIX' - SUBSAMPLE=3 + #Only do NBEATS-> baseline network @@ -244,6 +249,7 @@ if BEATSONLY: LONGMIN*=1.67 + if NOINSCARBS: if (not BEATSONLY) or (SUBSAMPLE>0): if not NOGATE: @@ -253,6 +259,7 @@ if NOINSCARBS: + #################################### MAIN SECTION ############################################ def main(): maindir = os.getcwd()+'/'+outstr @@ -296,6 +303,7 @@ def main(): #final evaluation of ensemble #get test data + GLUM=1.0 train,val,test=makedata(4*6+horizon,sub) testgen = ordered_data(BATCHSIZE, 4*6,horizon,test,True) @@ -352,17 +360,17 @@ def main(): if not MEANOUT: losses.append(mse_cpu(target, median)*x.shape[0]) - rmselosses.append(mse_lastpointonly_cpu(target*SCALEVAL, median*SCALEVAL)*x.shape[0]) - maes.append(mae_lastpointonly_cpu(target*SCALEVAL, median*SCALEVAL)*x.shape[0]) + rmselosses.append(mse_lastpointonly_cpu(target*SCALEVAL*GLUM, median*SCALEVAL*GLUM)*x.shape[0]) + maes.append(mae_lastpointonly_cpu(target*SCALEVAL*GLUM, median*SCALEVAL*GLUM)*x.shape[0]) if np.sum(ic)>1: - icrmselosses.append(mse_lastpointonly_cpu(target[ic,:]*SCALEVAL, median[ic,:]*SCALEVAL)*x[ic,:,:].shape[0]) - icmaes.append(mae_lastpointonly_cpu(target[ic,:]*SCALEVAL, median[ic,:]*SCALEVAL)*x[ic,:,:].shape[0]) + icrmselosses.append(mse_lastpointonly_cpu(target[ic,:]*SCALEVAL*GLUM, median[ic,:]*SCALEVAL*GLUM)*x[ic,:,:].shape[0]) + icmaes.append(mae_lastpointonly_cpu(target[ic,:]*SCALEVAL*GLUM, median[ic,:]*SCALEVAL*GLUM)*x[ic,:,:].shape[0]) ictotalpoints = ictotalpoints+x[ic,:,:].shape[0] if np.sum(noic)>1: - nrmselosses.append(mse_lastpointonly_cpu(target[noic,:]*SCALEVAL, median[noic,:]*SCALEVAL)*x[noic,:].shape[0]) - nmaes.append(mae_lastpointonly_cpu(target[noic,:]*SCALEVAL, median[noic,:]*SCALEVAL)*x[noic,:].shape[0]) + nrmselosses.append(mse_lastpointonly_cpu(target[noic,:]*SCALEVAL*GLUM, median[noic,:]*SCALEVAL*GLUM)*x[noic,:].shape[0]) + nmaes.append(mae_lastpointonly_cpu(target[noic,:]*SCALEVAL*GLUM, median[noic,:]*SCALEVAL*GLUM)*x[noic,:].shape[0]) ntotalpoints = ntotalpoints+x[noic,:,:].shape[0] batch=batch+1 if done: @@ -503,7 +511,7 @@ def fit(net, optimiser, traingen,valgen,mydir,device, basedir,sub):#bonusdata=No if x.shape[0]<1: break - forecast,ul= net( torch.tensor(x, dtype=torch.float).to(device),torch.tensor(target, dtype=torch.float).to(device)) + forecast,ul= net( torch.tensor(x, dtype=torch.float).to(device)) loss = losss(forecast.to(device) , torch.tensor(target, dtype=torch.float).to(device)).to(device) inds=np.sum(np.sum(x[:,:,1:3],1),1)>0 @@ -540,7 +548,7 @@ def fit(net, optimiser, traingen,valgen,mydir,device, basedir,sub):#bonusdata=No if x.shape[0]<1: break - forecast,ul= net( torch.tensor(x, dtype=torch.float).to(device),torch.tensor(target, dtype=torch.float).to(device)) + forecast,ul= net( torch.tensor(x, dtype=torch.float).to(device)) loss = losss(forecast.to(device) , torch.tensor(target, dtype=torch.float).to(device)).to(device) total=total+x.shape[0] @@ -594,7 +602,7 @@ def eval(net, optimiser, testgen,mydir, device,OSTR): xs.append(x) targs.append(target) totalpoints = totalpoints+x.shape[0] - forecast,ul= net( torch.tensor(x, dtype=torch.float).to(device),torch.tensor(target, dtype=torch.float).to(device)) + forecast,ul= net(torch.tensor(x, dtype=torch.float).to(device)) forecast=forecast.to(device) preds.append(forecast.cpu().numpy()) @@ -746,7 +754,7 @@ class Block(nn.Module): self.to(device) - def forward(self, xt,xorig): + def forward(self, xt,xorig,testtime=False): @@ -925,16 +933,12 @@ class network(nn.Module): - def forward(self, x,target): - - + def forward(self, x,testtime=False): xorig=x.clone() if CF: for f in range(1,x.shape[1]): x[:,f,1:3]+=x[:,f-1,1:3] - - forecast,ul=self.mainblock(x,xorig) - + forecast,ul=self.mainblock(x,xorig,testtime) return forecast,ul @@ -944,16 +948,26 @@ class network(nn.Module): #################################### DATA GENERATION SECTION ############################################################################################################ def makedata(totallength,sub): + numg=0 + numc=0 + numd=0 + numm=0 train=[] test=[] val=[] - if DIASEND: - a=joblib.load('diasend_ohio.pkl'); + glus=[] + if DIASEND or TIDE: + if DIASEND: + a=joblib.load('diasend_ohio.pkl'); + if TIDE: + a=joblib.load('/data3/interns/time_series_pred/ohiocomp/tidepool_ohioformat_bas.pkl'); cursub=-1 for f in a: if len(f)<8640: continue f=f[:8640,:] + if TIDE: + f[:,0]=f[:,0]*17.95 temp=f[:,0] temp1=f[:,1] temp2=f[:,2] @@ -972,6 +986,10 @@ def makedata(totallength,sub): f[:,1]=d f[:,2]=c + numg+=temp.shape[0] + numc+=len(c[~np.isnan(c)*(c>0)]) + numd+=len(d[~np.isnan(d)*(d>0)]) + numm+=len(f[:,0][np.isnan(f[:,0])+(f[:,0]==0)]) # f[:,1][np.isnan(f[:,1])]=0 # d=f[:,1].copy() @@ -997,6 +1015,8 @@ def makedata(totallength,sub): f[:,2]/=200.0 f[:,0]/=SCALEVAL f[:,5]/=SCALEVAL + + ll=int(f.shape[0]*.7) llb=int(f.shape[0]*.85) # if fourvar: @@ -1005,28 +1025,14 @@ def makedata(totallength,sub): train.append(f[:ll,:]) val.append(f[ll:llb,:]) test.append(f[llb:,:]) + if cursub==9: + break print(len(train)) - return train,val,test - if TIDE: - a=joblib.load('/data3/interns/time_series_pred/ohiocomp/tidepool_ohioformat_bas.pkl'); - if sub==99: - subs=range(4) - else: - subs=[sub] - for ff in subs: - f=a[ff] - f[:,0]=f[:,0]*17.95 - ll= 80000 - if DOTHESCALE: - f[:,1]/=50.0 - f[:,2]/=200.0 - f[:,0]/=SCALEVAL - train.append(f[:int(ll*.75),:]) - val.append(f[int(ll*.75):int(ll*.85),:]) - test.append(f[int(ll*.85)-(totallength-12-1):ll,:]) + print(numg/numc,numg/numd,numm/numg) return train,val,test + if SIM: if half: @@ -1048,6 +1054,13 @@ def makedata(totallength,sub): ff[:,0]/=SCALEVAL ff[:,1]/=50 ff[:,2]/=200 + temp=ff + c=ff[:,1] + d=ff[:,2] + numg+=temp.shape[0] + numc+=len(c[~np.isnan(c)*(c>0)]) + numd+=len(d[~np.isnan(d)*(d>0)]) + numm+=len(ff[:,0][np.isnan(ff[:,0])+(ff[:,0]==0)]) if missval>0: for i in range(ff.shape[0]): @@ -1078,6 +1091,7 @@ def makedata(totallength,sub): ff[:,2]/=200 test.append(ff) print(len(test)) + print(numg/numc,numg/numd,numm/numg) return train,val,test @@ -1092,6 +1106,7 @@ def makedata(totallength,sub): stored_trains={} storedd={} storedc={} + storedg={} for f in os.listdir(folder): if f.endswith('train.pkl'): if not sub==99: @@ -1114,10 +1129,13 @@ def makedata(totallength,sub): if DOTHESCALE: d/=50.0 c/=200.0 + numg+=len(g) + numc+=len(c[~np.isnan(c)*(c>0)]) + numd+=len(d[~np.isnan(d)*(d>0)]) + numm+=len(g[np.isnan(g)+(g==0)]) - - - + + # bols=d[d>0] # bols2=bols[bols>np.mean(bols)-np.std(bols)] @@ -1147,6 +1165,7 @@ def makedata(totallength,sub): val.append(x.copy()[int(ll*.8):,:]) #store to use in test for end stored_trains[f]=x.copy() + for f in os.listdir(folder): @@ -1174,6 +1193,10 @@ def makedata(totallength,sub): if DOTHESCALE: d/=50.0 c/=200.0 + numg+=len(g) + numc+=len(c[~np.isnan(c)*(c>0)]) + numd+=len(d[~np.isnan(d)*(d>0)]) + numm+=len(g[np.isnan(g)+(g==0)]) @@ -1191,6 +1214,8 @@ def makedata(totallength,sub): t=stored_trains[f.replace('test','train')] x=np.concatenate((t[-(totallength-12-1):,:],x),axis=0) test.append(x.copy()) + + print(numg/numc,numg/numd,numm/numg) return train,val,test -- GitLab