Some cosmetics changes.

Fix the frame distribution plot, one point was missing
also output plots directly in the right directory now

13 files changed, 25 insertions, 13 deletions

diff --git a/data/combined/graphs/plots.py b/data/combined/graphs/plots.py
index 7b3bb3e..fc13369 100755
--- a/data/combined/graphs/plots.py
+++ b/data/combined/graphs/plots.py
@@ -2,6 +2,10 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
+import sys
+import os
+out_dir = sys.argv[1]
+
 
 #frames distribution
 plt.cla()
@@ -9,12 +13,14 @@ x = np.loadtxt("frames.txt",usecols=(0,))
 y = range(1,len(x)+1)
 width=0.8
 plt.bar(y,x/x.sum()*100,width=width)
-plt.xlim(0.8,25)
+plt.xlim(0.8,26)
 plt.xticks([i+width/2. for i in range(1,len(x),5)], range(1,len(x),5))
 plt.xlabel("Individual")
 plt.ylabel("Frame ratio [%]")
-plt.ylim(0,10)
-plt.savefig("frames.pdf")
+plt.ylim(0,17)
+ax = plt.gca()
+#ax.set_aspect(1)
+plt.savefig(os.path.join(out_dir,"frames.pdf"))
 
 l = ["3","5","10","all"]
 
@@ -29,7 +35,7 @@ for i in l:
     plt.xlabel("Recall [%]")
     plt.ylabel("Precision [%]")
     plt.legend(loc="best")
-plt.savefig("offline-nb.pdf")
+plt.savefig(os.path.join(out_dir,"offline-nb.pdf"))
 #10-fold, SHT
 #ax = plt.subplot(122)
 #plt.axis([0,100,50,100])
@@ -43,7 +49,7 @@ for i in l:
     plt.legend(loc="best")
 
 plt.axis([0,100,50,100])
-plt.savefig("offline-sht.pdf")
+plt.savefig(os.path.join(out_dir,"offline-sht.pdf"))
 
 #online,NB
 plt.cla()
@@ -53,7 +59,7 @@ for i in l:
     plt.xlabel("Recall [%]")
     plt.ylabel("Precision [%]")
     plt.legend(loc="best")
-plt.savefig("online-nb.pdf")
+plt.savefig(os.path.join(out_dir,"online-nb.pdf"))
 #online,SHT
 plt.cla()
 for i in l:
@@ -62,7 +68,7 @@ for i in l:
     plt.xlabel("Recall [%]")
     plt.ylabel("Precision [%]")
     plt.legend(loc="best")
-plt.savefig("online-sht.pdf")
+plt.savefig(os.path.join(out_dir,"online-sht.pdf"))
 
 
 #face
@@ -74,7 +80,7 @@ plt.plot(100*a,100*b,linewidth=0.8,label="Face")
 plt.xlabel("Recall [%]")
 plt.ylabel("Precision [%]")
 plt.legend(loc="best")
-plt.savefig("face.pdf")
+plt.savefig(os.path.join(out_dir,"face.pdf"))
 
 #back
 plt.cla()
@@ -87,7 +93,7 @@ plt.plot(100*c,100*d,linewidth=0.8,label="Train toward test away")
 plt.xlabel("Recall [%]")
 plt.ylabel("Precision [%]")
 plt.legend(loc="best")
-plt.savefig("back.pdf")
+plt.savefig(os.path.join(out_dir,"back.pdf"))
 
 #variance-reduction
 plt.cla()
@@ -98,4 +104,4 @@ plt.plot(100*a,100*b,linewidth=0.8,label="Original noise")
 plt.xlabel("Recall [%]")
 plt.ylabel("Precision [%]")
 plt.legend(loc="best")
-plt.savefig("var.pdf")
+plt.savefig(os.path.join(out_dir,"var.pdf"))
diff --git a/data/pair-matching/roc.py b/data/pair-matching/roc.py
index dd991b4..c121e97 100755
--- a/data/pair-matching/roc.py
+++ b/data/pair-matching/roc.py
@@ -41,8 +41,8 @@ if __name__ == "__main__":
     ap_false = ap[:,1][indices]
     ap_true = ap[:,0][indices]
     plt.plot(ap_false,ap_true,label="Face recognition")
-    plt.xlabel("False positive rate [\%]")
-    plt.ylabel("True positive rate [\%]")
+    plt.xlabel("False positive rate [%]")
+    plt.ylabel("True positive rate [%]")
     np.random.seed()
     std = map(float,sys.argv[2].split(","))
     sk_data  = np.loadtxt(sys.argv[1],comments="#",delimiter=",")
diff --git a/experimental.tex b/experimental.tex
index b30ba10..b96893a 100644
--- a/experimental.tex
+++ b/experimental.tex
@@ -35,6 +35,7 @@ capture the 3D coordinates of 20 body joints, and the color image.
   \begin{center}
     \includegraphics[width=0.99\textwidth]{graphics/hallway.png}
   \end{center}
+  \vspace{-\baselineskip}
   \caption{Experiment setting. Color image, depth image, and fitted
   skeleton as captured by the Kinect in a single frame}
   \label{fig:hallway}
@@ -99,8 +100,9 @@ the skeleton in a contiguous way. This allows us to define the concept of a
 
 \begin{figure}[t]
   \begin{center}
-    \includegraphics[width=0.49\textwidth]{graphics/frames.pdf}
+    \includegraphics[width=0.60\textwidth]{graphics/frames.pdf}
   \end{center}
+  \vspace{-1.5\baselineskip}
   \caption{Distribution of the frame ratio of each individual in the
   data set}
   \label{fig:frames}
@@ -215,6 +217,7 @@ algorithm and would thus bias the results in favor of skeleton recognition.
   \begin{center}
     \includegraphics[width=0.49\textwidth]{graphics/face.pdf}
   \end{center}
+  \vspace{-1.5\baselineskip}
   \caption{Precision-recall curve for face recognition and skeleton recognition}
   \label{fig:face}
 }
@@ -222,6 +225,7 @@ algorithm and would thus bias the results in favor of skeleton recognition.
   \begin{center}
     \includegraphics[width=0.49\textwidth]{graphics/back.pdf}
   \end{center}
+  \vspace{-1.5\baselineskip}
   \caption{Precision-recall curve 
   with people walking away
   from and toward the camera}
@@ -293,6 +297,7 @@ the newly obtained data set.
   \begin{center}
     \includegraphics[width=0.49\textwidth]{graphics/var.pdf}
   \end{center}
+  \vspace{-1.5\baselineskip}
   \caption{Precision-recall curve for the sequential hypothesis
   testing algorithm in the online setting for all the people with and
   without halving the variance of the noise}
diff --git a/graphics/back.pdf b/graphics/back.pdf
index 3c35a7d..86ff2f2 100644
--- a/graphics/back.pdf
+++ b/graphics/back.pdf
diff --git a/graphics/face.pdf b/graphics/face.pdf
index ed753e5..3f87ef6 100644
--- a/graphics/face.pdf
+++ b/graphics/face.pdf
diff --git a/graphics/frames.pdf b/graphics/frames.pdf
index 772894d..cca65bf 100644
--- a/graphics/frames.pdf
+++ b/graphics/frames.pdf
diff --git a/graphics/offline-nb.pdf b/graphics/offline-nb.pdf
index 2de9fd4..8c468bd 100644
--- a/graphics/offline-nb.pdf
+++ b/graphics/offline-nb.pdf
diff --git a/graphics/offline-sht.pdf b/graphics/offline-sht.pdf
index c05e09a..637ea99 100644
--- a/graphics/offline-sht.pdf
+++ b/graphics/offline-sht.pdf
diff --git a/graphics/online-nb.pdf b/graphics/online-nb.pdf
index 1e705b3..03c561e 100644
--- a/graphics/online-nb.pdf
+++ b/graphics/online-nb.pdf
diff --git a/graphics/online-sht.pdf b/graphics/online-sht.pdf
index d278eef..46d4b6c 100644
--- a/graphics/online-sht.pdf
+++ b/graphics/online-sht.pdf
diff --git a/graphics/roc.pdf b/graphics/roc.pdf
index d13496d..d5a0c79 100644
--- a/graphics/roc.pdf
+++ b/graphics/roc.pdf
diff --git a/graphics/var.pdf b/graphics/var.pdf
index d49b409..97fb5a1 100644
--- a/graphics/var.pdf
+++ b/graphics/var.pdf
diff --git a/uniqueness.tex b/uniqueness.tex
index 927421a..76b7461 100644
--- a/uniqueness.tex
+++ b/uniqueness.tex
@@ -68,6 +68,7 @@ defined as:
   \begin{center}
     \includegraphics[width=10cm]{graphics/roc.pdf}
   \end{center}
+  \vspace{-1.5\baselineskip}
   \caption{ROC curve (true positive rate
   vs. false positive rate) for several standard deviations of the
   noise and for the state-of-the-art \emph{Associate-Predict} face