Fix

src/plan.tex

@@ -1,26 +1,26 @@
-% \frontmatter{}
-%
-% \input{introduction/main}
-% \resetstyle{}
-%
-% \mainmatter{}
-%
-% \input{foreword/main}
-% \resetstyle{}
-%
-% \input{state-of-the-art/main}
-% \resetstyle{}
-%
-% \input{preliminary-work/main}
-% \resetstyle{}
-%
-% \input{dash-3d/main}
-% \resetstyle{}
-%
+\frontmatter{}
+
+\input{introduction/main}
+\resetstyle{}
+
+\mainmatter{}
+
+\input{foreword/main}
+\resetstyle{}
+
+\input{state-of-the-art/main}
+\resetstyle{}
+
+\input{preliminary-work/main}
+\resetstyle{}
+
+\input{dash-3d/main}
+\resetstyle{}
+
 \input{system-bookmarks/main}
-% \resetstyle{}
-%
-% \backmatter{}
-%
-% \input{conclusion/main}
-%
+\resetstyle{}
+
+\backmatter{}
+
+\input{conclusion/main}
+

src/system-bookmarks/user-study.tex

@@ -57,16 +57,19 @@ The loading policy is the default greedy policy for half of the users, and the e
 During these experiments, we need a server and a client.
 The server is hosted on an Acer Aspire V3 with an Intel Core i7 3632QM processor.
 The user is given a Samsung Galaxy S5 that is connected to the server via Wi-fi.
+There is no artificial bandwidth limitation due to the fact that the bandwidth is already limited by the Wi-fi network and by the performances of the mobile device.
 
 \subsection{Results}
 
+18 users participated in this user-study.
+
 \subsubsection{Qualitative results --- Interaction}
 
 People use and enjoy using the bookmarks.
 It helps them navigating in the scene, and the few people that do not like bookmarks most often have the following reasons:
 
 \begin{itemize}
-    \item they are already really confortable with using the virtual joystick
+    \item they are already really comfortable with using the virtual joystick
     \item they find using the virtual joystick funnier to use
 \end{itemize}
 
@@ -74,11 +77,14 @@ We could argue that they do not like the bookmarks because they make the task to
 
 \subsubsection{Qualitative results --- Streaming}
 
-The experiment confirms that the differences between the loading policies are subtle, and, unlike we expected, they seem to prefer the default greedy policy to the enhanced one.
-Another thing is that people do not like waiting after clicking a bookmark, and making them wait in the second part of the experiment is difficult, which reduces even more the differences between the two policies, since the enhanced policy fallbacks to greedy when the camera moves.\todo{this sentence is ugly af}
+Among the 18 participants of this user study, 10 confirmed that they preferred the optimized policy, 4 preferred the greedy policy, and 4 did not perceive the difference.
+Another interesting fact is that on the last part of the experiment (the free navigation) the average number of clicks on bookmarks is 3 for users having the greedy policy and 5.3 for users having the optimized policy.
 
 \subsubsection{Quantitative results}
 
+By collecting all the traces during the experiments, we are able to replay the rendering and evaluate the PSNR that users saw during their experiment.
+% Figure~\ref{sb:psnr-second-experiment}
+
 \begin{figure}[th]
     \centering
     \begin{tikzpicture}
@@ -126,7 +132,7 @@ Another thing is that people do not like waiting after clicking a bookmark, and
         \end{axis}
 
     \end{tikzpicture}
-    \caption{Comparison of the PSNR during the second experiment: above, PSNR for greedy and greedy optimized for bookmarks; below, ratio of people clicking on a bookmark.}
+    \caption{Comparison of the PSNR during the second experiment: above, PSNR for greedy and greedy optimized for bookmarks; below, ratio of people clicking on a bookmark.\label{sb:psnr-second-experiment}}
 \end{figure}
 
 \begin{figure}[th]
@@ -151,7 +157,7 @@ Another thing is that people do not like waiting after clicking a bookmark, and
 
         \end{axis}
     \end{tikzpicture}
-    \caption{Comparison of the PSNR after a click on a bookmark during the second experiment}
+    \caption{Comparison of the PSNR after a click on a bookmark during the second experiment\label{sb:psnr-second-experiment-after-click}}
 \end{figure}
 
 \begin{figure}[th]
@@ -201,5 +207,30 @@ Another thing is that people do not like waiting after clicking a bookmark, and
         \end{axis}
 
     \end{tikzpicture}
-    \caption{Comparison of the PSNR during the third experiment: above, PSNR for greedy and greedy optimized for bookmarks; below, ratio of people clicking on a bookmark.}
+    \caption{Comparison of the PSNR during the third experiment: above, PSNR for greedy and greedy optimized for bookmarks; below, ratio of people clicking on a bookmark.\label{sb:psnr-third-experiment}}
+\end{figure}
+
+\begin{figure}[th]
+    \centering
+    \begin{tikzpicture}
+        \begin{axis}[
+            xlabel=Time (in s),
+            ylabel=PSNR,
+            no markers,
+            width=\tikzwidth,
+            height=\tikzheight,
+            cycle list name=mystyle,
+            legend pos=south east,
+            xmin=0,
+            xmax=10,
+        ]
+
+            \addplot table [y=y, x=x]{assets/system-bookmarks/final-results/third-experiment-after-clicks-0.dat};
+            \addlegendentry{Greedy}
+            \addplot table [y=y, x=x]{assets/system-bookmarks/final-results/third-experiment-after-clicks-1.dat};
+            \addlegendentry{Greedy optimized for bookmarks}
+
+        \end{axis}
+    \end{tikzpicture}
+    \caption{Comparison of the PSNR after a click on a bookmark during the third experiment\label{sb:psnr-third-experiment-after-click}}
 \end{figure}