Update paper

1 files changed, 75 insertions, 5 deletions

diff --git a/2019-Mascots.org b/2019-Mascots.org
index c562424..56d9734 100644
--- a/2019-Mascots.org
+++ b/2019-Mascots.org
@@ -2,11 +2,11 @@
 
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+STARTUP: hideblocks
-#+PROPERTY: header-args :eval no
 #+OPTIONS: H:5 author:nil email:nil creator:nil timestamp:nil skip:nil toc:nil ^:nil
 #+LATEX_CLASS: IEEEtran
 #+LATEX_HEADER: \usepackage{hyperref}
 #+LATEX_HEADER: \usepackage{booktabs}
+#+LATEX_HEADER: \usepackage{graphicx}
 #+LATEX_HEADER: \IEEEoverridecommandlockouts 
 #+LATEX_HEADER: \author{\IEEEauthorblockN{1\textsuperscript{st} Anne-Cécile Orgerie}
 #+LATEX_HEADER: \IEEEauthorblockA{\textit{Univ Rennes, Inria, CNRS, IRISA, Rennes, France} \\
@@ -134,10 +134,35 @@ component, formatting, style, styling, insert
 
 * Evaluation [3 col]
 ** IoT/Network Consumption
+   In a first place, we first start by studying the impact of the sensors position on their energy
+   consumption. To this end, we run several simulations in ns-3 with different sensors position. The
+   results show that sensors position have a very low impact on the energy consumption and on the
+   application delay.
+   
+
+    #+BEGIN_EXPORT latex
+    \begin{figure}
+      \centering
+      \includegraphics[width=0.6\linewidth]{./plots/sensorsPosition-delayenergy.png}
+      \caption{Sensors Position}
+      \label{fig:sensorsPos}
+    \end{figure}
+    #+END_EXPORT
+
+
+    
+
+    #+BEGIN_EXPORT latex
+    \begin{figure}
+      \label{fig:sensorsFrequency}
+      \caption{Sensors Sensing Frequency}
+
+    \end{figure}
+    #+END_EXPORT
+
+
 ** Cloud Energy Consumption
-** Virtual Machine Size Impact
-** Application Accuracy
-   Refresh frequency etc...
+*** Virtual Machine Size Impact
 ** End-To-End Consumption
 * Discussion [1 col]
 * Conclusion [1 col]
@@ -147,7 +172,9 @@ component, formatting, style, styling, insert
 
 
 * Data Provenance :noexport:
-
+  :PROPERTIES:
+  :header-args: :eval never-export
+  :END:
 ** Data Analysis
 *** NS3
     To Generate all the plots, please execute the following line:
@@ -296,6 +323,33 @@ component, formatting, style, styling, insert
    
 **** Custom Plots
 
+     #+BEGIN_SRC R :noweb yes :results graphics :file plots/sensorsPosition-delayenergy.png
+       <<NS3-RUtils>>
+       simTime=1800
+
+
+cbPalette <- c("#0000B0", "#E69F00", "#56B4E9", "#009E73", "#F0E442", "#0072B2", "#D55E00", "#CC79A7")
+
+# To use for fills, add
+ 
+
+# To use for line and point colors, add
+
+       # Load Data
+        data=read_csv("logs/ns3/last/data.csv")
+        data=data%>%mutate(sensorsEnergyW=sensorsEnergy/simTime)
+
+       data%>%filter(simKey=="SENSORSPOS",sensorsNumber==10) %>% ggplot(aes(y=sensorsEnergyW,x=positionSeed,color="Energy"))+xlab(getLabel("Sensors Position Seed"))+ylab(getLabel("Sensors Energy Consumption (W)"))+
+       geom_line()+geom_point()+geom_line(aes(y=(avgDelay+5),color="Delay"))+geom_point(aes(y=(avgDelay+5),color="Delay"))+expand_limits(y=c(0,15))+scale_y_continuous(sec.axis = sec_axis(~.-5, name = "Application Delay (s)")) +theme_bw() +  scale_fill_manual(values=cbPalette) +   scale_colour_manual(values=cbPalette)+guides(color=guide_legend(title="Curves"))
+       ggsave("plots/sensorsPosition-delayenergy.png",dpi=80, width=4, height=3.2)
+     #+END_SRC
+
+     #+RESULTS:
+     [[file:plots/sensorsPosition-delayenergy.png]]
+
+
+
+
      #+NAME: ssiNet
      #+BEGIN_SRC R :noweb yes :results graphics :file plots/sensorsSendInterval-net.png
        <<NS3-RUtils>>
@@ -307,6 +361,22 @@ component, formatting, style, styling, insert
        ggsave("plots/sensorsSendInterval-net.png",dpi=80)
      #+END_SRC
 
+
+     Effect of the number of sensors on the application delay
+     #+BEGIN_SRC R :noweb yes :results graphics :file plots/delay-nbsensors.png
+       <<NS3-RUtils>>
+       # Load Data
+        data=read_csv("logs/ns3/last/data.csv")
+
+       data%>%filter(simKey=="NBSENSORS") %>% ggplot(aes(y=avgDelay,x=sensorsNumber))+xlab(getLabel("sensorsNumber"))+ylab(getLabel("avgDelay"))+
+       geom_line()+labs(title="For 20 sensors")
+       ggsave("plots/delay-nbsensors.png",dpi=80)
+     #+END_SRC
+
+     #+RESULTS:
+     [[file:plots/delay-nbsensors.png]]
+
+
    
      #+NAME: ssiWifi
      #+BEGIN_SRC R :noweb yes :results graphics :file plots/sensorsSendInterval-wifi.png