Csar Fdez 1 周之前
父節點
當前提交
4fce44680b
共有 1 個檔案被更改,包括 10 行新增4 行删除
  1. 10
    4
      v5_class.py

+ 10
- 4
v5_class.py 查看文件

@@ -125,7 +125,6 @@ for i in range(NumberOfFailures+1):
125 125
     dftemp=[]
126 126
     for f in datafiles[1][i]:
127 127
         print("                 ", f)
128
-        #df1 = pd.read_csv('./data/'+f+'.csv', parse_dates=['datetime'], dayfirst=True, index_col='datetime')
129 128
         df1 = pd.read_csv('./data/'+f+'.csv')
130 129
         dftemp.append(df1)
131 130
     df_list[1][i]=pd.concat(dftemp)
@@ -152,8 +151,7 @@ for i in range(NumberOfFailures+1):
152 151
     dataframe[1][i].dropna(inplace=True)
153 152
 
154 153
 
155
-# Train data is first 2/3 of data. Not exactly. L
156
-# Test data is: last 1/3 of data 
154
+# Train data i [0] and test data is [1]
157 155
 dataTrain=[]
158 156
 dataTest=[]
159 157
 for i in range(NumberOfFailures+1):
@@ -161,6 +159,10 @@ for i in range(NumberOfFailures+1):
161 159
     dataTest.append(dataframe[1][i])
162 160
 
163 161
 # Calculate means and stdev
162
+
163
+
164
+
165
+
164 166
 a=dataTrain[0]
165 167
 for i in range(1,NumberOfFailures+1):
166 168
     a=np.vstack((a,dataTrain[i]))
@@ -298,6 +300,10 @@ def plotData():
298 300
         s+=featureNames[features[indexesToPlot[i]]]
299 301
         s+=' '+unitNames[features[indexesToPlot[i]]]
300 302
         if NumFeaturesToPlot==1:
303
+
304
+
305
+
306
+
301 307
             axes.set_ylabel(s)
302 308
             axes.grid()
303 309
         else:
@@ -347,7 +353,7 @@ for m in range(NumberOfFailures+1):
347 353
 
348 354
 test_mae_loss=np.array((test_mae_loss))
349 355
 test_mae_loss_average=np.mean(test_mae_loss,axis=2)  # average over features
350
-classes=np.argmin(test_mae_loss_average,axis=0)
356
+classes=np.argmin(test_mae_loss_average,axis=0)    # Choose the minimum loss
351 357
 
352 358
 x=[]
353 359
 y=[]

Powered by TurnKey Linux.