added zdiff, directory reorg

1 files changed, 5 insertions, 3 deletions

diff --git a/data/limbs-avg.py b/data/limbs-avg.py
index c43deb7..9bdb991 100755
--- a/data/limbs-avg.py
+++ b/data/limbs-avg.py
@@ -28,7 +28,7 @@ limbs = (('Head','ShoulderCenter'),\
 dupes = ((1,4),(2,5),(3,6),(9,12),(10,13),(11,14))
 #xlabels = ('h-sc','sc-sl','sl-el','el-wl','sc-sr','sr-er','er-wr','sc-s','s-hc','hc-hl','hl-kl','kl-al','hc-hr','hr-kr','kr-ar')
 xlabels = ('h-sc','sc-sh','sh-el','el-wr','sc-s','s-hc','hc-hi','hi-kn','kn-an')
-print '# '+','.join(['name','run','frame','z-value','z-var']+list(xlabels))
+print '# '+','.join(['name','run','frame','z-value','z-var','z-diff']+list(xlabels))
 
 
 for line in sk_file:
@@ -39,12 +39,14 @@ for line in sk_file:
         if frame != pframe and vals != {} and run in flabel and flabel[run] != 'None':
             out = []
             zv = map(lambda xyz: xyz[2], vals.values())
+            zd = []
             for l in range(len(limbs)):
                 j1, j2 = limbs[l]
                 if j1 in vals and j2 in vals:
                     dx = vals[j1][0] - vals[j2][0]
                     dy = vals[j1][1] - vals[j2][1]
                     dz = vals[j1][2] - vals[j2][2]
+                    zd += [math.fabs(dz)]
                     limb = math.sqrt(dx*dx + dy*dy + dz*dz)
                     out += [str(limb)]
                     #zv += [(vals[j1][2] + vals[j2][2])/2]
@@ -63,8 +65,8 @@ for line in sk_file:
                 elif out[l1] == '-1' and out[l2] != '-1':
                     out[l1] = out[l2]
                 out.pop(l2)
-            if len(zv) >= 1:
-                print ','.join([flabel[run],str(run),str(frame),str(np.average(zv)),str(np.var(zv))] + out)
+            if len(zd) >= 1:
+                print ','.join([flabel[run],str(run),str(frame),str(np.average(zv)),str(np.var(zv)),str(max(zd))] + out)
             vals = {}
         if state == 'Tracked':
             vals[joint] = [float(x), float(y), float(z)]