Update simulators

16 files changed, 69 insertions, 7 deletions

diff --git a/ns3-simulations/plots/BW-linksBandwidth_totalEnergy.png b/ns3-simulations/plots/BW-linksBandwidth_totalEnergy.png
deleted file mode 100644
index 3dd9357..0000000
--- a/ns3-simulations/plots/BW-linksBandwidth_totalEnergy.png
+++ /dev/null
diff --git a/ns3-simulations/plots/LATENCY-linksLatency_totalEnergy.png b/ns3-simulations/plots/LATENCY-linksLatency_totalEnergy.png
deleted file mode 100644
index bb6cc70..0000000
--- a/ns3-simulations/plots/LATENCY-linksLatency_totalEnergy.png
+++ /dev/null
diff --git a/ns3-simulations/plots/NBHOP-nbHop_totalEnergy.png b/ns3-simulations/plots/NBHOP-nbHop_totalEnergy.png
deleted file mode 100644
index 2e200ad..0000000
--- a/ns3-simulations/plots/NBHOP-nbHop_totalEnergy.png
+++ /dev/null
diff --git a/ns3-simulations/plots/NBSENSORS-sensorsNumber_totalEnergy.png b/ns3-simulations/plots/NBSENSORS-sensorsNumber_totalEnergy.png
index e018d08..6e4c8c6 100644
--- a/ns3-simulations/plots/NBSENSORS-sensorsNumber_totalEnergy.png
+++ b/ns3-simulations/plots/NBSENSORS-sensorsNumber_totalEnergy.png
diff --git a/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_energyWifi.png b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_energyWifi.png
new file mode 100644
index 0000000..6b4060d
--- /dev/null
+++ b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_energyWifi.png
diff --git a/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_networkEnergy.png b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_networkEnergy.png
new file mode 100644
index 0000000..f96d640
--- /dev/null
+++ b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_networkEnergy.png
diff --git a/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png
new file mode 100644
index 0000000..06e7228
--- /dev/null
+++ b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png
diff --git a/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_totalEnergy.png b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_totalEnergy.png
new file mode 100644
index 0000000..04c9da0
--- /dev/null
+++ b/ns3-simulations/plots/SENDINTERVAL-sensorsSendInterval_totalEnergy.png
diff --git a/ns3-simulations/plots/SENSORSPOS-positionSeed_avgDelay.png b/ns3-simulations/plots/SENSORSPOS-positionSeed_avgDelay.png
new file mode 100644
index 0000000..70d4d90
--- /dev/null
+++ b/ns3-simulations/plots/SENSORSPOS-positionSeed_avgDelay.png
diff --git a/ns3-simulations/plots/SENSORSPOS-positionSeed_totalEnergy.png b/ns3-simulations/plots/SENSORSPOS-positionSeed_totalEnergy.png
new file mode 100644
index 0000000..fb131a1
--- /dev/null
+++ b/ns3-simulations/plots/SENSORSPOS-positionSeed_totalEnergy.png
diff --git a/ns3-simulations/plots/plots.org b/ns3-simulations/plots/plots.org
index 9ebc7ad..05debb3 100644
--- a/ns3-simulations/plots/plots.org
+++ b/ns3-simulations/plots/plots.org
@@ -14,7 +14,12 @@ linksLatency & 2ms\\
 \end{tabular}
 \newline
 \end{center}
-\includegraphics[width=0.5\linewidth]{BW-linksBandwidth_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_networkEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_avgDelay.png}
 \includegraphics[width=0.5\linewidth]{NBSENSORS-sensorsNumber_totalEnergy.png}
-\includegraphics[width=0.5\linewidth]{LATENCY-linksLatency_totalEnergy.png}
-\includegraphics[width=0.5\linewidth]{NBHOP-nbHop_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_energyWifi.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-net.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-wifi.png}
diff --git a/ns3-simulations/plots/plots.pdf b/ns3-simulations/plots/plots.pdf
index 15c8644..054173a 100644
--- a/ns3-simulations/plots/plots.pdf
+++ b/ns3-simulations/plots/plots.pdf
diff --git a/ns3-simulations/plots/plots.tex b/ns3-simulations/plots/plots.tex
index ea553c6..074d33c 100644
--- a/ns3-simulations/plots/plots.tex
+++ b/ns3-simulations/plots/plots.tex
@@ -1,4 +1,4 @@
-% Created 2019-05-06 lun. 12:03
+% Created 2019-05-15 mer. 15:24
 % Intended LaTeX compiler: pdflatex
 \documentclass[11pt]{article}
 \usepackage[utf8]{inputenc}
@@ -40,8 +40,13 @@ linksLatency & 2ms\\
 \end{tabular}
 \newline
 \end{center}
-\includegraphics[width=0.5\linewidth]{BW-linksBandwidth_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_networkEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_avgDelay.png}
 \includegraphics[width=0.5\linewidth]{NBSENSORS-sensorsNumber_totalEnergy.png}
-\includegraphics[width=0.5\linewidth]{LATENCY-linksLatency_totalEnergy.png}
-\includegraphics[width=0.5\linewidth]{NBHOP-nbHop_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_energyWifi.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-net.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-wifi.png}
 \end{document}
diff --git a/ns3-simulations/plots/plots.tex~ b/ns3-simulations/plots/plots.tex~
new file mode 100644
index 0000000..5ea850d
--- /dev/null
+++ b/ns3-simulations/plots/plots.tex~
@@ -0,0 +1,52 @@
+% Created 2019-05-15 mer. 15:23
+% Intended LaTeX compiler: pdflatex
+\documentclass[11pt]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{graphicx}
+\usepackage{grffile}
+\usepackage{longtable}
+\usepackage{wrapfig}
+\usepackage{rotating}
+\usepackage[normalem]{ulem}
+\usepackage{amsmath}
+\usepackage{textcomp}
+\usepackage{amssymb}
+\usepackage{capt-of}
+\usepackage{hyperref}
+\usepackage{fullpage}
+\date{\today}
+\title{Analysis}
+\hypersetup{
+ pdfauthor={},
+ pdftitle={Analysis},
+ pdfkeywords={},
+ pdfsubject={},
+ pdfcreator={Emacs 26.2 (Org mode 9.1.9)}, 
+ pdflang={English}}
+\begin{document}
+
+\maketitle
+\begin{center}
+\begin{tabular}{lr}
+Parameters & Values\\
+\hline
+sensorsPktSize & 5 bytes\\
+sensorsSendInterval & 10s\\
+sensorsNumber & 10\\
+nbHop & 10\\
+linksBandwidth & 10Mbps\\
+linksLatency & 2ms\\
+\end{tabular}
+\newline
+\end{center}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_networkEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_sensorsEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_avgDelay.png}
+\includegraphics[width=0.5\linewidth]{NBSENSORS-sensorsNumber_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{SENDINTERVAL-sensorsSendInterval_energyWifi.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-net.png}
+\includegraphics[width=0.5\linewidth]{SENSORSPOS-positionSeed_totalEnergy.png}
+\includegraphics[width=0.5\linewidth]{sensorsSendInterval-wifi.png}
+\end{document}
diff --git a/ns3-simulations/plots/sensorsSendInterval-net.png b/ns3-simulations/plots/sensorsSendInterval-net.png
new file mode 100644
index 0000000..f3ed7e6
--- /dev/null
+++ b/ns3-simulations/plots/sensorsSendInterval-net.png
diff --git a/ns3-simulations/plots/sensorsSendInterval-wifi.png b/ns3-simulations/plots/sensorsSendInterval-wifi.png
new file mode 100644
index 0000000..7dc3508
--- /dev/null
+++ b/ns3-simulations/plots/sensorsSendInterval-wifi.png