Csar Fdez 1 month ago
parent
commit
4e48995303
2 changed files with 28 additions and 24 deletions
  1. 9
    7
      RESULTS.txt
  2. 19
    17
      v2_unsupervised.py

+ 9
- 7
RESULTS.txt View File

@@ -3,7 +3,7 @@ timesteps      features                        f1-score   FN
3 3
 n=12  ['r1 s1','r1 s4','r1 s5','pa1 apiii']   0.966  [51 0 0 0 65]
4 4
 n=12  ['r1 s1','r1 s4','r1 s5']    0.9799   [0 0 0 0 57]
5 5
 n=18   ['r1 s1','r1 s4','r1 s5']  0.996   [0 0 0 0 10]
6
-n=24  error
6
+n=24   ['r1 s1','r1 s4','r1 s5']    mal
7 7
 
8 8
 5-22   poques dades
9 9
 n=12  ['r1 s1','r1 s4','r1 s5','pa1 apiii']    
@@ -19,7 +19,7 @@ n=24  error
19 19
 n=6 ['r1 s1','r1 s4','r1 s5']   0.941     [0 0 0 0 103]
20 20
 n=12  ['r1 s1','r1 s4','r1 s5','pa1 apiii']   0.951  [0 0 0 0 86]
21 21
 n=12  ['r1 s1','r1 s4','r1 s5']    0.934   [0 0 0 0 112]
22
-n=18   error
22
+n=18    MAAAL !!!!  0.61005 [0, 0, 42, 254, 390]
23 23
 n=24   ['r1 s1','r1 s4','r1 s5']  0.943   [0 0 0 0 92]
24 24
 
25 25
 
@@ -27,8 +27,10 @@ n=24   ['r1 s1','r1 s4','r1 s5']  0.943   [0 0 0 0 92]
27 27
 
28 28
 30
29 29
 
30
-n=6  ['r1 s1','r1 s4','r1 s5']   error   [0 0 0 0 112]
31
-n=12  ['r1 s1','r1 s4','r1 s5','pa1 apiii']     error  [0 0 0 0 86]
32
-n=12  ['r1 s1','r1 s4','r1 s5']   error   [0 0 0 0 112]
33
-n=18     error
34
-n=24   ['r1 s1','r1 s4','r1 s5']   error   [0 0 0 0 92]
30
+n=12  ['r1 s1','r1 s4','r1 s5']   0.6947    [0, 0, 1, 423, 150]
31
+n=24   ['r1 s1','r1 s4','r1 s5']  0.7041  [0, 0, 0, 411, 97]
32
+
33
+
34
+32   (s'estan posant més dades) 
35
+n=12  ['r1 s1','r1 s4','r1 s5']   0.995  [0, 0, 0, 4, 0]
36
+

+ 19
- 17
v2_unsupervised.py View File

@@ -378,27 +378,29 @@ def anomalyMetric(labels,ranges):
378 378
     TP=[]
379 379
     FN=[]
380 380
     TPFP=[]
381
-    A=[]
382
-    B=[]
383
-    COUNTER=[]
384
-    ASSIGNED=[]
381
+    ASSIGNED_CLASS=[]
382
+    for i in  range(NumberOfFailures+1):
383
+        ASSIGNED_CLASS.append(-1)
384
+    UNASSIGNED_CLASS=[]
385 385
     for i in range(NumberOfFailures+1):
386
-        A.append(i)
387 386
         TP.append([])
388 387
         FN.append([])
389 388
         TPFP.append([])
390
-        COUNTER.append(Counter(labels[ranges[i][0]:ranges[i][1]]))
391
-
392
-    while len(A)>0:
393
-        a=A.pop(0)
394
-        Class=COUNTER[a].most_common(1)[0][0]
395
-        if Class in ASSIGNED:
396
-            B.append(Class)
397
-        else:
398
-            ASSIGNED.append(Class)       
399
-
400
-    # AKI
401
-    #lab.append(b.most_common(1)[0][0])
389
+        Class=Counter(labels[ranges[i][0]:ranges[i][1]]).most_common(1)[0][0]
390
+        if not Class in ASSIGNED_CLASS:
391
+            ASSIGNED_CLASS[i]=Class
392
+
393
+    for i in range(NumberOfFailures+1):
394
+        if not i in ASSIGNED_CLASS:
395
+            UNASSIGNED_CLASS.append(i)
396
+
397
+    for i in range(NumberOfFailures+1):
398
+        if ASSIGNED_CLASS[i]==-1:
399
+            ASSIGNED_CLASS[i]=UNASSIGNED_CLASS.pop(0)
400
+
401
+
402
+    for i in range(NumberOfFailures+1):
403
+        lab.append(ASSIGNED_CLASS[i])
402 404
 
403 405
     for i in range(NumberOfFailures+1):
404 406
         counttp=0

Powered by TurnKey Linux.