face mods

3 files changed, 141 insertions, 139 deletions

diff --git a/data/combined/graphs/face.csv b/data/combined/graphs/face.csv
index ec4cd86..799f4ed 100644
--- a/data/combined/graphs/face.csv
+++ b/data/combined/graphs/face.csv
@@ -182,72 +182,141 @@
 1.0,0.655321782178
 1.0,0.655321782178
 0.891707920792,0.696738376128
-0.777846534653,0.707239459029
-0.665841584158,0.68029739777
-0.634900990099,0.678362573099
-0.613242574257,0.694248234107
-0.554455445545,0.719866071429
-0.508663366337,0.725060827251
-0.457920792079,0.717567567568
-0.4375,0.725601131542
-0.412128712871,0.732732732733
-0.399133663366,0.73488372093
-0.376237623762,0.748355263158
-0.354579207921,0.752181500873
-0.335396039604,0.763837638376
-0.318688118812,0.770873786408
-0.303836633663,0.771894093686
-0.287747524752,0.769892473118
-0.266707920792,0.779582366589
-0.251237623762,0.778325123153
-0.240099009901,0.780927835052
-0.230198019802,0.784946236559
-0.214108910891,0.78323699422
-0.195544554455,0.79746835443
-0.183168316832,0.797297297297
-0.170792079208,0.800724637681
-0.158415841584,0.796875
-0.14603960396,0.78813559322
-0.137376237624,0.797297297297
-0.128094059406,0.806763285024
-0.121287128713,0.816326530612
-0.110148514851,0.837078651685
-0.101485148515,0.829268292683
-0.0940594059406,0.828947368421
-0.085396039604,0.826086956522
-0.0804455445545,0.823076923077
-0.072400990099,0.820512820513
-0.0631188118812,0.833333333333
-0.0569306930693,0.847826086957
-0.049504950495,0.875
-0.0476485148515,0.883116883117
-0.0402227722772,0.892307692308
-0.0365099009901,0.898305084746
-0.0321782178218,0.884615384615
-0.0278465346535,0.888888888889
-0.0241336633663,0.923076923077
-0.0216584158416,0.914285714286
-0.0191831683168,0.935483870968
-0.0154702970297,0.92
-0.0123762376238,0.9
-0.0111386138614,0.888888888889
-0.00990099009901,0.875
-0.00804455445545,0.923076923077
-0.00680693069307,0.909090909091
-0.0049504950495,0.875
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00371287128713,1.0
-0.00309405940594,1.0
+0.779084158416,0.706115965052
+0.671410891089,0.67465437788
+0.64603960396,0.669540229885
+0.627475247525,0.681459566075
+0.574876237624,0.697524219591
+0.532178217822,0.697674418605
+0.486386138614,0.68320610687
+0.464727722772,0.688415446072
+0.443688118812,0.693165969317
+0.430074257426,0.697841726619
+0.41646039604,0.702823179792
+0.404084158416,0.704441041348
+0.38551980198,0.707865168539
+0.368193069307,0.714285714286
+0.355198019802,0.716027874564
+0.337252475248,0.719266055046
+0.329826732673,0.724202626642
+0.318069306931,0.735408560311
+0.295792079208,0.728033472803
+0.279702970297,0.736725663717
+0.263613861386,0.746478873239
+0.261757425743,0.747044917258
+0.252475247525,0.747549019608
+0.238861386139,0.748704663212
+0.227103960396,0.74659400545
+0.217202970297,0.746438746439
+0.20853960396,0.738872403561
+0.199876237624,0.743034055728
+0.190594059406,0.74025974026
+0.185643564356,0.733333333333
+0.174504950495,0.730496453901
+0.167698019802,0.726937269373
+0.160891089109,0.734615384615
+0.156559405941,0.735177865613
+0.15099009901,0.741803278689
+0.14047029703,0.748898678414
+0.136138613861,0.745454545455
+0.130569306931,0.739336492891
+0.125,0.732673267327
+0.116336633663,0.739361702128
+0.111386138614,0.733333333333
+0.108910891089,0.738636363636
+0.104579207921,0.739644970414
+0.0990099009901,0.7375
+0.0909653465347,0.734693877551
+0.085396039604,0.753623188406
+0.0816831683168,0.75
+0.0779702970297,0.761904761905
+0.072400990099,0.777777777778
+0.0717821782178,0.775862068966
+0.0668316831683,0.777777777778
+0.0631188118812,0.774509803922
+0.0581683168317,0.797872340426
+0.0563118811881,0.791208791209
+0.0519801980198,0.821428571429
+0.0507425742574,0.817073170732
+0.0482673267327,0.820512820513
+0.0445544554455,0.805555555556
+0.0433168316832,0.8
+0.0402227722772,0.8
+0.0377475247525,0.786885245902
+0.0352722772277,0.789473684211
+0.032797029703,0.830188679245
+0.0309405940594,0.84
+0.0284653465347,0.826086956522
+0.0272277227723,0.818181818182
+0.0259900990099,0.809523809524
+0.0253712871287,0.80487804878
+0.0241336633663,0.794871794872
+0.0235148514851,0.815789473684
+0.0210396039604,0.794117647059
+0.019801980198,0.78125
+0.0185643564356,0.8
+0.0173267326733,0.785714285714
+0.0160891089109,0.846153846154
+0.0154702970297,0.84
+0.0154702970297,0.84
+0.012995049505,0.809523809524
+0.012995049505,0.809523809524
+0.0123762376238,0.8
+0.0105198019802,0.823529411765
+0.0105198019802,0.823529411765
+0.0105198019802,0.823529411765
+0.00990099009901,0.8125
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00928217821782,0.8
+0.00866336633663,0.785714285714
+0.00866336633663,0.785714285714
+0.00804455445545,0.769230769231
+0.00804455445545,0.769230769231
+0.00804455445545,0.769230769231
+0.00742574257426,0.75
+0.00680693069307,0.818181818182
+0.00680693069307,0.818181818182
+0.00556930693069,0.777777777778
+0.0049504950495,0.75
+0.00433168316832,0.714285714286
+0.00371287128713,0.833333333333
+0.00371287128713,0.833333333333
+0.00371287128713,0.833333333333
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
+0.00309405940594,0.8
 0.00247524752475,1.0
+0.00247524752475,1.0
+0.00247524752475,1.0
+0.00185643564356,1.0
+0.00185643564356,1.0
+0.00185643564356,1.0
+0.00185643564356,1.0
 0.00185643564356,1.0
 0.00185643564356,1.0
 0.00185643564356,1.0
+0.00185643564356,1.0
+0.00185643564356,1.0
+0.00185643564356,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
+0.00123762376238,1.0
 0.00123762376238,1.0
 0.00123762376238,1.0
 0.00123762376238,1.0
@@ -255,79 +324,10 @@
 0.000618811881188,1.0
 0.000618811881188,1.0
 0.000618811881188,1.0
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
-0,1
+0.000618811881188,1.0
+0.000618811881188,1.0
+0.000618811881188,1.0
+0.000618811881188,1.0
 0,1
 0,1
 0,1
diff --git a/data/combined/scriptSkeleton.m b/data/combined/scriptSkeleton.m
index 91c724f..82f04b7 100644
--- a/data/combined/scriptSkeleton.m
+++ b/data/combined/scriptSkeleton.m
@@ -124,8 +124,10 @@ for ex = 1 : numEx
   

   % evaluation

   for i = 1 : 1000

-    th = 5 - i;

-    sub = test(norm1(test) < th);

+    %th = 5 - i;

+    %sub = test(norm1(test) < th);

+    th = i/1000

+    sub = test(exp(conf(test)) > th);

     prec(ex, i) = mean(y(sub) == yp(sub));

     recall(ex, i) = length(sub) / length(test);

   end

diff --git a/data/face-frame-recognition-accuracy.py b/data/face-frame-recognition-accuracy.py
index 48b6141..7c53366 100755
--- a/data/face-frame-recognition-accuracy.py
+++ b/data/face-frame-recognition-accuracy.py
@@ -40,12 +40,12 @@ 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 = float(line[7])/100.0
+    maxc = math.log(float(line[7])/100.0)
     i = 9
     cvec = []
     while len(cvec) < len(users)-1:
         if i < len(line):
-            cvec += [float(line[i])/100.0 - maxc]
+            cvec += [math.log(float(line[i])/100.0) - maxc]
         else:
             cvec += [-maxc]
     conf[run] = math.log(np.sum(np.exp(cvec)))