1 files changed, 8 insertions, 10 deletions
diff --git a/data/face-frame-recognition-accuracy.py b/data/face-frame-recognition-accuracy.py
index 7c53366..d32af9f 100755
--- a/data/face-frame-recognition-accuracy.py
+++ b/data/face-frame-recognition-accuracy.py
@@ -40,26 +40,24 @@ for line in open(sys.argv[2]):
         runs[prun] = recs.index(max(recs))+1
         recs = map(lambda x:0,users)
     recs[users.index(rec)] += 1
-    maxc = math.log(float(line[7])/100.0)
+    maxc = float(line[7])
     i = 9
-    cvec = []
-    while len(cvec) < len(users)-1:
-        if i < len(line):
-            cvec += [math.log(float(line[i])/100.0) - maxc]
-        else:
-            cvec += [-maxc]
-    conf[run] = math.log(np.sum(np.exp(cvec)))
+    cvec = [maxc]
+    while i < len(line):
+        cvec += [float(line[i])]
+        i += 2
+    conf[run] = (maxc/100.0)*(maxc/(np.sum(cvec)))
     prun = run
 
 for i in range(999)+list(np.arange(999,1000,0.01)):
-    thresh = 5-i/100.0
+    thresh = i/1000.0
     t=0.0
     tp=0.0
     fp=0.0
     fn=0.0
     for (k,v) in runs.items():
         #print v,labels[k]
-        if conf[k] > thresh:
+        if conf[k] < thresh:
             fn += 1
         elif v != labels[k]:
             fp += 1