diff options
Diffstat (limited to 'analysis')
| -rw-r--r-- | analysis/.Rhistory | 2 | ||||
| -rw-r--r-- | analysis/.Rprofile | 1 | ||||
| -rw-r--r-- | analysis/figures/pareto_policies.pdf | bin | 0 -> 106149 bytes | |||
| -rw-r--r-- | analysis/figures/pareto_strategies.pdf | bin | 0 -> 90847 bytes | |||
| -rw-r--r-- | analysis/figures/table_strategy_combined.org | 36 | ||||
| -rw-r--r-- | analysis/figures/table_strategy_farhint.org | 36 | ||||
| -rw-r--r-- | analysis/figures/table_strategy_sor.org | 36 | ||||
| -rw-r--r-- | analysis/figures/table_strategy_uor.org | 36 | ||||
| -rw-r--r-- | analysis/renv.lock | 1565 | ||||
| -rw-r--r-- | analysis/renv/.gitignore | 7 | ||||
| -rw-r--r-- | analysis/renv/activate.R | 1220 | ||||
| -rw-r--r-- | analysis/renv/settings.json | 19 | ||||
| -rw-r--r-- | analysis/scalability_datasize.R | 135 | ||||
| -rw-r--r-- | analysis/scalability_nnodes.R | 118 | ||||
| -rwxr-xr-x | analysis/scheduler/analysis.sh | 18 | ||||
| -rwxr-xr-x | analysis/scheduler/data.awk | 15 | ||||
| -rwxr-xr-x | analysis/scheduler/hint.awk | 15 | ||||
| -rwxr-xr-x | analysis/scheduler/hint_fw.awk | 15 | ||||
| -rw-r--r-- | analysis/scheduler/wakeup.R | 65 | ||||
| -rwxr-xr-x | analysis/scheduler/wakeup.awk | 43 | ||||
| -rw-r--r-- | analysis/strategies_pareto.R | 119 | ||||
| -rw-r--r-- | analysis/strategies_tables.R | 243 |
22 files changed, 3744 insertions, 0 deletions
diff --git a/analysis/.Rhistory b/analysis/.Rhistory new file mode 100644 index 0000000..d4718b6 --- /dev/null +++ b/analysis/.Rhistory @@ -0,0 +1,2 @@ +q() +n diff --git a/analysis/.Rprofile b/analysis/.Rprofile new file mode 100644 index 0000000..81b960f --- /dev/null +++ b/analysis/.Rprofile @@ -0,0 +1 @@ +source("renv/activate.R") diff --git a/analysis/figures/pareto_policies.pdf b/analysis/figures/pareto_policies.pdf Binary files differnew file mode 100644 index 0000000..a8341a6 --- /dev/null +++ b/analysis/figures/pareto_policies.pdf diff --git a/analysis/figures/pareto_strategies.pdf b/analysis/figures/pareto_strategies.pdf Binary files differnew file mode 100644 index 0000000..5171fd7 --- /dev/null +++ b/analysis/figures/pareto_strategies.pdf diff --git a/analysis/figures/table_strategy_combined.org b/analysis/figures/table_strategy_combined.org new file mode 100644 index 0000000..d65261d --- /dev/null +++ b/analysis/figures/table_strategy_combined.org @@ -0,0 +1,36 @@ + +\begin{table*} +\centering +\caption{Simulation results using the strategy_combined strategy. Comparison between our previous results\cite{prev} are in color. Green indicates improvements, red shows regressions and blue indicates no change.} +\begin{tabular}{crlllllll} +\toprule +\multirow{2}{*}{Uptime} & \multirow{2}{*}{Scenario} & \multirow{2}{*}{$\# Succ_p$} & \multicolumn{2}{c}{Energy Consumption (J)} & \multicolumn{2}{c}{$eOvhd(p)$ (\%)} & \multicolumn{2}{c}{$eff(p)$ (J)}\\ +\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9} +&&&Sender & Receiver&Sender & Receiver&Sender & Receiver\\ +\midrule +\multicolumn{9}{c}{LoRa}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 617.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 581.14}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&extended&\makebox[0.5cm]{\hfill 6.02}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1004.36}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 612.06}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +62.68}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +5.32}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 166.84}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 101.67}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 628.74}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 586.07}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +1.84}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.85}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&hintandextended&\makebox[0.5cm]{\hfill 8.05}~{\color{green!60}\textbf{+1.51}}&\makebox[0.8cm]{\hfill 1130.67}~{\color{red!60}\textbf{+94.91}}&\makebox[0.8cm]{\hfill 639.55}~{\color{red!60}\textbf{+19.93}}&\makebox[0.7cm]{\hfill +83.14}~{\color{red!60}\textbf{+15.37}}&\makebox[0.7cm]{\hfill +10.05}~{\color{red!60}\textbf{+3.43}}&\makebox[0.65cm]{\hfill 140.37}~{\color{green!60}\textbf{-17.88}}&\makebox[0.65cm]{\hfill 79.4}~{\color{green!60}\textbf{-15.27}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 2.18}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2032.69}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1764.97}~{\color{green!60}\textbf{-0.04}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 932.43}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 809.62}~{\color{green!60}\textbf{-0.02}}\\ +&extended&\makebox[0.5cm]{\hfill 10.86}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2201.59}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1766.76}~{\color{green!60}\textbf{-0.24}}&\makebox[0.7cm]{\hfill +8.31}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.1}~{\color{green!60}\textbf{-0.01}}&\makebox[0.65cm]{\hfill 202.82}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 162.76}~{\color{green!60}\textbf{-0.02}}\\ +&hint&\makebox[0.5cm]{\hfill 11.57}~{\color{green!60}\textbf{+0.39}}&\makebox[0.8cm]{\hfill 2136.67}~{\color{red!60}\textbf{+5}}&\makebox[0.8cm]{\hfill 2096.91}~{\color{red!60}\textbf{+22.75}}&\makebox[0.7cm]{\hfill +5.12}~{\color{red!60}\textbf{+0.25}}&\makebox[0.7cm]{\hfill +18.81}~{\color{red!60}\textbf{+1.29}}&\makebox[0.65cm]{\hfill 184.67}~{\color{green!60}\textbf{-6.08}}&\makebox[0.65cm]{\hfill 181.24}~{\color{green!60}\textbf{-4.37}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.97}~{\color{green!60}\textbf{+0.08}}&\makebox[0.8cm]{\hfill 2280.6}~{\color{red!60}\textbf{+21.51}}&\makebox[0.8cm]{\hfill 1926.49}~{\color{red!60}\textbf{+26.79}}&\makebox[0.7cm]{\hfill +12.2}~{\color{red!60}\textbf{+1.06}}&\makebox[0.7cm]{\hfill +9.15}~{\color{red!60}\textbf{+1.52}}&\makebox[0.65cm]{\hfill 190.53}~{\color{red!60}\textbf{+0.53}}&\makebox[0.65cm]{\hfill 160.94}~{\color{red!60}\textbf{+1.17}}\\ +\midrule +\multicolumn{9}{c}{NbIoT}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 2.44}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 714.79}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 593.47}~{\color{green!60}\textbf{-0.05}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 292.35}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 242.73}~{\color{green!60}\textbf{-0.02}}\\ +&extended&\makebox[0.5cm]{\hfill 6.38}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 760.83}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 591.14}~{\color{green!60}\textbf{-0.14}}&\makebox[0.7cm]{\hfill +6.44}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.39}~{\color{green!60}\textbf{-0.02}}&\makebox[0.65cm]{\hfill 119.25}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 92.65}~{\color{green!60}\textbf{-0.02}}\\ +&hint&\makebox[0.5cm]{\hfill 6.11}~{\color{green!60}\textbf{+1.31}}&\makebox[0.8cm]{\hfill 821.32}~{\color{red!60}\textbf{+49.46}}&\makebox[0.8cm]{\hfill 627.96}~{\color{red!60}\textbf{+13.15}}&\makebox[0.7cm]{\hfill +14.9}~{\color{red!60}\textbf{+6.92}}&\makebox[0.7cm]{\hfill +5.81}~{\color{red!60}\textbf{+2.22}}&\makebox[0.65cm]{\hfill 134.42}~{\color{green!60}\textbf{-26.21}}&\makebox[0.65cm]{\hfill 102.78}~{\color{green!60}\textbf{-25.18}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 9.82}~{\color{green!60}\textbf{+2.23}}&\makebox[0.8cm]{\hfill 858.74}~{\color{red!60}\textbf{+67.89}}&\makebox[0.8cm]{\hfill 635.36}~{\color{red!60}\textbf{+25.17}}&\makebox[0.7cm]{\hfill +20.14}~{\color{red!60}\textbf{+9.5}}&\makebox[0.7cm]{\hfill +7.06}~{\color{red!60}\textbf{+4.25}}&\makebox[0.65cm]{\hfill 87.45}~{\color{green!60}\textbf{-16.75}}&\makebox[0.65cm]{\hfill 64.7}~{\color{green!60}\textbf{-15.69}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 10.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2034.67}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1761.97}~{\color{green!60}\textbf{-3.14}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 196.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 169.99}~{\color{green!60}\textbf{-0.3}}\\ +&extended&\makebox[0.5cm]{\hfill 11.12}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2026.21}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1748.93}~{\color{green!60}\textbf{-3.9}}&\makebox[0.7cm]{\hfill -0.42}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.74}~{\color{green!60}\textbf{-0.04}}&\makebox[0.65cm]{\hfill 182.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 157.35}~{\color{green!60}\textbf{-0.35}}\\ +&hint&\makebox[0.5cm]{\hfill 11.96}~{\color{green!60}\textbf{+0.12}}&\makebox[0.8cm]{\hfill 2055.21}~{\color{red!60}\textbf{+1.43}}&\makebox[0.8cm]{\hfill 2028.09}~{\color{green!60}\textbf{-40.16}}&\makebox[0.7cm]{\hfill +1.01}~{\color{red!60}\textbf{+0.07}}&\makebox[0.7cm]{\hfill +15.1}~{\color{green!60}\textbf{-2.07}}&\makebox[0.65cm]{\hfill 171.84}~{\color{green!60}\textbf{-1.55}}&\makebox[0.65cm]{\hfill 169.57}~{\color{green!60}\textbf{-5.04}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.97}~{\color{green!60}\textbf{+0.07}}&\makebox[0.8cm]{\hfill 2044.19}~{\color{red!60}\textbf{+1.64}}&\makebox[0.8cm]{\hfill 2019.51}~{\color{green!60}\textbf{-20.2}}&\makebox[0.7cm]{\hfill +0.47}~{\color{red!60}\textbf{+0.08}}&\makebox[0.7cm]{\hfill +14.62}~{\color{green!60}\textbf{-0.94}}&\makebox[0.65cm]{\hfill 170.71}~{\color{green!60}\textbf{-0.87}}&\makebox[0.65cm]{\hfill 168.64}~{\color{green!60}\textbf{-2.69}}\\ +\bottomrule +\end{tabular} +\end{table*} diff --git a/analysis/figures/table_strategy_farhint.org b/analysis/figures/table_strategy_farhint.org new file mode 100644 index 0000000..7318fbe --- /dev/null +++ b/analysis/figures/table_strategy_farhint.org @@ -0,0 +1,36 @@ + +\begin{table*} +\centering +\caption{Simulation results using the strategy_farhint strategy. Comparison between our previous results\cite{prev} are in color. Green indicates improvements, red shows regressions and blue indicates no change.} +\begin{tabular}{crlllllll} +\toprule +\multirow{2}{*}{Uptime} & \multirow{2}{*}{Scenario} & \multirow{2}{*}{$\# Succ_p$} & \multicolumn{2}{c}{Energy Consumption (J)} & \multicolumn{2}{c}{$eOvhd(p)$ (\%)} & \multicolumn{2}{c}{$eff(p)$ (J)}\\ +\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9} +&&&Sender & Receiver&Sender & Receiver&Sender & Receiver\\ +\midrule +\multicolumn{9}{c}{LoRa}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 617.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 581.14}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&extended&\makebox[0.5cm]{\hfill 6.02}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1004.36}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 612.06}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +62.68}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +5.32}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 166.84}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 101.67}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 628.74}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 586.07}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +1.84}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.85}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&hintandextended&\makebox[0.5cm]{\hfill 8.11}~{\color{green!60}\textbf{+1.56}}&\makebox[0.8cm]{\hfill 1133.5}~{\color{red!60}\textbf{+97.74}}&\makebox[0.8cm]{\hfill 642.2}~{\color{red!60}\textbf{+22.58}}&\makebox[0.7cm]{\hfill +83.6}~{\color{red!60}\textbf{+15.83}}&\makebox[0.7cm]{\hfill +10.51}~{\color{red!60}\textbf{+3.89}}&\makebox[0.65cm]{\hfill 139.85}~{\color{green!60}\textbf{-18.4}}&\makebox[0.65cm]{\hfill 79.24}~{\color{green!60}\textbf{-15.44}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 2.18}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2032.69}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1765.01}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 932.43}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 809.64}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 10.86}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2201.59}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1767}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +8.31}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.11}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 202.82}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 162.78}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 11.68}~{\color{green!60}\textbf{+0.5}}&\makebox[0.8cm]{\hfill 2137.52}~{\color{red!60}\textbf{+5.85}}&\makebox[0.8cm]{\hfill 2140.98}~{\color{red!60}\textbf{+66.82}}&\makebox[0.7cm]{\hfill +5.16}~{\color{red!60}\textbf{+0.29}}&\makebox[0.7cm]{\hfill +21.3}~{\color{red!60}\textbf{+3.79}}&\makebox[0.65cm]{\hfill 183.01}~{\color{green!60}\textbf{-7.75}}&\makebox[0.65cm]{\hfill 183.3}~{\color{green!60}\textbf{-2.3}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.99}~{\color{green!60}\textbf{+0.1}}&\makebox[0.8cm]{\hfill 2254.61}~{\color{green!60}\textbf{-4.48}}&\makebox[0.8cm]{\hfill 1985.64}~{\color{red!60}\textbf{+85.94}}&\makebox[0.7cm]{\hfill +10.92}~{\color{green!60}\textbf{-0.22}}&\makebox[0.7cm]{\hfill +12.5}~{\color{red!60}\textbf{+4.87}}&\makebox[0.65cm]{\hfill 187.96}~{\color{green!60}\textbf{-2.04}}&\makebox[0.65cm]{\hfill 165.54}~{\color{red!60}\textbf{+5.77}}\\ +\midrule +\multicolumn{9}{c}{NbIoT}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 2.44}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 714.79}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 593.52}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 292.35}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 242.75}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 6.38}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 760.83}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 591.28}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +6.44}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.38}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 119.25}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 92.68}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 7.72}~{\color{green!60}\textbf{+2.92}}&\makebox[0.8cm]{\hfill 856.17}~{\color{red!60}\textbf{+84.31}}&\makebox[0.8cm]{\hfill 665.08}~{\color{red!60}\textbf{+50.27}}&\makebox[0.7cm]{\hfill +19.78}~{\color{red!60}\textbf{+11.8}}&\makebox[0.7cm]{\hfill +12.06}~{\color{red!60}\textbf{+8.47}}&\makebox[0.65cm]{\hfill 110.9}~{\color{green!60}\textbf{-49.73}}&\makebox[0.65cm]{\hfill 86.15}~{\color{green!60}\textbf{-41.8}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 10.22}~{\color{green!60}\textbf{+2.63}}&\makebox[0.8cm]{\hfill 864.57}~{\color{red!60}\textbf{+73.72}}&\makebox[0.8cm]{\hfill 661.81}~{\color{red!60}\textbf{+51.62}}&\makebox[0.7cm]{\hfill +20.96}~{\color{red!60}\textbf{+10.31}}&\makebox[0.7cm]{\hfill +11.51}~{\color{red!60}\textbf{+8.7}}&\makebox[0.65cm]{\hfill 84.55}~{\color{green!60}\textbf{-19.64}}&\makebox[0.65cm]{\hfill 64.72}~{\color{green!60}\textbf{-15.67}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 10.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2034.67}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1765.11}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 196.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 170.3}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 11.12}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2026.21}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1752.83}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.42}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.7}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 182.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 157.7}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 11.98}~{\color{green!60}\textbf{+0.14}}&\makebox[0.8cm]{\hfill 2057.18}~{\color{red!60}\textbf{+3.39}}&\makebox[0.8cm]{\hfill 2259.92}~{\color{red!60}\textbf{+191.67}}&\makebox[0.7cm]{\hfill +1.11}~{\color{red!60}\textbf{+0.17}}&\makebox[0.7cm]{\hfill +28.03}~{\color{red!60}\textbf{+10.86}}&\makebox[0.65cm]{\hfill 171.65}~{\color{green!60}\textbf{-1.74}}&\makebox[0.65cm]{\hfill 188.56}~{\color{red!60}\textbf{+13.95}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.99}~{\color{green!60}\textbf{+0.09}}&\makebox[0.8cm]{\hfill 2044.79}~{\color{red!60}\textbf{+2.24}}&\makebox[0.8cm]{\hfill 2237.9}~{\color{red!60}\textbf{+198.18}}&\makebox[0.7cm]{\hfill +0.5}~{\color{red!60}\textbf{+0.11}}&\makebox[0.7cm]{\hfill +26.79}~{\color{red!60}\textbf{+11.23}}&\makebox[0.65cm]{\hfill 170.54}~{\color{green!60}\textbf{-1.03}}&\makebox[0.65cm]{\hfill 186.65}~{\color{red!60}\textbf{+15.31}}\\ +\bottomrule +\end{tabular} +\end{table*} diff --git a/analysis/figures/table_strategy_sor.org b/analysis/figures/table_strategy_sor.org new file mode 100644 index 0000000..e471150 --- /dev/null +++ b/analysis/figures/table_strategy_sor.org @@ -0,0 +1,36 @@ + +\begin{table*} +\centering +\caption{Simulation results using the strategy_sor strategy. Comparison between our previous results\cite{prev} are in color. Green indicates improvements, red shows regressions and blue indicates no change.} +\begin{tabular}{crlllllll} +\toprule +\multirow{2}{*}{Uptime} & \multirow{2}{*}{Scenario} & \multirow{2}{*}{$\# Succ_p$} & \multicolumn{2}{c}{Energy Consumption (J)} & \multicolumn{2}{c}{$eOvhd(p)$ (\%)} & \multicolumn{2}{c}{$eff(p)$ (J)}\\ +\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9} +&&&Sender & Receiver&Sender & Receiver&Sender & Receiver\\ +\midrule +\multicolumn{9}{c}{LoRa}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 617.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 581.14}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&extended&\makebox[0.5cm]{\hfill 6.02}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1004.36}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 612.06}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +62.68}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +5.32}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 166.84}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 101.67}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 628.74}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 586.07}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +1.84}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.85}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&hintandextended&\makebox[0.5cm]{\hfill 6.54}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1035.76}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 619.62}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +67.77}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +6.62}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 158.25}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 94.67}~{\color{blue!60}\textbf{=}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 2.18}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2032.69}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1763.96}~{\color{green!60}\textbf{-1.05}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 932.43}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 809.16}~{\color{green!60}\textbf{-0.48}}\\ +&extended&\makebox[0.5cm]{\hfill 10.86}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2201.59}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1764.07}~{\color{green!60}\textbf{-2.93}}&\makebox[0.7cm]{\hfill +8.31}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.01}~{\color{green!60}\textbf{-0.11}}&\makebox[0.65cm]{\hfill 202.82}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 162.51}~{\color{green!60}\textbf{-0.27}}\\ +&hint&\makebox[0.5cm]{\hfill 10.8}~{\color{red!60}\textbf{-0.38}}&\makebox[0.8cm]{\hfill 2133.02}~{\color{red!60}\textbf{+1.35}}&\makebox[0.8cm]{\hfill 2028.98}~{\color{green!60}\textbf{-45.18}}&\makebox[0.7cm]{\hfill +4.94}~{\color{red!60}\textbf{+0.07}}&\makebox[0.7cm]{\hfill +15.02}~{\color{green!60}\textbf{-2.49}}&\makebox[0.65cm]{\hfill 197.59}~{\color{red!60}\textbf{+6.84}}&\makebox[0.65cm]{\hfill 187.96}~{\color{red!60}\textbf{+2.35}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.85}~{\color{red!60}\textbf{-0.04}}&\makebox[0.8cm]{\hfill 2251.64}~{\color{green!60}\textbf{-7.45}}&\makebox[0.8cm]{\hfill 1879.74}~{\color{green!60}\textbf{-19.96}}&\makebox[0.7cm]{\hfill +10.77}~{\color{green!60}\textbf{-0.37}}&\makebox[0.7cm]{\hfill +6.56}~{\color{green!60}\textbf{-1.07}}&\makebox[0.65cm]{\hfill 190.01}~{\color{red!60}\textbf{+0.01}}&\makebox[0.65cm]{\hfill 158.63}~{\color{green!60}\textbf{-1.14}}\\ +\midrule +\multicolumn{9}{c}{NbIoT}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 2.44}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 714.79}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 592.29}~{\color{green!60}\textbf{-1.22}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 292.35}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 242.25}~{\color{green!60}\textbf{-0.5}}\\ +&extended&\makebox[0.5cm]{\hfill 6.38}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 760.83}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 588.96}~{\color{green!60}\textbf{-2.32}}&\makebox[0.7cm]{\hfill +6.44}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.56}~{\color{green!60}\textbf{-0.19}}&\makebox[0.65cm]{\hfill 119.25}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 92.31}~{\color{green!60}\textbf{-0.36}}\\ +&hint&\makebox[0.5cm]{\hfill 4.69}~{\color{red!60}\textbf{-0.11}}&\makebox[0.8cm]{\hfill 777.89}~{\color{red!60}\textbf{+6.03}}&\makebox[0.8cm]{\hfill 608.42}~{\color{green!60}\textbf{-6.39}}&\makebox[0.7cm]{\hfill +8.83}~{\color{red!60}\textbf{+0.84}}&\makebox[0.7cm]{\hfill +2.72}~{\color{green!60}\textbf{-0.86}}&\makebox[0.65cm]{\hfill 165.86}~{\color{red!60}\textbf{+5.23}}&\makebox[0.65cm]{\hfill 129.73}~{\color{red!60}\textbf{+1.77}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 7.32}~{\color{red!60}\textbf{-0.26}}&\makebox[0.8cm]{\hfill 785.91}~{\color{green!60}\textbf{-4.95}}&\makebox[0.8cm]{\hfill 602.98}~{\color{green!60}\textbf{-7.21}}&\makebox[0.7cm]{\hfill +9.95}~{\color{green!60}\textbf{-0.69}}&\makebox[0.7cm]{\hfill +1.8}~{\color{green!60}\textbf{-1.01}}&\makebox[0.65cm]{\hfill 107.29}~{\color{red!60}\textbf{+3.09}}&\makebox[0.65cm]{\hfill 82.32}~{\color{red!60}\textbf{+1.92}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 10.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2034.67}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1729.62}~{\color{green!60}\textbf{-35.49}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 196.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 166.87}~{\color{green!60}\textbf{-3.42}}\\ +&extended&\makebox[0.5cm]{\hfill 11.12}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2026.21}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1717.55}~{\color{green!60}\textbf{-35.28}}&\makebox[0.7cm]{\hfill -0.42}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.7}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 182.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 154.53}~{\color{green!60}\textbf{-3.17}}\\ +&hint&\makebox[0.5cm]{\hfill 11.79}~{\color{red!60}\textbf{-0.06}}&\makebox[0.8cm]{\hfill 2054.06}~{\color{red!60}\textbf{+0.27}}&\makebox[0.8cm]{\hfill 1937.27}~{\color{green!60}\textbf{-130.97}}&\makebox[0.7cm]{\hfill +0.95}~{\color{red!60}\textbf{+0.01}}&\makebox[0.7cm]{\hfill +12.01}~{\color{green!60}\textbf{-5.17}}&\makebox[0.65cm]{\hfill 174.22}~{\color{red!60}\textbf{+0.83}}&\makebox[0.65cm]{\hfill 164.31}~{\color{green!60}\textbf{-10.29}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.85}~{\color{red!60}\textbf{-0.06}}&\makebox[0.8cm]{\hfill 2041.5}~{\color{green!60}\textbf{-1.05}}&\makebox[0.8cm]{\hfill 1916.28}~{\color{green!60}\textbf{-123.44}}&\makebox[0.7cm]{\hfill +0.34}~{\color{green!60}\textbf{-0.05}}&\makebox[0.7cm]{\hfill +10.79}~{\color{green!60}\textbf{-4.77}}&\makebox[0.65cm]{\hfill 172.35}~{\color{red!60}\textbf{+0.78}}&\makebox[0.65cm]{\hfill 161.78}~{\color{green!60}\textbf{-9.55}}\\ +\bottomrule +\end{tabular} +\end{table*} diff --git a/analysis/figures/table_strategy_uor.org b/analysis/figures/table_strategy_uor.org new file mode 100644 index 0000000..4d95c89 --- /dev/null +++ b/analysis/figures/table_strategy_uor.org @@ -0,0 +1,36 @@ + +\begin{table*} +\centering +\caption{Simulation results using the strategy_uor strategy. Comparison between our previous results\cite{prev} are in color. Green indicates improvements, red shows regressions and blue indicates no change.} +\begin{tabular}{crlllllll} +\toprule +\multirow{2}{*}{Uptime} & \multirow{2}{*}{Scenario} & \multirow{2}{*}{$\# Succ_p$} & \multicolumn{2}{c}{Energy Consumption (J)} & \multicolumn{2}{c}{$eOvhd(p)$ (\%)} & \multicolumn{2}{c}{$eff(p)$ (J)}\\ +\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9} +&&&Sender & Receiver&Sender & Receiver&Sender & Receiver\\ +\midrule +\multicolumn{9}{c}{LoRa}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 617.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 581.14}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&extended&\makebox[0.5cm]{\hfill 6.02}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1004.36}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 612.06}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +62.68}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +5.32}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 166.84}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 101.67}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 628.74}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 586.07}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +1.84}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.85}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill --}&\makebox[0.65cm]{\hfill --}\\ +&hintandextended&\makebox[0.5cm]{\hfill 6.46}~{\color{red!60}\textbf{-0.08}}&\makebox[0.8cm]{\hfill 1031.35}~{\color{green!60}\textbf{-4.41}}&\makebox[0.8cm]{\hfill 617.27}~{\color{green!60}\textbf{-2.34}}&\makebox[0.7cm]{\hfill +67.05}~{\color{green!60}\textbf{-0.71}}&\makebox[0.7cm]{\hfill +6.22}~{\color{green!60}\textbf{-0.4}}&\makebox[0.65cm]{\hfill 159.53}~{\color{red!60}\textbf{+1.28}}&\makebox[0.65cm]{\hfill 95.48}~{\color{red!60}\textbf{+0.81}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 2.18}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2032.69}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1765.01}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 932.43}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 809.64}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 10.86}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2201.59}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1767}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +8.31}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +0.11}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 202.82}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 162.78}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 11.19}~{\color{green!60}\textbf{+0.01}}&\makebox[0.8cm]{\hfill 2133.37}~{\color{red!60}\textbf{+1.69}}&\makebox[0.8cm]{\hfill 2073.37}~{\color{green!60}\textbf{-0.79}}&\makebox[0.7cm]{\hfill +4.95}~{\color{red!60}\textbf{+0.08}}&\makebox[0.7cm]{\hfill +17.47}~{\color{green!60}\textbf{-0.04}}&\makebox[0.65cm]{\hfill 190.73}~{\color{green!60}\textbf{-0.02}}&\makebox[0.65cm]{\hfill 185.37}~{\color{green!60}\textbf{-0.24}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.85}~{\color{red!60}\textbf{-0.04}}&\makebox[0.8cm]{\hfill 2252.17}~{\color{green!60}\textbf{-6.92}}&\makebox[0.8cm]{\hfill 1871.36}~{\color{green!60}\textbf{-28.34}}&\makebox[0.7cm]{\hfill +10.8}~{\color{green!60}\textbf{-0.34}}&\makebox[0.7cm]{\hfill +6.03}~{\color{green!60}\textbf{-1.61}}&\makebox[0.65cm]{\hfill 190.14}~{\color{red!60}\textbf{+0.14}}&\makebox[0.65cm]{\hfill 157.99}~{\color{green!60}\textbf{-1.79}}\\ +\midrule +\multicolumn{9}{c}{NbIoT}\\ +\midrule +\multirow{4}{*}{60}&baseline&\makebox[0.5cm]{\hfill 2.44}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 714.79}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 593.52}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 292.35}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 242.75}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 6.38}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 760.83}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 591.28}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill +6.44}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.38}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 119.25}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 92.68}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 4.66}~{\color{red!60}\textbf{-0.14}}&\makebox[0.8cm]{\hfill 768.19}~{\color{green!60}\textbf{-3.67}}&\makebox[0.8cm]{\hfill 612.71}~{\color{green!60}\textbf{-2.1}}&\makebox[0.7cm]{\hfill +7.47}~{\color{green!60}\textbf{-0.51}}&\makebox[0.7cm]{\hfill +3.23}~{\color{green!60}\textbf{-0.35}}&\makebox[0.65cm]{\hfill 164.67}~{\color{red!60}\textbf{+4.03}}&\makebox[0.65cm]{\hfill 131.34}~{\color{red!60}\textbf{+3.39}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 7.44}~{\color{red!60}\textbf{-0.15}}&\makebox[0.8cm]{\hfill 786.55}~{\color{green!60}\textbf{-4.31}}&\makebox[0.8cm]{\hfill 605.19}~{\color{green!60}\textbf{-5.01}}&\makebox[0.7cm]{\hfill +10.04}~{\color{green!60}\textbf{-0.6}}&\makebox[0.7cm]{\hfill +1.97}~{\color{green!60}\textbf{-0.84}}&\makebox[0.65cm]{\hfill 105.72}~{\color{red!60}\textbf{+1.52}}&\makebox[0.65cm]{\hfill 81.34}~{\color{red!60}\textbf{+0.95}}\\ +\midrule +\multirow{4}{*}{180}&baseline&\makebox[0.5cm]{\hfill 10.37}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2034.67}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1765.11}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill 0}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 196.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 170.3}~{\color{blue!60}\textbf{=}}\\ +&extended&\makebox[0.5cm]{\hfill 11.12}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 2026.21}~{\color{blue!60}\textbf{=}}&\makebox[0.8cm]{\hfill 1752.83}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.42}~{\color{blue!60}\textbf{=}}&\makebox[0.7cm]{\hfill -0.7}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 182.3}~{\color{blue!60}\textbf{=}}&\makebox[0.65cm]{\hfill 157.7}~{\color{blue!60}\textbf{=}}\\ +&hint&\makebox[0.5cm]{\hfill 11.8}~{\color{red!60}\textbf{-0.04}}&\makebox[0.8cm]{\hfill 2053.65}~{\color{green!60}\textbf{-0.13}}&\makebox[0.8cm]{\hfill 1994.3}~{\color{green!60}\textbf{-73.95}}&\makebox[0.7cm]{\hfill +0.93}~{\color{green!60}\textbf{-0.01}}&\makebox[0.7cm]{\hfill +12.98}~{\color{green!60}\textbf{-4.19}}&\makebox[0.65cm]{\hfill 174.04}~{\color{red!60}\textbf{+0.65}}&\makebox[0.65cm]{\hfill 169.01}~{\color{green!60}\textbf{-5.6}}\\ +&hintandextended&\makebox[0.5cm]{\hfill 11.84}~{\color{red!60}\textbf{-0.07}}&\makebox[0.8cm]{\hfill 2041.39}~{\color{green!60}\textbf{-1.16}}&\makebox[0.8cm]{\hfill 1965.96}~{\color{green!60}\textbf{-73.76}}&\makebox[0.7cm]{\hfill +0.33}~{\color{green!60}\textbf{-0.06}}&\makebox[0.7cm]{\hfill +11.38}~{\color{green!60}\textbf{-4.18}}&\makebox[0.65cm]{\hfill 172.49}~{\color{red!60}\textbf{+0.92}}&\makebox[0.65cm]{\hfill 166.11}~{\color{green!60}\textbf{-5.22}}\\ +\bottomrule +\end{tabular} +\end{table*} diff --git a/analysis/renv.lock b/analysis/renv.lock new file mode 100644 index 0000000..8a986da --- /dev/null +++ b/analysis/renv.lock @@ -0,0 +1,1565 @@ +{ + "R": { + "Version": "4.2.2", + "Repositories": [ + { + "Name": "CRAN", + "URL": "https://cloud.r-project.org" + } + ] + }, + "Packages": { + "DBI": { + "Package": "DBI", + "Version": "1.2.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "065ae649b05f1ff66bb0c793107508f5" + }, + "MASS": { + "Package": "MASS", + "Version": "7.3-58.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats", + "utils" + ], + "Hash": "e02d1a0f6122fd3e634b25b433704344" + }, + "Matrix": { + "Package": "Matrix", + "Version": "1.5-3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "graphics", + "grid", + "lattice", + "methods", + "stats", + "utils" + ], + "Hash": "4006dffe49958d2dd591c17e61e60591" + }, + "R6": { + "Package": "R6", + "Version": "2.5.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "470851b6d5d0ac559e9d01bb352b4021" + }, + "RColorBrewer": { + "Package": "RColorBrewer", + "Version": "1.1-3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "45f0398006e83a5b10b72a90663d8d8c" + }, + "askpass": { + "Package": "askpass", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "sys" + ], + "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" + }, + "backports": { + "Package": "backports", + "Version": "1.5.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "e1e1b9d75c37401117b636b7ae50827a" + }, + "base64enc": { + "Package": "base64enc", + "Version": "0.1-3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "543776ae6848fde2f48ff3816d0628bc" + }, + "bit": { + "Package": "bit", + "Version": "4.0.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "d242abec29412ce988848d0294b208fd" + }, + "bit64": { + "Package": "bit64", + "Version": "4.0.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "bit", + "methods", + "stats", + "utils" + ], + "Hash": "9fe98599ca456d6552421db0d6772d8f" + }, + "blob": { + "Package": "blob", + "Version": "1.2.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "methods", + "rlang", + "vctrs" + ], + "Hash": "40415719b5a479b87949f3aa0aee737c" + }, + "broom": { + "Package": "broom", + "Version": "1.0.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "backports", + "dplyr", + "generics", + "glue", + "lifecycle", + "purrr", + "rlang", + "stringr", + "tibble", + "tidyr" + ], + "Hash": "a4652c36d1f8abfc3ddf4774f768c934" + }, + "bslib": { + "Package": "bslib", + "Version": "0.7.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "base64enc", + "cachem", + "fastmap", + "grDevices", + "htmltools", + "jquerylib", + "jsonlite", + "lifecycle", + "memoise", + "mime", + "rlang", + "sass" + ], + "Hash": "8644cc53f43828f19133548195d7e59e" + }, + "cachem": { + "Package": "cachem", + "Version": "1.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "fastmap", + "rlang" + ], + "Hash": "cd9a672193789068eb5a2aad65a0dedf" + }, + "callr": { + "Package": "callr", + "Version": "3.7.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "processx", + "utils" + ], + "Hash": "d7e13f49c19103ece9e58ad2d83a7354" + }, + "cellranger": { + "Package": "cellranger", + "Version": "1.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "rematch", + "tibble" + ], + "Hash": "f61dbaec772ccd2e17705c1e872e9e7c" + }, + "cli": { + "Package": "cli", + "Version": "3.6.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "b21916dd77a27642b447374a5d30ecf3" + }, + "clipr": { + "Package": "clipr", + "Version": "0.8.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "3f038e5ac7f41d4ac41ce658c85e3042" + }, + "colorspace": { + "Package": "colorspace", + "Version": "2.1-0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats" + ], + "Hash": "f20c47fd52fae58b4e377c37bb8c335b" + }, + "conflicted": { + "Package": "conflicted", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "memoise", + "rlang" + ], + "Hash": "bb097fccb22d156624fd07cd2894ddb6" + }, + "cpp11": { + "Package": "cpp11", + "Version": "0.4.7", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "5a295d7d963cc5035284dcdbaf334f4e" + }, + "crayon": { + "Package": "crayon", + "Version": "1.5.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "grDevices", + "methods", + "utils" + ], + "Hash": "859d96e65ef198fd43e82b9628d593ef" + }, + "curl": { + "Package": "curl", + "Version": "5.2.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" + }, + "data.table": { + "Package": "data.table", + "Version": "1.15.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "8ee9ac56ef633d0c7cab8b2ca87d683e" + }, + "dbplyr": { + "Package": "dbplyr", + "Version": "2.5.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "DBI", + "R", + "R6", + "blob", + "cli", + "dplyr", + "glue", + "lifecycle", + "magrittr", + "methods", + "pillar", + "purrr", + "rlang", + "tibble", + "tidyr", + "tidyselect", + "utils", + "vctrs", + "withr" + ], + "Hash": "39b2e002522bfd258039ee4e889e0fd1" + }, + "digest": { + "Package": "digest", + "Version": "0.6.35", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "698ece7ba5a4fa4559e3d537e7ec3d31" + }, + "dplyr": { + "Package": "dplyr", + "Version": "1.1.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "cli", + "generics", + "glue", + "lifecycle", + "magrittr", + "methods", + "pillar", + "rlang", + "tibble", + "tidyselect", + "utils", + "vctrs" + ], + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" + }, + "dtplyr": { + "Package": "dtplyr", + "Version": "1.3.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "data.table", + "dplyr", + "glue", + "lifecycle", + "rlang", + "tibble", + "tidyselect", + "vctrs" + ], + "Hash": "54ed3ea01b11e81a86544faaecfef8e2" + }, + "evaluate": { + "Package": "evaluate", + "Version": "0.24.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "a1066cbc05caee9a4bf6d90f194ff4da" + }, + "fansi": { + "Package": "fansi", + "Version": "1.0.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "utils" + ], + "Hash": "962174cf2aeb5b9eea581522286a911f" + }, + "farver": { + "Package": "farver", + "Version": "2.1.2", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "680887028577f3fa2a81e410ed0d6e42" + }, + "fastmap": { + "Package": "fastmap", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "aa5e1cd11c2d15497494c5292d7ffcc8" + }, + "fontawesome": { + "Package": "fontawesome", + "Version": "0.5.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "htmltools", + "rlang" + ], + "Hash": "c2efdd5f0bcd1ea861c2d4e2a883a67d" + }, + "forcats": { + "Package": "forcats", + "Version": "1.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "lifecycle", + "magrittr", + "rlang", + "tibble" + ], + "Hash": "1a0a9a3d5083d0d573c4214576f1e690" + }, + "fs": { + "Package": "fs", + "Version": "1.6.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "15aeb8c27f5ea5161f9f6a641fafd93a" + }, + "gargle": { + "Package": "gargle", + "Version": "1.5.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "fs", + "glue", + "httr", + "jsonlite", + "lifecycle", + "openssl", + "rappdirs", + "rlang", + "stats", + "utils", + "withr" + ], + "Hash": "fc0b272e5847c58cd5da9b20eedbd026" + }, + "generics": { + "Package": "generics", + "Version": "0.1.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "15e9634c0fcd294799e9b2e929ed1b86" + }, + "ggplot2": { + "Package": "ggplot2", + "Version": "3.5.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "MASS", + "R", + "cli", + "glue", + "grDevices", + "grid", + "gtable", + "isoband", + "lifecycle", + "mgcv", + "rlang", + "scales", + "stats", + "tibble", + "vctrs", + "withr" + ], + "Hash": "44c6a2f8202d5b7e878ea274b1092426" + }, + "ggthemes": { + "Package": "ggthemes", + "Version": "5.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "ggplot2", + "graphics", + "grid", + "lifecycle", + "methods", + "purrr", + "scales", + "stringr", + "tibble" + ], + "Hash": "16a4974681fc751a09a1250431361896" + }, + "glue": { + "Package": "glue", + "Version": "1.7.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "e0b3a53876554bd45879e596cdb10a52" + }, + "googledrive": { + "Package": "googledrive", + "Version": "2.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "gargle", + "glue", + "httr", + "jsonlite", + "lifecycle", + "magrittr", + "pillar", + "purrr", + "rlang", + "tibble", + "utils", + "uuid", + "vctrs", + "withr" + ], + "Hash": "e99641edef03e2a5e87f0a0b1fcc97f4" + }, + "googlesheets4": { + "Package": "googlesheets4", + "Version": "1.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cellranger", + "cli", + "curl", + "gargle", + "glue", + "googledrive", + "httr", + "ids", + "lifecycle", + "magrittr", + "methods", + "purrr", + "rematch2", + "rlang", + "tibble", + "utils", + "vctrs", + "withr" + ], + "Hash": "d6db1667059d027da730decdc214b959" + }, + "gridExtra": { + "Package": "gridExtra", + "Version": "2.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "grDevices", + "graphics", + "grid", + "gtable", + "utils" + ], + "Hash": "7d7f283939f563670a697165b2cf5560" + }, + "gtable": { + "Package": "gtable", + "Version": "0.3.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "grid", + "lifecycle", + "rlang" + ], + "Hash": "e18861963cbc65a27736e02b3cd3c4a0" + }, + "haven": { + "Package": "haven", + "Version": "2.5.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "cpp11", + "forcats", + "hms", + "lifecycle", + "methods", + "readr", + "rlang", + "tibble", + "tidyselect", + "vctrs" + ], + "Hash": "9171f898db9d9c4c1b2c745adc2c1ef1" + }, + "highr": { + "Package": "highr", + "Version": "0.11", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "xfun" + ], + "Hash": "d65ba49117ca223614f71b60d85b8ab7" + }, + "hms": { + "Package": "hms", + "Version": "1.1.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "lifecycle", + "methods", + "pkgconfig", + "rlang", + "vctrs" + ], + "Hash": "b59377caa7ed00fa41808342002138f9" + }, + "htmltools": { + "Package": "htmltools", + "Version": "0.5.8.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "base64enc", + "digest", + "fastmap", + "grDevices", + "rlang", + "utils" + ], + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" + }, + "httr": { + "Package": "httr", + "Version": "1.4.7", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "curl", + "jsonlite", + "mime", + "openssl" + ], + "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" + }, + "ids": { + "Package": "ids", + "Version": "1.0.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "openssl", + "uuid" + ], + "Hash": "99df65cfef20e525ed38c3d2577f7190" + }, + "isoband": { + "Package": "isoband", + "Version": "0.2.7", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "grid", + "utils" + ], + "Hash": "0080607b4a1a7b28979aecef976d8bc2" + }, + "jquerylib": { + "Package": "jquerylib", + "Version": "0.1.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "htmltools" + ], + "Hash": "5aab57a3bd297eee1c1d862735972182" + }, + "jsonlite": { + "Package": "jsonlite", + "Version": "1.8.8", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "methods" + ], + "Hash": "e1b9c55281c5adc4dd113652d9e26768" + }, + "knitr": { + "Package": "knitr", + "Version": "1.47", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "evaluate", + "highr", + "methods", + "tools", + "xfun", + "yaml" + ], + "Hash": "7c99b2d55584b982717fcc0950378612" + }, + "labeling": { + "Package": "labeling", + "Version": "0.4.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "graphics", + "stats" + ], + "Hash": "b64ec208ac5bc1852b285f665d6368b3" + }, + "latex2exp": { + "Package": "latex2exp", + "Version": "0.9.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "magrittr", + "stringr" + ], + "Hash": "f0173e0120a278700d48998e5a93a000" + }, + "lattice": { + "Package": "lattice", + "Version": "0.20-45", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics", + "grid", + "stats", + "utils" + ], + "Hash": "b64cdbb2b340437c4ee047a1f4c4377b" + }, + "lifecycle": { + "Package": "lifecycle", + "Version": "1.0.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "rlang" + ], + "Hash": "b8552d117e1b808b09a832f589b79035" + }, + "lubridate": { + "Package": "lubridate", + "Version": "1.9.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "generics", + "methods", + "timechange" + ], + "Hash": "680ad542fbcf801442c83a6ac5a2126c" + }, + "magrittr": { + "Package": "magrittr", + "Version": "2.0.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "7ce2733a9826b3aeb1775d56fd305472" + }, + "memoise": { + "Package": "memoise", + "Version": "2.0.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "cachem", + "rlang" + ], + "Hash": "e2817ccf4a065c5d9d7f2cfbe7c1d78c" + }, + "mgcv": { + "Package": "mgcv", + "Version": "1.8-41", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "Matrix", + "R", + "graphics", + "methods", + "nlme", + "splines", + "stats", + "utils" + ], + "Hash": "6b3904f13346742caa3e82dd0303d4ad" + }, + "mime": { + "Package": "mime", + "Version": "0.12", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "tools" + ], + "Hash": "18e9c28c1d3ca1560ce30658b22ce104" + }, + "modelr": { + "Package": "modelr", + "Version": "0.1.11", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "broom", + "magrittr", + "purrr", + "rlang", + "tibble", + "tidyr", + "tidyselect", + "vctrs" + ], + "Hash": "4f50122dc256b1b6996a4703fecea821" + }, + "munsell": { + "Package": "munsell", + "Version": "0.5.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "colorspace", + "methods" + ], + "Hash": "4fd8900853b746af55b81fda99da7695" + }, + "nlme": { + "Package": "nlme", + "Version": "3.1-162", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "graphics", + "lattice", + "stats", + "utils" + ], + "Hash": "0984ce8da8da9ead8643c5cbbb60f83e" + }, + "openssl": { + "Package": "openssl", + "Version": "2.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "askpass" + ], + "Hash": "2bcca3848e4734eb3b16103bc9aa4b8e" + }, + "patchwork": { + "Package": "patchwork", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "cli", + "ggplot2", + "grDevices", + "graphics", + "grid", + "gtable", + "rlang", + "stats", + "utils" + ], + "Hash": "9c8ab14c00ac07e9e04d1664c0b74486" + }, + "pillar": { + "Package": "pillar", + "Version": "1.9.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "cli", + "fansi", + "glue", + "lifecycle", + "rlang", + "utf8", + "utils", + "vctrs" + ], + "Hash": "15da5a8412f317beeee6175fbc76f4bb" + }, + "pkgconfig": { + "Package": "pkgconfig", + "Version": "2.0.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "01f28d4278f15c76cddbea05899c5d6f" + }, + "prettyunits": { + "Package": "prettyunits", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7" + }, + "processx": { + "Package": "processx", + "Version": "3.8.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "ps", + "utils" + ], + "Hash": "0c90a7d71988856bad2a2a45dd871bb9" + }, + "progress": { + "Package": "progress", + "Version": "1.2.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "crayon", + "hms", + "prettyunits" + ], + "Hash": "f4625e061cb2865f111b47ff163a5ca6" + }, + "ps": { + "Package": "ps", + "Version": "1.7.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "dd2b9319ee0656c8acf45c7f40c59de7" + }, + "purrr": { + "Package": "purrr", + "Version": "1.0.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "lifecycle", + "magrittr", + "rlang", + "vctrs" + ], + "Hash": "1cba04a4e9414bdefc9dcaa99649a8dc" + }, + "ragg": { + "Package": "ragg", + "Version": "1.3.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "systemfonts", + "textshaping" + ], + "Hash": "e3087db406e079a8a2fd87f413918ed3" + }, + "rappdirs": { + "Package": "rappdirs", + "Version": "0.3.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "5e3c5dc0b071b21fa128676560dbe94d" + }, + "readr": { + "Package": "readr", + "Version": "2.1.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "cli", + "clipr", + "cpp11", + "crayon", + "hms", + "lifecycle", + "methods", + "rlang", + "tibble", + "tzdb", + "utils", + "vroom" + ], + "Hash": "9de96463d2117f6ac49980577939dfb3" + }, + "readxl": { + "Package": "readxl", + "Version": "1.4.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cellranger", + "cpp11", + "progress", + "tibble", + "utils" + ], + "Hash": "8cf9c239b96df1bbb133b74aef77ad0a" + }, + "rematch": { + "Package": "rematch", + "Version": "2.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "cbff1b666c6fa6d21202f07e2318d4f1" + }, + "rematch2": { + "Package": "rematch2", + "Version": "2.1.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "tibble" + ], + "Hash": "76c9e04c712a05848ae7a23d2f170a40" + }, + "renv": { + "Package": "renv", + "Version": "1.0.7", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "397b7b2a265bc5a7a06852524dabae20" + }, + "reprex": { + "Package": "reprex", + "Version": "2.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "callr", + "cli", + "clipr", + "fs", + "glue", + "knitr", + "lifecycle", + "rlang", + "rmarkdown", + "rstudioapi", + "utils", + "withr" + ], + "Hash": "1425f91b4d5d9a8f25352c44a3d914ed" + }, + "rlang": { + "Package": "rlang", + "Version": "1.1.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "3eec01f8b1dee337674b2e34ab1f9bc1" + }, + "rmarkdown": { + "Package": "rmarkdown", + "Version": "2.27", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "bslib", + "evaluate", + "fontawesome", + "htmltools", + "jquerylib", + "jsonlite", + "knitr", + "methods", + "tinytex", + "tools", + "utils", + "xfun", + "yaml" + ], + "Hash": "27f9502e1cdbfa195f94e03b0f517484" + }, + "rstudioapi": { + "Package": "rstudioapi", + "Version": "0.16.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "96710351d642b70e8f02ddeb237c46a7" + }, + "rvest": { + "Package": "rvest", + "Version": "1.0.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "httr", + "lifecycle", + "magrittr", + "rlang", + "selectr", + "tibble", + "xml2" + ], + "Hash": "0bcf0c6f274e90ea314b812a6d19a519" + }, + "sass": { + "Package": "sass", + "Version": "0.4.9", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R6", + "fs", + "htmltools", + "rappdirs", + "rlang" + ], + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" + }, + "scales": { + "Package": "scales", + "Version": "1.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "RColorBrewer", + "cli", + "farver", + "glue", + "labeling", + "lifecycle", + "munsell", + "rlang", + "viridisLite" + ], + "Hash": "c19df082ba346b0ffa6f833e92de34d1" + }, + "selectr": { + "Package": "selectr", + "Version": "0.4-2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "methods", + "stringr" + ], + "Hash": "3838071b66e0c566d55cc26bd6e27bf4" + }, + "stringi": { + "Package": "stringi", + "Version": "1.8.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "stats", + "tools", + "utils" + ], + "Hash": "39e1144fd75428983dc3f63aa53dfa91" + }, + "stringr": { + "Package": "stringr", + "Version": "1.5.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "lifecycle", + "magrittr", + "rlang", + "stringi", + "vctrs" + ], + "Hash": "960e2ae9e09656611e0b8214ad543207" + }, + "sys": { + "Package": "sys", + "Version": "3.4.2", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" + }, + "systemfonts": { + "Package": "systemfonts", + "Version": "1.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11", + "lifecycle" + ], + "Hash": "213b6b8ed5afbf934843e6c3b090d418" + }, + "textshaping": { + "Package": "textshaping", + "Version": "0.4.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11", + "lifecycle", + "systemfonts" + ], + "Hash": "5142f8bc78ed3d819d26461b641627ce" + }, + "tibble": { + "Package": "tibble", + "Version": "3.2.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "fansi", + "lifecycle", + "magrittr", + "methods", + "pillar", + "pkgconfig", + "rlang", + "utils", + "vctrs" + ], + "Hash": "a84e2cc86d07289b3b6f5069df7a004c" + }, + "tidyr": { + "Package": "tidyr", + "Version": "1.3.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "cpp11", + "dplyr", + "glue", + "lifecycle", + "magrittr", + "purrr", + "rlang", + "stringr", + "tibble", + "tidyselect", + "utils", + "vctrs" + ], + "Hash": "915fb7ce036c22a6a33b5a8adb712eb1" + }, + "tidyselect": { + "Package": "tidyselect", + "Version": "1.2.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "lifecycle", + "rlang", + "vctrs", + "withr" + ], + "Hash": "829f27b9c4919c16b593794a6344d6c0" + }, + "tidyverse": { + "Package": "tidyverse", + "Version": "2.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "broom", + "cli", + "conflicted", + "dbplyr", + "dplyr", + "dtplyr", + "forcats", + "ggplot2", + "googledrive", + "googlesheets4", + "haven", + "hms", + "httr", + "jsonlite", + "lubridate", + "magrittr", + "modelr", + "pillar", + "purrr", + "ragg", + "readr", + "readxl", + "reprex", + "rlang", + "rstudioapi", + "rvest", + "stringr", + "tibble", + "tidyr", + "xml2" + ], + "Hash": "c328568cd14ea89a83bd4ca7f54ae07e" + }, + "timechange": { + "Package": "timechange", + "Version": "0.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11" + ], + "Hash": "c5f3c201b931cd6474d17d8700ccb1c8" + }, + "tinytex": { + "Package": "tinytex", + "Version": "0.51", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "xfun" + ], + "Hash": "d44e2fcd2e4e076f0aac540208559d1d" + }, + "tzdb": { + "Package": "tzdb", + "Version": "0.4.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11" + ], + "Hash": "f561504ec2897f4d46f0c7657e488ae1" + }, + "utf8": { + "Package": "utf8", + "Version": "1.2.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "62b65c52671e6665f803ff02954446e9" + }, + "uuid": { + "Package": "uuid", + "Version": "1.2-0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "303c19bfd970bece872f93a824e323d9" + }, + "vctrs": { + "Package": "vctrs", + "Version": "0.6.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "lifecycle", + "rlang" + ], + "Hash": "c03fa420630029418f7e6da3667aac4a" + }, + "viridisLite": { + "Package": "viridisLite", + "Version": "0.4.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491" + }, + "vroom": { + "Package": "vroom", + "Version": "1.6.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "bit64", + "cli", + "cpp11", + "crayon", + "glue", + "hms", + "lifecycle", + "methods", + "progress", + "rlang", + "stats", + "tibble", + "tidyselect", + "tzdb", + "vctrs", + "withr" + ], + "Hash": "390f9315bc0025be03012054103d227c" + }, + "withr": { + "Package": "withr", + "Version": "3.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics" + ], + "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" + }, + "xfun": { + "Package": "xfun", + "Version": "0.45", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "grDevices", + "stats", + "tools" + ], + "Hash": "ca59c87fe305b16a9141a5874c3a7889" + }, + "xml2": { + "Package": "xml2", + "Version": "1.3.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "methods", + "rlang" + ], + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" + }, + "yaml": { + "Package": "yaml", + "Version": "2.3.8", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "29240487a071f535f5e5d5a323b7afbd" + } + } +} diff --git a/analysis/renv/.gitignore b/analysis/renv/.gitignore new file mode 100644 index 0000000..0ec0cbb --- /dev/null +++ b/analysis/renv/.gitignore @@ -0,0 +1,7 @@ +library/ +local/ +cellar/ +lock/ +python/ +sandbox/ +staging/ diff --git a/analysis/renv/activate.R b/analysis/renv/activate.R new file mode 100644 index 0000000..d13f993 --- /dev/null +++ b/analysis/renv/activate.R @@ -0,0 +1,1220 @@ + +local({ + + # the requested version of renv + version <- "1.0.7" + attr(version, "sha") <- NULL + + # the project directory + project <- Sys.getenv("RENV_PROJECT") + if (!nzchar(project)) + project <- getwd() + + # use start-up diagnostics if enabled + diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE") + if (diagnostics) { + start <- Sys.time() + profile <- tempfile("renv-startup-", fileext = ".Rprof") + utils::Rprof(profile) + on.exit({ + utils::Rprof(NULL) + elapsed <- signif(difftime(Sys.time(), start, units = "auto"), digits = 2L) + writeLines(sprintf("- renv took %s to run the autoloader.", format(elapsed))) + writeLines(sprintf("- Profile: %s", profile)) + print(utils::summaryRprof(profile)) + }, add = TRUE) + } + + # figure out whether the autoloader is enabled + enabled <- local({ + + # first, check config option + override <- getOption("renv.config.autoloader.enabled") + if (!is.null(override)) + return(override) + + # if we're being run in a context where R_LIBS is already set, + # don't load -- presumably we're being run as a sub-process and + # the parent process has already set up library paths for us + rcmd <- Sys.getenv("R_CMD", unset = NA) + rlibs <- Sys.getenv("R_LIBS", unset = NA) + if (!is.na(rlibs) && !is.na(rcmd)) + return(FALSE) + + # next, check environment variables + # TODO: prefer using the configuration one in the future + envvars <- c( + "RENV_CONFIG_AUTOLOADER_ENABLED", + "RENV_AUTOLOADER_ENABLED", + "RENV_ACTIVATE_PROJECT" + ) + + for (envvar in envvars) { + envval <- Sys.getenv(envvar, unset = NA) + if (!is.na(envval)) + return(tolower(envval) %in% c("true", "t", "1")) + } + + # enable by default + TRUE + + }) + + # bail if we're not enabled + if (!enabled) { + + # if we're not enabled, we might still need to manually load + # the user profile here + profile <- Sys.getenv("R_PROFILE_USER", unset = "~/.Rprofile") + if (file.exists(profile)) { + cfg <- Sys.getenv("RENV_CONFIG_USER_PROFILE", unset = "TRUE") + if (tolower(cfg) %in% c("true", "t", "1")) + sys.source(profile, envir = globalenv()) + } + + return(FALSE) + + } + + # avoid recursion + if (identical(getOption("renv.autoloader.running"), TRUE)) { + warning("ignoring recursive attempt to run renv autoloader") + return(invisible(TRUE)) + } + + # signal that we're loading renv during R startup + options(renv.autoloader.running = TRUE) + on.exit(options(renv.autoloader.running = NULL), add = TRUE) + + # signal that we've consented to use renv + options(renv.consent = TRUE) + + # load the 'utils' package eagerly -- this ensures that renv shims, which + # mask 'utils' packages, will come first on the search path + library(utils, lib.loc = .Library) + + # unload renv if it's already been loaded + if ("renv" %in% loadedNamespaces()) + unloadNamespace("renv") + + # load bootstrap tools + `%||%` <- function(x, y) { + if (is.null(x)) y else x + } + + catf <- function(fmt, ..., appendLF = TRUE) { + + quiet <- getOption("renv.bootstrap.quiet", default = FALSE) + if (quiet) + return(invisible()) + + msg <- sprintf(fmt, ...) + cat(msg, file = stdout(), sep = if (appendLF) "\n" else "") + + invisible(msg) + + } + + header <- function(label, + ..., + prefix = "#", + suffix = "-", + n = min(getOption("width"), 78)) + { + label <- sprintf(label, ...) + n <- max(n - nchar(label) - nchar(prefix) - 2L, 8L) + if (n <= 0) + return(paste(prefix, label)) + + tail <- paste(rep.int(suffix, n), collapse = "") + paste0(prefix, " ", label, " ", tail) + + } + + heredoc <- function(text, leave = 0) { + + # remove leading, trailing whitespace + trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text) + + # split into lines + lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]] + + # compute common indent + indent <- regexpr("[^[:space:]]", lines) + common <- min(setdiff(indent, -1L)) - leave + paste(substring(lines, common), collapse = "\n") + + } + + startswith <- function(string, prefix) { + substring(string, 1, nchar(prefix)) == prefix + } + + bootstrap <- function(version, library) { + + friendly <- renv_bootstrap_version_friendly(version) + section <- header(sprintf("Bootstrapping renv %s", friendly)) + catf(section) + + # attempt to download renv + catf("- Downloading renv ... ", appendLF = FALSE) + withCallingHandlers( + tarball <- renv_bootstrap_download(version), + error = function(err) { + catf("FAILED") + stop("failed to download:\n", conditionMessage(err)) + } + ) + catf("OK") + on.exit(unlink(tarball), add = TRUE) + + # now attempt to install + catf("- Installing renv ... ", appendLF = FALSE) + withCallingHandlers( + status <- renv_bootstrap_install(version, tarball, library), + error = function(err) { + catf("FAILED") + stop("failed to install:\n", conditionMessage(err)) + } + ) + catf("OK") + + # add empty line to break up bootstrapping from normal output + catf("") + + return(invisible()) + } + + renv_bootstrap_tests_running <- function() { + getOption("renv.tests.running", default = FALSE) + } + + renv_bootstrap_repos <- function() { + + # get CRAN repository + cran <- getOption("renv.repos.cran", "https://cloud.r-project.org") + + # check for repos override + repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA) + if (!is.na(repos)) { + + # check for RSPM; if set, use a fallback repository for renv + rspm <- Sys.getenv("RSPM", unset = NA) + if (identical(rspm, repos)) + repos <- c(RSPM = rspm, CRAN = cran) + + return(repos) + + } + + # check for lockfile repositories + repos <- tryCatch(renv_bootstrap_repos_lockfile(), error = identity) + if (!inherits(repos, "error") && length(repos)) + return(repos) + + # retrieve current repos + repos <- getOption("repos") + + # ensure @CRAN@ entries are resolved + repos[repos == "@CRAN@"] <- cran + + # add in renv.bootstrap.repos if set + default <- c(FALLBACK = "https://cloud.r-project.org") + extra <- getOption("renv.bootstrap.repos", default = default) + repos <- c(repos, extra) + + # remove duplicates that might've snuck in + dupes <- duplicated(repos) | duplicated(names(repos)) + repos[!dupes] + + } + + renv_bootstrap_repos_lockfile <- function() { + + lockpath <- Sys.getenv("RENV_PATHS_LOCKFILE", unset = "renv.lock") + if (!file.exists(lockpath)) + return(NULL) + + lockfile <- tryCatch(renv_json_read(lockpath), error = identity) + if (inherits(lockfile, "error")) { + warning(lockfile) + return(NULL) + } + + repos <- lockfile$R$Repositories + if (length(repos) == 0) + return(NULL) + + keys <- vapply(repos, `[[`, "Name", FUN.VALUE = character(1)) + vals <- vapply(repos, `[[`, "URL", FUN.VALUE = character(1)) + names(vals) <- keys + + return(vals) + + } + + renv_bootstrap_download <- function(version) { + + sha <- attr(version, "sha", exact = TRUE) + + methods <- if (!is.null(sha)) { + + # attempting to bootstrap a development version of renv + c( + function() renv_bootstrap_download_tarball(sha), + function() renv_bootstrap_download_github(sha) + ) + + } else { + + # attempting to bootstrap a release version of renv + c( + function() renv_bootstrap_download_tarball(version), + function() renv_bootstrap_download_cran_latest(version), + function() renv_bootstrap_download_cran_archive(version) + ) + + } + + for (method in methods) { + path <- tryCatch(method(), error = identity) + if (is.character(path) && file.exists(path)) + return(path) + } + + stop("All download methods failed") + + } + + renv_bootstrap_download_impl <- function(url, destfile) { + + mode <- "wb" + + # https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17715 + fixup <- + Sys.info()[["sysname"]] == "Windows" && + substring(url, 1L, 5L) == "file:" + + if (fixup) + mode <- "w+b" + + args <- list( + url = url, + destfile = destfile, + mode = mode, + quiet = TRUE + ) + + if ("headers" %in% names(formals(utils::download.file))) + args$headers <- renv_bootstrap_download_custom_headers(url) + + do.call(utils::download.file, args) + + } + + renv_bootstrap_download_custom_headers <- function(url) { + + headers <- getOption("renv.download.headers") + if (is.null(headers)) + return(character()) + + if (!is.function(headers)) + stopf("'renv.download.headers' is not a function") + + headers <- headers(url) + if (length(headers) == 0L) + return(character()) + + if (is.list(headers)) + headers <- unlist(headers, recursive = FALSE, use.names = TRUE) + + ok <- + is.character(headers) && + is.character(names(headers)) && + all(nzchar(names(headers))) + + if (!ok) + stop("invocation of 'renv.download.headers' did not return a named character vector") + + headers + + } + + renv_bootstrap_download_cran_latest <- function(version) { + + spec <- renv_bootstrap_download_cran_latest_find(version) + type <- spec$type + repos <- spec$repos + + baseurl <- utils::contrib.url(repos = repos, type = type) + ext <- if (identical(type, "source")) + ".tar.gz" + else if (Sys.info()[["sysname"]] == "Windows") + ".zip" + else + ".tgz" + name <- sprintf("renv_%s%s", version, ext) + url <- paste(baseurl, name, sep = "/") + + destfile <- file.path(tempdir(), name) + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (inherits(status, "condition")) + return(FALSE) + + # report success and return + destfile + + } + + renv_bootstrap_download_cran_latest_find <- function(version) { + + # check whether binaries are supported on this system + binary <- + getOption("renv.bootstrap.binary", default = TRUE) && + !identical(.Platform$pkgType, "source") && + !identical(getOption("pkgType"), "source") && + Sys.info()[["sysname"]] %in% c("Darwin", "Windows") + + types <- c(if (binary) "binary", "source") + + # iterate over types + repositories + for (type in types) { + for (repos in renv_bootstrap_repos()) { + + # retrieve package database + db <- tryCatch( + as.data.frame( + utils::available.packages(type = type, repos = repos), + stringsAsFactors = FALSE + ), + error = identity + ) + + if (inherits(db, "error")) + next + + # check for compatible entry + entry <- db[db$Package %in% "renv" & db$Version %in% version, ] + if (nrow(entry) == 0) + next + + # found it; return spec to caller + spec <- list(entry = entry, type = type, repos = repos) + return(spec) + + } + } + + # if we got here, we failed to find renv + fmt <- "renv %s is not available from your declared package repositories" + stop(sprintf(fmt, version)) + + } + + renv_bootstrap_download_cran_archive <- function(version) { + + name <- sprintf("renv_%s.tar.gz", version) + repos <- renv_bootstrap_repos() + urls <- file.path(repos, "src/contrib/Archive/renv", name) + destfile <- file.path(tempdir(), name) + + for (url in urls) { + + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (identical(status, 0L)) + return(destfile) + + } + + return(FALSE) + + } + + renv_bootstrap_download_tarball <- function(version) { + + # if the user has provided the path to a tarball via + # an environment variable, then use it + tarball <- Sys.getenv("RENV_BOOTSTRAP_TARBALL", unset = NA) + if (is.na(tarball)) + return() + + # allow directories + if (dir.exists(tarball)) { + name <- sprintf("renv_%s.tar.gz", version) + tarball <- file.path(tarball, name) + } + + # bail if it doesn't exist + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "- RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail + return() + + } + + catf("- Using local tarball '%s'.", tarball) + tarball + + } + + renv_bootstrap_download_github <- function(version) { + + enabled <- Sys.getenv("RENV_BOOTSTRAP_FROM_GITHUB", unset = "TRUE") + if (!identical(enabled, "TRUE")) + return(FALSE) + + # prepare download options + pat <- Sys.getenv("GITHUB_PAT") + if (nzchar(Sys.which("curl")) && nzchar(pat)) { + fmt <- "--location --fail --header \"Authorization: token %s\"" + extra <- sprintf(fmt, pat) + saved <- options("download.file.method", "download.file.extra") + options(download.file.method = "curl", download.file.extra = extra) + on.exit(do.call(base::options, saved), add = TRUE) + } else if (nzchar(Sys.which("wget")) && nzchar(pat)) { + fmt <- "--header=\"Authorization: token %s\"" + extra <- sprintf(fmt, pat) + saved <- options("download.file.method", "download.file.extra") + options(download.file.method = "wget", download.file.extra = extra) + on.exit(do.call(base::options, saved), add = TRUE) + } + + url <- file.path("https://api.github.com/repos/rstudio/renv/tarball", version) + name <- sprintf("renv_%s.tar.gz", version) + destfile <- file.path(tempdir(), name) + + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), + condition = identity + ) + + if (!identical(status, 0L)) + return(FALSE) + + renv_bootstrap_download_augment(destfile) + + return(destfile) + + } + + # Add Sha to DESCRIPTION. This is stop gap until #890, after which we + # can use renv::install() to fully capture metadata. + renv_bootstrap_download_augment <- function(destfile) { + sha <- renv_bootstrap_git_extract_sha1_tar(destfile) + if (is.null(sha)) { + return() + } + + # Untar + tempdir <- tempfile("renv-github-") + on.exit(unlink(tempdir, recursive = TRUE), add = TRUE) + untar(destfile, exdir = tempdir) + pkgdir <- dir(tempdir, full.names = TRUE)[[1]] + + # Modify description + desc_path <- file.path(pkgdir, "DESCRIPTION") + desc_lines <- readLines(desc_path) + remotes_fields <- c( + "RemoteType: github", + "RemoteHost: api.github.com", + "RemoteRepo: renv", + "RemoteUsername: rstudio", + "RemotePkgRef: rstudio/renv", + paste("RemoteRef: ", sha), + paste("RemoteSha: ", sha) + ) + writeLines(c(desc_lines[desc_lines != ""], remotes_fields), con = desc_path) + + # Re-tar + local({ + old <- setwd(tempdir) + on.exit(setwd(old), add = TRUE) + + tar(destfile, compression = "gzip") + }) + invisible() + } + + # Extract the commit hash from a git archive. Git archives include the SHA1 + # hash as the comment field of the tarball pax extended header + # (see https://www.kernel.org/pub/software/scm/git/docs/git-archive.html) + # For GitHub archives this should be the first header after the default one + # (512 byte) header. + renv_bootstrap_git_extract_sha1_tar <- function(bundle) { + + # open the bundle for reading + # We use gzcon for everything because (from ?gzcon) + # > Reading from a connection which does not supply a 'gzip' magic + # > header is equivalent to reading from the original connection + conn <- gzcon(file(bundle, open = "rb", raw = TRUE)) + on.exit(close(conn)) + + # The default pax header is 512 bytes long and the first pax extended header + # with the comment should be 51 bytes long + # `52 comment=` (11 chars) + 40 byte SHA1 hash + len <- 0x200 + 0x33 + res <- rawToChar(readBin(conn, "raw", n = len)[0x201:len]) + + if (grepl("^52 comment=", res)) { + sub("52 comment=", "", res) + } else { + NULL + } + } + + renv_bootstrap_install <- function(version, tarball, library) { + + # attempt to install it into project library + dir.create(library, showWarnings = FALSE, recursive = TRUE) + output <- renv_bootstrap_install_impl(library, tarball) + + # check for successful install + status <- attr(output, "status") + if (is.null(status) || identical(status, 0L)) + return(status) + + # an error occurred; report it + header <- "installation of renv failed" + lines <- paste(rep.int("=", nchar(header)), collapse = "") + text <- paste(c(header, lines, output), collapse = "\n") + stop(text) + + } + + renv_bootstrap_install_impl <- function(library, tarball) { + + # invoke using system2 so we can capture and report output + bin <- R.home("bin") + exe <- if (Sys.info()[["sysname"]] == "Windows") "R.exe" else "R" + R <- file.path(bin, exe) + + args <- c( + "--vanilla", "CMD", "INSTALL", "--no-multiarch", + "-l", shQuote(path.expand(library)), + shQuote(path.expand(tarball)) + ) + + system2(R, args, stdout = TRUE, stderr = TRUE) + + } + + renv_bootstrap_platform_prefix <- function() { + + # construct version prefix + version <- paste(R.version$major, R.version$minor, sep = ".") + prefix <- paste("R", numeric_version(version)[1, 1:2], sep = "-") + + # include SVN revision for development versions of R + # (to avoid sharing platform-specific artefacts with released versions of R) + devel <- + identical(R.version[["status"]], "Under development (unstable)") || + identical(R.version[["nickname"]], "Unsuffered Consequences") + + if (devel) + prefix <- paste(prefix, R.version[["svn rev"]], sep = "-r") + + # build list of path components + components <- c(prefix, R.version$platform) + + # include prefix if provided by user + prefix <- renv_bootstrap_platform_prefix_impl() + if (!is.na(prefix) && nzchar(prefix)) + components <- c(prefix, components) + + # build prefix + paste(components, collapse = "/") + + } + + renv_bootstrap_platform_prefix_impl <- function() { + + # if an explicit prefix has been supplied, use it + prefix <- Sys.getenv("RENV_PATHS_PREFIX", unset = NA) + if (!is.na(prefix)) + return(prefix) + + # if the user has requested an automatic prefix, generate it + auto <- Sys.getenv("RENV_PATHS_PREFIX_AUTO", unset = NA) + if (is.na(auto) && getRversion() >= "4.4.0") + auto <- "TRUE" + + if (auto %in% c("TRUE", "True", "true", "1")) + return(renv_bootstrap_platform_prefix_auto()) + + # empty string on failure + "" + + } + + renv_bootstrap_platform_prefix_auto <- function() { + + prefix <- tryCatch(renv_bootstrap_platform_os(), error = identity) + if (inherits(prefix, "error") || prefix %in% "unknown") { + + msg <- paste( + "failed to infer current operating system", + "please file a bug report at https://github.com/rstudio/renv/issues", + sep = "; " + ) + + warning(msg) + + } + + prefix + + } + + renv_bootstrap_platform_os <- function() { + + sysinfo <- Sys.info() + sysname <- sysinfo[["sysname"]] + + # handle Windows + macOS up front + if (sysname == "Windows") + return("windows") + else if (sysname == "Darwin") + return("macos") + + # check for os-release files + for (file in c("/etc/os-release", "/usr/lib/os-release")) + if (file.exists(file)) + return(renv_bootstrap_platform_os_via_os_release(file, sysinfo)) + + # check for redhat-release files + if (file.exists("/etc/redhat-release")) + return(renv_bootstrap_platform_os_via_redhat_release()) + + "unknown" + + } + + renv_bootstrap_platform_os_via_os_release <- function(file, sysinfo) { + + # read /etc/os-release + release <- utils::read.table( + file = file, + sep = "=", + quote = c("\"", "'"), + col.names = c("Key", "Value"), + comment.char = "#", + stringsAsFactors = FALSE + ) + + vars <- as.list(release$Value) + names(vars) <- release$Key + + # get os name + os <- tolower(sysinfo[["sysname"]]) + + # read id + id <- "unknown" + for (field in c("ID", "ID_LIKE")) { + if (field %in% names(vars) && nzchar(vars[[field]])) { + id <- vars[[field]] + break + } + } + + # read version + version <- "unknown" + for (field in c("UBUNTU_CODENAME", "VERSION_CODENAME", "VERSION_ID", "BUILD_ID")) { + if (field %in% names(vars) && nzchar(vars[[field]])) { + version <- vars[[field]] + break + } + } + + # join together + paste(c(os, id, version), collapse = "-") + + } + + renv_bootstrap_platform_os_via_redhat_release <- function() { + + # read /etc/redhat-release + contents <- readLines("/etc/redhat-release", warn = FALSE) + + # infer id + id <- if (grepl("centos", contents, ignore.case = TRUE)) + "centos" + else if (grepl("redhat", contents, ignore.case = TRUE)) + "redhat" + else + "unknown" + + # try to find a version component (very hacky) + version <- "unknown" + + parts <- strsplit(contents, "[[:space:]]")[[1L]] + for (part in parts) { + + nv <- tryCatch(numeric_version(part), error = identity) + if (inherits(nv, "error")) + next + + version <- nv[1, 1] + break + + } + + paste(c("linux", id, version), collapse = "-") + + } + + renv_bootstrap_library_root_name <- function(project) { + + # use project name as-is if requested + asis <- Sys.getenv("RENV_PATHS_LIBRARY_ROOT_ASIS", unset = "FALSE") + if (asis) + return(basename(project)) + + # otherwise, disambiguate based on project's path + id <- substring(renv_bootstrap_hash_text(project), 1L, 8L) + paste(basename(project), id, sep = "-") + + } + + renv_bootstrap_library_root <- function(project) { + + prefix <- renv_bootstrap_profile_prefix() + + path <- Sys.getenv("RENV_PATHS_LIBRARY", unset = NA) + if (!is.na(path)) + return(paste(c(path, prefix), collapse = "/")) + + path <- renv_bootstrap_library_root_impl(project) + if (!is.null(path)) { + name <- renv_bootstrap_library_root_name(project) + return(paste(c(path, prefix, name), collapse = "/")) + } + + renv_bootstrap_paths_renv("library", project = project) + + } + + renv_bootstrap_library_root_impl <- function(project) { + + root <- Sys.getenv("RENV_PATHS_LIBRARY_ROOT", unset = NA) + if (!is.na(root)) + return(root) + + type <- renv_bootstrap_project_type(project) + if (identical(type, "package")) { + userdir <- renv_bootstrap_user_dir() + return(file.path(userdir, "library")) + } + + } + + renv_bootstrap_validate_version <- function(version, description = NULL) { + + # resolve description file + # + # avoid passing lib.loc to `packageDescription()` below, since R will + # use the loaded version of the package by default anyhow. note that + # this function should only be called after 'renv' is loaded + # https://github.com/rstudio/renv/issues/1625 + description <- description %||% packageDescription("renv") + + # check whether requested version 'version' matches loaded version of renv + sha <- attr(version, "sha", exact = TRUE) + valid <- if (!is.null(sha)) + renv_bootstrap_validate_version_dev(sha, description) + else + renv_bootstrap_validate_version_release(version, description) + + if (valid) + return(TRUE) + + # the loaded version of renv doesn't match the requested version; + # give the user instructions on how to proceed + dev <- identical(description[["RemoteType"]], "github") + remote <- if (dev) + paste("rstudio/renv", description[["RemoteSha"]], sep = "@") + else + paste("renv", description[["Version"]], sep = "@") + + # display both loaded version + sha if available + friendly <- renv_bootstrap_version_friendly( + version = description[["Version"]], + sha = if (dev) description[["RemoteSha"]] + ) + + fmt <- heredoc(" + renv %1$s was loaded from project library, but this project is configured to use renv %2$s. + - Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile. + - Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library. + ") + catf(fmt, friendly, renv_bootstrap_version_friendly(version), remote) + + FALSE + + } + + renv_bootstrap_validate_version_dev <- function(version, description) { + expected <- description[["RemoteSha"]] + is.character(expected) && startswith(expected, version) + } + + renv_bootstrap_validate_version_release <- function(version, description) { + expected <- description[["Version"]] + is.character(expected) && identical(expected, version) + } + + renv_bootstrap_hash_text <- function(text) { + + hashfile <- tempfile("renv-hash-") + on.exit(unlink(hashfile), add = TRUE) + + writeLines(text, con = hashfile) + tools::md5sum(hashfile) + + } + + renv_bootstrap_load <- function(project, libpath, version) { + + # try to load renv from the project library + if (!requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) + return(FALSE) + + # warn if the version of renv loaded does not match + renv_bootstrap_validate_version(version) + + # execute renv load hooks, if any + hooks <- getHook("renv::autoload") + for (hook in hooks) + if (is.function(hook)) + tryCatch(hook(), error = warnify) + + # load the project + renv::load(project) + + TRUE + + } + + renv_bootstrap_profile_load <- function(project) { + + # if RENV_PROFILE is already set, just use that + profile <- Sys.getenv("RENV_PROFILE", unset = NA) + if (!is.na(profile) && nzchar(profile)) + return(profile) + + # check for a profile file (nothing to do if it doesn't exist) + path <- renv_bootstrap_paths_renv("profile", profile = FALSE, project = project) + if (!file.exists(path)) + return(NULL) + + # read the profile, and set it if it exists + contents <- readLines(path, warn = FALSE) + if (length(contents) == 0L) + return(NULL) + + # set RENV_PROFILE + profile <- contents[[1L]] + if (!profile %in% c("", "default")) + Sys.setenv(RENV_PROFILE = profile) + + profile + + } + + renv_bootstrap_profile_prefix <- function() { + profile <- renv_bootstrap_profile_get() + if (!is.null(profile)) + return(file.path("profiles", profile, "renv")) + } + + renv_bootstrap_profile_get <- function() { + profile <- Sys.getenv("RENV_PROFILE", unset = "") + renv_bootstrap_profile_normalize(profile) + } + + renv_bootstrap_profile_set <- function(profile) { + profile <- renv_bootstrap_profile_normalize(profile) + if (is.null(profile)) + Sys.unsetenv("RENV_PROFILE") + else + Sys.setenv(RENV_PROFILE = profile) + } + + renv_bootstrap_profile_normalize <- function(profile) { + + if (is.null(profile) || profile %in% c("", "default")) + return(NULL) + + profile + + } + + renv_bootstrap_path_absolute <- function(path) { + + substr(path, 1L, 1L) %in% c("~", "/", "\\") || ( + substr(path, 1L, 1L) %in% c(letters, LETTERS) && + substr(path, 2L, 3L) %in% c(":/", ":\\") + ) + + } + + renv_bootstrap_paths_renv <- function(..., profile = TRUE, project = NULL) { + renv <- Sys.getenv("RENV_PATHS_RENV", unset = "renv") + root <- if (renv_bootstrap_path_absolute(renv)) NULL else project + prefix <- if (profile) renv_bootstrap_profile_prefix() + components <- c(root, renv, prefix, ...) + paste(components, collapse = "/") + } + + renv_bootstrap_project_type <- function(path) { + + descpath <- file.path(path, "DESCRIPTION") + if (!file.exists(descpath)) + return("unknown") + + desc <- tryCatch( + read.dcf(descpath, all = TRUE), + error = identity + ) + + if (inherits(desc, "error")) + return("unknown") + + type <- desc$Type + if (!is.null(type)) + return(tolower(type)) + + package <- desc$Package + if (!is.null(package)) + return("package") + + "unknown" + + } + + renv_bootstrap_user_dir <- function() { + dir <- renv_bootstrap_user_dir_impl() + path.expand(chartr("\\", "/", dir)) + } + + renv_bootstrap_user_dir_impl <- function() { + + # use local override if set + override <- getOption("renv.userdir.override") + if (!is.null(override)) + return(override) + + # use R_user_dir if available + tools <- asNamespace("tools") + if (is.function(tools$R_user_dir)) + return(tools$R_user_dir("renv", "cache")) + + # try using our own backfill for older versions of R + envvars <- c("R_USER_CACHE_DIR", "XDG_CACHE_HOME") + for (envvar in envvars) { + root <- Sys.getenv(envvar, unset = NA) + if (!is.na(root)) + return(file.path(root, "R/renv")) + } + + # use platform-specific default fallbacks + if (Sys.info()[["sysname"]] == "Windows") + file.path(Sys.getenv("LOCALAPPDATA"), "R/cache/R/renv") + else if (Sys.info()[["sysname"]] == "Darwin") + "~/Library/Caches/org.R-project.R/R/renv" + else + "~/.cache/R/renv" + + } + + renv_bootstrap_version_friendly <- function(version, shafmt = NULL, sha = NULL) { + sha <- sha %||% attr(version, "sha", exact = TRUE) + parts <- c(version, sprintf(shafmt %||% " [sha: %s]", substring(sha, 1L, 7L))) + paste(parts, collapse = "") + } + + renv_bootstrap_exec <- function(project, libpath, version) { + if (!renv_bootstrap_load(project, libpath, version)) + renv_bootstrap_run(version, libpath) + } + + renv_bootstrap_run <- function(version, libpath) { + + # perform bootstrap + bootstrap(version, libpath) + + # exit early if we're just testing bootstrap + if (!is.na(Sys.getenv("RENV_BOOTSTRAP_INSTALL_ONLY", unset = NA))) + return(TRUE) + + # try again to load + if (requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) { + return(renv::load(project = getwd())) + } + + # failed to download or load renv; warn the user + msg <- c( + "Failed to find an renv installation: the project will not be loaded.", + "Use `renv::activate()` to re-initialize the project." + ) + + warning(paste(msg, collapse = "\n"), call. = FALSE) + + } + + renv_json_read <- function(file = NULL, text = NULL) { + + jlerr <- NULL + + # if jsonlite is loaded, use that instead + if ("jsonlite" %in% loadedNamespaces()) { + + json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity) + if (!inherits(json, "error")) + return(json) + + jlerr <- json + + } + + # otherwise, fall back to the default JSON reader + json <- tryCatch(renv_json_read_default(file, text), error = identity) + if (!inherits(json, "error")) + return(json) + + # report an error + if (!is.null(jlerr)) + stop(jlerr) + else + stop(json) + + } + + renv_json_read_jsonlite <- function(file = NULL, text = NULL) { + text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") + jsonlite::fromJSON(txt = text, simplifyVector = FALSE) + } + + renv_json_read_default <- function(file = NULL, text = NULL) { + + # find strings in the JSON + text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") + pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] + + # if any are found, replace them with placeholders + replaced <- text + strings <- character() + replacements <- character() + + if (!identical(c(locs), -1L)) { + + # get the string values + starts <- locs + ends <- locs + attr(locs, "match.length") - 1L + strings <- substring(text, starts, ends) + + # only keep those requiring escaping + strings <- grep("[[\\]{}:]", strings, perl = TRUE, value = TRUE) + + # compute replacements + replacements <- sprintf('"\032%i\032"', seq_along(strings)) + + # replace the strings + mapply(function(string, replacement) { + replaced <<- sub(string, replacement, replaced, fixed = TRUE) + }, strings, replacements) + + } + + # transform the JSON into something the R parser understands + transformed <- replaced + transformed <- gsub("{}", "`names<-`(list(), character())", transformed, fixed = TRUE) + transformed <- gsub("[[{]", "list(", transformed, perl = TRUE) + transformed <- gsub("[]}]", ")", transformed, perl = TRUE) + transformed <- gsub(":", "=", transformed, fixed = TRUE) + text <- paste(transformed, collapse = "\n") + + # parse it + json <- parse(text = text, keep.source = FALSE, srcfile = NULL)[[1L]] + + # construct map between source strings, replaced strings + map <- as.character(parse(text = strings)) + names(map) <- as.character(parse(text = replacements)) + + # convert to list + map <- as.list(map) + + # remap strings in object + remapped <- renv_json_read_remap(json, map) + + # evaluate + eval(remapped, envir = baseenv()) + + } + + renv_json_read_remap <- function(json, map) { + + # fix names + if (!is.null(names(json))) { + lhs <- match(names(json), names(map), nomatch = 0L) + rhs <- match(names(map), names(json), nomatch = 0L) + names(json)[rhs] <- map[lhs] + } + + # fix values + if (is.character(json)) + return(map[[json]] %||% json) + + # handle true, false, null + if (is.name(json)) { + text <- as.character(json) + if (text == "true") + return(TRUE) + else if (text == "false") + return(FALSE) + else if (text == "null") + return(NULL) + } + + # recurse + if (is.recursive(json)) { + for (i in seq_along(json)) { + json[i] <- list(renv_json_read_remap(json[[i]], map)) + } + } + + json + + } + + # load the renv profile, if any + renv_bootstrap_profile_load(project) + + # construct path to library root + root <- renv_bootstrap_library_root(project) + + # construct library prefix for platform + prefix <- renv_bootstrap_platform_prefix() + + # construct full libpath + libpath <- file.path(root, prefix) + + # run bootstrap code + renv_bootstrap_exec(project, libpath, version) + + invisible() + +}) diff --git a/analysis/renv/settings.json b/analysis/renv/settings.json new file mode 100644 index 0000000..ffdbb32 --- /dev/null +++ b/analysis/renv/settings.json @@ -0,0 +1,19 @@ +{ + "bioconductor.version": null, + "external.libraries": [], + "ignored.packages": [], + "package.dependency.fields": [ + "Imports", + "Depends", + "LinkingTo" + ], + "ppm.enabled": null, + "ppm.ignored.urls": [], + "r.version": null, + "snapshot.type": "implicit", + "use.cache": true, + "vcs.ignore.cellar": true, + "vcs.ignore.library": true, + "vcs.ignore.local": true, + "vcs.manage.ignores": true +} diff --git a/analysis/scalability_datasize.R b/analysis/scalability_datasize.R new file mode 100644 index 0000000..919f769 --- /dev/null +++ b/analysis/scalability_datasize.R @@ -0,0 +1,135 @@ +library("tidyverse") +library("ggthemes") +library("gridExtra") +library("patchwork") +library(RColorBrewer) + +data=read_csv("../results/scalability_datasize.csv") +r_=function(x){round(x,digits=1)} +color=function(){scale_fill_brewer(palette = "Accent")} +color2=function(){scale_fill_brewer(palette = "Set2")} +nolegend=function(){theme(legend.position="none")} +simkeys=unique(data$simkey) +nsimkeys=length(simkeys) +s_=function(x){if(x<0){return("")}else{return("+")}} +simkey_rename=function(key){ + if(key=="hint") + return("Hints") + if(key=="baseline") + return("Baseline") + if(key=="extended") + return("Extended") + if(key=="hintandextended") + return("Hints+Extended") + return(key) +} +dformat=function(data){ + data%>%rowwise()%>%mutate(simkey=simkey_rename(simkey))%>%mutate(wireless=ifelse(wireless=="lora","LoRa","Nb-IoT")) +} + +dsformat=function(data){ + data=data%>%mutate(datasize=ifelse(datasize==1000,"1KB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==10000,"10KB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==100000,"100KB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==500000,"500KB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==1000000,"1MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==2000000,"2MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==10000000,"10MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==50000000,"50MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==100000000,"100MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==500000000,"500MB",as.character(datasize))) + data=data%>%mutate(datasize=ifelse(datasize==1000000000,"1GB",as.character(datasize))) + data$datasize=factor(data$datasize,levels=c("1KB","10KB","100KB","500KB","1MB","2MB","10MB","50MB","100MB","500MB","1GB")) + return(data) +} + +g_legend <- function(a.gplot){ + tmp <- ggplot_gtable(ggplot_build(a.gplot)) + leg <- which(sapply(tmp$grobs, function(x) x$name) == "guide-box") + legend <- tmp$grobs[[leg]] + legend +} + +custom_theme=function(){theme_clean()+ theme(plot.background=element_blank())} + +data=data%>%dformat() + +# Compute delivery success +statsSuccess=data%>%filter(isSender!=0)%>%group_by(wireless,wakeupfor,datasize,seed,simkey)%>%summarize(success=mean(nSend))%>%ungroup() +data=data%>%left_join(statsSuccess,by=c("wireless","wakeupfor","datasize","seed","simkey")) + +# Computer stats senders +statsSender=data%>%filter(isSender!=0)%>%group_by(wireless,wakeupfor,datasize,seed,simkey)%>%summarize(success=mean(success),energy=mean(energy))%>%ungroup() +statsSender=statsSender%>%group_by(wireless,wakeupfor,datasize,simkey)%>%summarize(success_sd=sd(success),success=mean(success),energy_sd=sd(energy),energy=mean(energy))%>%ungroup() + +# Computer stats receiver +statsReceiver=data%>%filter(isSender==0)%>%group_by(wireless,wakeupfor,datasize,seed,simkey)%>%summarize(success=mean(success),energy=mean(energy))%>%ungroup() +statsReceiver=statsReceiver%>%group_by(wireless,wakeupfor,datasize,simkey)%>%summarize(success_sd=sd(success),success=mean(success),energy_sd=sd(energy),energy=mean(energy))%>%ungroup() + + +# Energy +sender60sPlotEnergy=ggplot(statsSender%>%filter(wakeupfor==60)%>%dsformat(),aes(datasize,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Sender")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +sender180sPlotEnergy=ggplot(statsSender%>%filter(wakeupfor==180)%>%dsformat(),aes(datasize,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Sender")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + + +receiver60sPlotEnergy=ggplot(statsReceiver%>%filter(wakeupfor==60)%>%dsformat(),aes(datasize,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Energy consumption (J)")+labs(colour="Policy") + custom_theme()+theme(legend.position="top")+ggtitle("Receiver")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +receiver180sPlotEnergy=ggplot(statsReceiver%>%filter(wakeupfor==180)%>%dsformat(),aes(datasize,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Receiver")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +# Success +sender60sPlotSuccess=ggplot(statsSender%>%filter(wakeupfor==60)%>%dsformat(),aes(datasize,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + +sender180sPlotSuccess=ggplot(statsSender%>%filter(wakeupfor==180)%>%dsformat(),aes(datasize,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + + +receiver60sPlotSuccess=ggplot(statsReceiver%>%filter(wakeupfor==60)%>%dsformat(),aes(datasize,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Number of delivery success")+labs(colour="Policy") + custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + +receiver180sPlotSuccess=ggplot(statsReceiver%>%filter(wakeupfor==180)%>%dsformat(),aes(datasize,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Data size")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + + + +w1=10 +h1=4 +w2=15 +h2=4 +ggsave("figures/scalability_datasize_60s_sender_energy.pdf",plot=sender60sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_datasize_60s_receiver_energy.pdf",plot=receiver60sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_datasize_60s_success.pdf",plot=sender60sPlotSuccess,width=w2,height=h2) + +ggsave("figures/scalability_datasize_180s_sender_energy.pdf",plot=sender180sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_datasize_180s_receiver_energy.pdf",plot=receiver180sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_datasize_180s_success.pdf",plot=sender180sPlotSuccess,width=w2,height=h2) + diff --git a/analysis/scalability_nnodes.R b/analysis/scalability_nnodes.R new file mode 100644 index 0000000..374b2a1 --- /dev/null +++ b/analysis/scalability_nnodes.R @@ -0,0 +1,118 @@ +library("tidyverse") +library("ggthemes") +library("gridExtra") +library("patchwork") +library(RColorBrewer) + +data=read_csv("../results/scalability_nnodes.csv") +r_=function(x){round(x,digits=1)} +color=function(){scale_fill_brewer(palette = "Accent")} +color2=function(){scale_fill_brewer(palette = "Set2")} +nolegend=function(){theme(legend.position="none")} +simkeys=unique(data$simkey) +nsimkeys=length(simkeys) +s_=function(x){if(x<0){return("")}else{return("+")}} +simkey_rename=function(key){ + if(key=="hint") + return("Hints") + if(key=="baseline") + return("Baseline") + if(key=="extended") + return("Extended") + if(key=="hintandextended") + return("Hints+Extended") + return(key) +} +dformat=function(data){ + data%>%rowwise()%>%mutate(simkey=simkey_rename(simkey))%>%mutate(wireless=ifelse(wireless=="lora","LoRa","Nb-IoT")) +} +g_legend <- function(a.gplot){ + tmp <- ggplot_gtable(ggplot_build(a.gplot)) + leg <- which(sapply(tmp$grobs, function(x) x$name) == "guide-box") + legend <- tmp$grobs[[leg]] + legend +} + +custom_theme=function(){theme_clean()+ theme(plot.background=element_blank())} + +data=data%>%dformat() + +# Compute delivery success +statsSuccess=data%>%filter(isSender!=0)%>%group_by(wireless,wakeupfor,n_nodes,seed,simkey)%>%summarize(success=mean(nSend))%>%ungroup() +data=data%>%left_join(statsSuccess,by=c("wireless","wakeupfor","n_nodes","seed","simkey")) + +# Computer stats senders +statsSender=data%>%filter(isSender!=0)%>%group_by(wireless,wakeupfor,n_nodes,seed,simkey)%>%summarize(success=mean(success),energy=mean(energy))%>%ungroup() +statsSender=statsSender%>%group_by(wireless,wakeupfor,n_nodes,simkey)%>%summarize(success_sd=sd(success),success=mean(success),energy_sd=sd(energy),energy=mean(energy))%>%ungroup() + +# Computer stats receiver +statsReceiver=data%>%filter(isSender==0)%>%group_by(wireless,wakeupfor,n_nodes,seed,simkey)%>%summarize(success=mean(success),energy=mean(energy))%>%ungroup() +statsReceiver=statsReceiver%>%group_by(wireless,wakeupfor,n_nodes,simkey)%>%summarize(success_sd=sd(success),success=mean(success),energy_sd=sd(energy),energy=mean(energy))%>%ungroup() + + +# Energy +sender60sPlotEnergy=ggplot(statsSender%>%filter(wakeupfor==60),aes(n_nodes,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Sender")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +sender180sPlotEnergy=ggplot(statsSender%>%filter(wakeupfor==180),aes(n_nodes,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Sender")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + + +receiver60sPlotEnergy=ggplot(statsReceiver%>%filter(wakeupfor==60),aes(n_nodes,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Energy consumption (J)")+labs(colour="Policy") + custom_theme()+theme(legend.position="top")+ggtitle("Receiver")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +receiver180sPlotEnergy=ggplot(statsReceiver%>%filter(wakeupfor==180),aes(n_nodes,energy,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=energy-energy_sd, ymax=energy+energy_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Energy consumption (J)")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ggtitle("Receiver")+ + guides(colour=FALSE,fill=guide_legend(title="Policy")) + +# Success +sender60sPlotSuccess=ggplot(statsSender%>%filter(wakeupfor==60),aes(n_nodes,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + +sender180sPlotSuccess=ggplot(statsSender%>%filter(wakeupfor==180),aes(n_nodes,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + + +receiver60sPlotSuccess=ggplot(statsReceiver%>%filter(wakeupfor==60),aes(n_nodes,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Number of delivery success")+labs(colour="Policy") + custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + +receiver180sPlotSuccess=ggplot(statsReceiver%>%filter(wakeupfor==180),aes(n_nodes,success,color=simkey,group=simkey))+ + geom_ribbon(aes(ymin=success-success_sd, ymax=success+success_sd,fill=simkey),linetype=1,alpha=0.4)+ + geom_point()+geom_line()+ + facet_wrap(~wireless)+xlab("Number of node")+ylab("Number of delivery success")+labs(colour="Policy")+custom_theme()+theme(legend.position="top")+ + theme(panel.background = element_rect(fill = '#EFEFEF', color=NA))+guides(colour=FALSE,fill=guide_legend(title="Policy")) + + + +w1=7 +h1=4 +w2=15 +h2=4 +ggsave("figures/scalability_nnodes_60s_sender_energy.pdf",plot=sender60sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_nnodes_60s_receiver_energy.pdf",plot=receiver60sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_nnodes_60s_success.pdf",plot=sender60sPlotSuccess,width=w2,height=h2) + +ggsave("figures/scalability_nnodes_180s_sender_energy.pdf",plot=sender180sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_nnodes_180s_receiver_energy.pdf",plot=receiver180sPlotEnergy+guides(fill = FALSE, color = FALSE),width=w1,height=h1) +ggsave("figures/scalability_nnodes_180s_success.pdf",plot=sender180sPlotSuccess,width=w2,height=h2) + diff --git a/analysis/scheduler/analysis.sh b/analysis/scheduler/analysis.sh new file mode 100755 index 0000000..43f804d --- /dev/null +++ b/analysis/scheduler/analysis.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +wai=$(dirname $(readlink -f "$0")) # Current script directory + +log=$1 +out=$2 + +# Generate csv +cat $log | $wai/wakeup.awk > $wai/wakeup.csv +cat $log | $wai/data.awk > $wai/data.csv +cat $log | $wai/hint.awk > $wai/hint.csv +cat $log | $wai/hint_fw.awk > $wai/hint_fw.csv + +cd $wai +Rscript ./wakeup.R &> /dev/null || { echo "Schduler data analysis failed"; exit 1; } +cd - > /dev/null + +mv $wai/schedule.png $out
\ No newline at end of file diff --git a/analysis/scheduler/data.awk b/analysis/scheduler/data.awk new file mode 100755 index 0000000..6049301 --- /dev/null +++ b/analysis/scheduler/data.awk @@ -0,0 +1,15 @@ +#!/usr/bin/awk -f + +BEGIN { + RS="\n" + FS=" " + CSV_HEADER="node,ts" + CSV_DATA="" + skip=1 + print(CSV_HEADER) +} + +/received data success/ { + gsub("]","",$0) + print($4","$2) +} diff --git a/analysis/scheduler/hint.awk b/analysis/scheduler/hint.awk new file mode 100755 index 0000000..2f996fc --- /dev/null +++ b/analysis/scheduler/hint.awk @@ -0,0 +1,15 @@ +#!/usr/bin/awk -f + +BEGIN { + RS="\n" + FS=" " + CSV_HEADER="node,wakets,duration,rcvat" + CSV_DATA="" + skip=1 + print(CSV_HEADER) +} + +/add a new hint/ { + gsub("]","",$0) + print($4","$10","$15","$2) +} diff --git a/analysis/scheduler/hint_fw.awk b/analysis/scheduler/hint_fw.awk new file mode 100755 index 0000000..594df94 --- /dev/null +++ b/analysis/scheduler/hint_fw.awk @@ -0,0 +1,15 @@ +#!/usr/bin/awk -f + +BEGIN { + RS="\n" + FS=" " + CSV_HEADER="node,ts" + CSV_DATA="" + skip=1 + print(CSV_HEADER) +} + +/forward a hint successfully/ { + gsub("]","",$0) + print($4","$2) +} diff --git a/analysis/scheduler/wakeup.R b/analysis/scheduler/wakeup.R new file mode 100644 index 0000000..d11d0c2 --- /dev/null +++ b/analysis/scheduler/wakeup.R @@ -0,0 +1,65 @@ +library("tidyverse") +library("gridExtra") + +pdf(NULL) + +# Load data +data=read_csv("wakeup.csv") +yorder=str_sort(unique(data$node),numeric=TRUE) +data=data%>%mutate(node=factor(node,levels=yorder)) + +# Load hint +hint=read_csv("hint.csv") + +# Load hint forward +hint_fw=read_csv("hint_fw.csv") + +# Load data +data_rcv=read_csv("data.csv") + + +# Configure axis +ts_range=seq(0, 24)*3600 +ts_labels=ts_range/3600 + +# Plot +p1=ggplot(data,aes(x=wakets,y=node)) + geom_hline(aes(yintercept=node),color="grey",size=3) +if(NROW(hint)!=0){ + p1=p1+geom_vline(data=hint,aes(xintercept=wakets,color="Hint slots"),show.legend = FALSE,linetype="longdash",size=0.3) +} +p1=p1+geom_linerange(aes(xmin=wakets,xmax=sleepts),size=10) +if(NROW(hint)!=0){ + p1=p1+geom_linerange(data=hint,aes(xmin=wakets,xmax=wakets+duration,color="Hint slots"),size=10) +} +if(NROW(data_rcv)!=0){ + p1=p1+geom_point(data=data_rcv,aes(x=ts,color="Data received"),shape=18,size=4) +} +if(NROW(hint)!=0){ + p1=p1+geom_point(data=hint,aes(x=rcvat,color="Hint received"),shape=18,size=3) +} +if(NROW(hint_fw)!=0){ + p1=p1+geom_point(data=hint_fw,aes(x=ts,color="Hint Forwarded"),shape=18,size=2) +} +p1=p1+ + xlab("Time (hours)")+ylab("Node")+ + scale_x_continuous(breaks = ts_range, labels=ts_labels,expand = c(0, 0))+ + scale_colour_manual(name="Legend",values=c("Hint slots"="blue","Data received"="red","Hint received"="green","Hint Forwarded"="purple"))+ + theme(panel.grid.major.x = element_line(size = 1.2),panel.grid.major.y = element_blank(),panel.grid.minor = element_blank()) + +stats=data%>%group_by(node)%>%summarise(n=n())%>%mutate(nwakeup=n-24) + +p2=ggplot(stats,aes(x=node,y=nwakeup))+ + geom_bar(stat="identity")+xlab("Node")+ylab("Extra wake up count")+ylim(0,10)+ + scale_y_continuous(breaks = seq(0,10)) + +stats2=tibble( + metric=c("Hint Received","Hint Forwarded","Data Received"), + count=c(NROW(hint),NROW(hint_fw),NROW(data_rcv)) +) + +p3=ggplot(stats2,aes(x=metric,y=count))+ + geom_bar(stat="identity")+xlab("Metric")+ylab("Count")+ylim(0,20) + + +p=grid.arrange(p1,p2,p3,heights=c(10,5,5)) +ggsave(plot=p,"schedule.png",dpi=300,width = 10,height=10) diff --git a/analysis/scheduler/wakeup.awk b/analysis/scheduler/wakeup.awk new file mode 100755 index 0000000..1bc8934 --- /dev/null +++ b/analysis/scheduler/wakeup.awk @@ -0,0 +1,43 @@ +#!/usr/bin/awk -f + +BEGIN { + RS="\n" + FS=" " + CSV_HEADER="node,wakets,sleepts,duration" + CSV_DATA="" + skip=1 +} + +/wakes up/{ + gsub("]","",$0) + wakets[$4][length(wakets[$4])+1]=$2 + skip=0 +} + +/is sleeping/{ + gsub("]","",$0) + if(!skip){ + sleepts[$4][length(sleepts[$4])+1]=$2 + } +} + +/LOG2PARSE/{ + gsub("]","",$0) + endts[$6][length(endts[$6])+1]=$2 +} + +END { + print(CSV_HEADER); + for(node in wakets){ + for(j=1;j<=length(wakets[node]);j++){ + start=wakets[node][j] + end=endts[node][1] + # Pay attention, the last sleep report for the last wake up is not printed + # so use the printed sleep only if available (otherwise we use the en of the simulation) + if(j<=length(sleepts[node])){ + end=sleepts[node][j] + } + print(node","start","end","end-start) + } + } +} diff --git a/analysis/strategies_pareto.R b/analysis/strategies_pareto.R new file mode 100644 index 0000000..79eddfd --- /dev/null +++ b/analysis/strategies_pareto.R @@ -0,0 +1,119 @@ +library("tidyverse") +library("gridExtra") +library("patchwork") +library("knitr") +library(RColorBrewer) +library(latex2exp) + +r_=function(x){round(x,digits=2)} +color=function(){scale_fill_brewer(palette = "Accent")} +color2=function(){scale_fill_brewer(palette = "Set2")} +nolegend=function(){theme(legend.position="none")} +simkeys=unique(read_csv("../results/ccgrid2023.csv")$simkey) +nsimkeys=length(simkeys) +s_=function(x){if(x<0){return("")}else{return("+")}} +simkey_rename=function(key){ + if(key=="hint") + return("Hints") + if(key=="baseline") + return("Baseline") + if(key=="extended") + return("Extended") + if(key=="hintandextended") + return("Hints+\nExtended") + return(key) +} +dformat=function(data){ + data%>%rowwise()%>%mutate(simkey=simkey_rename(simkey))%>%mutate(wireless=ifelse(wireless=="lora","LoRa","NbIoT")) +} + +build_stats=function(file){ + data=read_csv(file) + + energy=data%>%group_by(simkey,wireless,seed,isSender,wakeupfor)%>%summarise(sd=sd(energy),energy=mean(energy))%>%mutate(type=ifelse(isSender,"Sender","Receiver")) + + # Only sender knows success: + success=data%>%filter(isSender==1)%>%group_by(simkey,wireless,seed,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend)) + + return(energy%>%ungroup()%>%left_join(success)) + + +energy60=data%>%filter(wakeupfor==60) +energy60Snd=energy60%>%filter(isSender==1)%>%group_by(simkey,wireless,seed)%>%summarise(sd=sd(energy),energy=mean(energy),type="Sender") +energy60Rcv=energy60%>%filter(isSender==0)%>%group_by(simkey,wireless,seed)%>%summarise(sd=sd(energy),energy=mean(energy),type="Receiver") +energy60=energy60Snd%>%ungroup()%>%rbind(energy60Rcv) + +print(energy60) +stopifnot(1) + +success60Snd=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,seed)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success60Rcv=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,seed)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") +success60=rbind(success60Snd,success60Rcv) + +total60=energy60%>%left_join(success60,by=c("simkey","wireless","type")) + +energy180=data%>%filter(wakeupfor==180) +energy180Snd=energy180%>%filter(isSender==1)%>%group_by(simkey,wireless,seed)%>%summarise(sd=sd(energy),energy=mean(energy),type="Sender") +energy180Rcv=energy180%>%filter(isSender==0)%>%group_by(simkey,wireless,seed)%>%summarise(sd=sd(energy),energy=mean(energy),type="Receiver") +energy180=energy180Snd%>%ungroup()%>%rbind(energy180Rcv) + +success180Snd=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,seed)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success180Rcv=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,seed)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") +success180=rbind(success180Snd,success180Rcv) + +total180=energy180%>%left_join(success180,by=c("simkey","wireless","type")) + +return(rbind(total60%>%mutate(wakeupfor=60),total180%>%mutate(wakeupfor=180))) +} + +# Load stats +stats_sor=build_stats("../results/strategy_sor.csv")%>%filter(type=="Sender")%>%mutate(strategy="SOR") +stats_uor=build_stats("../results/strategy_uor.csv")%>%filter(type=="Sender")%>%mutate(strategy="UOR") +stats_fh=build_stats("../results/strategy_farhint.csv")%>%filter(type=="Sender")%>%mutate(strategy="FH") +stats_cmb=build_stats("../results/strategy_combined.csv")%>%filter(type=="Sender")%>%mutate(strategy="Combined") +stats_none=build_stats("../results/ccgrid2023.csv")%>%filter(type=="Sender")%>%mutate(strategy="None") +stats=rbind(stats_sor,stats_uor,stats_fh,stats_cmb,stats_none)%>%filter(wireless=="nbiot",wakeupfor==60) # Change filter as you which (which plot you want down bellow) + +pareto=tibble() +stats%>%ungroup()%>%group_by(wakeupfor,wireless)%>%group_walk(function(data, t){ + for(i in 1:NROW(data)){ + pt=data[i,] + e=pt$energy + s=pt$success + + domE=data$energy<e + domS=data$success>=s + + if(!any(domE & domS)){ + pareto<<-rbind(pareto,cbind(pt,t)) + } +}}) +pareto = pareto %>% mutate(energy = as.numeric(energy)) +pareto = pareto %>% mutate(success = as.numeric(success)) +pareto = pareto %>% arrange(energy,success) +pareto = pareto %>% dformat() + +##### Policies +ggplot(stats%>%dformat(),aes(energy,success,color=simkey,shape=simkey))+ + geom_line(data=pareto,aes(energy,success),linetype="dashed", size=1,inherit.aes=FALSE)+ + geom_point(size=4)+ + geom_point(data=pareto,size=4)+scale_y_reverse()+ + labs(color="Policies:",shape="Policies:")+scale_color_brewer(palette = "Set1")+theme_minimal()+theme(text=element_text(size=20), legend.position=c(.8,.75),legend.box.background = element_rect(color="black", size=1, fill="white"))+scale_shape_manual(values = c(17,18,20,3,4))+ + xlab("Sender energy consumption (J)")+ylab(TeX(r'(#Succ$_p$)')) +# +facet_wrap(~wakeupfor+wireless,scale="free") +ggsave("figures/pareto_policies.pdf",width=10,height=9) + +##### Strategies +ggplot(stats%>%dformat(),aes(energy,success,color=strategy,shape=strategy))+ + geom_line(data=pareto,aes(energy,success),linetype="dashed", size=1,inherit.aes=FALSE)+ + geom_point(size=4)+ + geom_point(data=pareto,size=4)+scale_y_reverse()+ + labs(color="Strategies:",shape="Strategies:")+scale_color_brewer(palette = "Dark2")+theme_minimal()+theme(text=element_text(size=20), legend.position=c(.8,.75),legend.box.background = element_rect(color="black", size=1, fill="white"))+scale_shape_manual(values = c(17,18,20,3,4))+ + xlab("Sender energy consumption (J)")+ylab(TeX(r'(#Succ$_p$)')) +# +facet_wrap(~wakeupfor+wireless,scale="free") +ggsave("figures/pareto_strategies.pdf",width=10,height=9) + + +message("Pareto infos:") +print(pareto%>%group_by(simkey)%>%summarize(count=n())) +print(pareto%>%group_by(strategy)%>%summarize(count=n())) diff --git a/analysis/strategies_tables.R b/analysis/strategies_tables.R new file mode 100644 index 0000000..3f8ede3 --- /dev/null +++ b/analysis/strategies_tables.R @@ -0,0 +1,243 @@ +library("tidyverse") +library("gridExtra") +library("patchwork") +library("knitr") +library(RColorBrewer) + +r_=function(x){round(x,digits=2)} +color=function(){scale_fill_brewer(palette = "Accent")} +color2=function(){scale_fill_brewer(palette = "Set2")} +nolegend=function(){theme(legend.position="none")} +simkeys=unique(read_csv("../results/ccgrid2023.csv")$simkey) +nsimkeys=length(simkeys) +s_=function(x){if(x<0){return("")}else{return("+")}} +simkey_rename=function(key){ + if(key=="hint") + return("Hints") + if(key=="baseline") + return("Baseline") + if(key=="extended") + return("Extended") + if(key=="hintandextended") + return("Hints+Extended") + return(key) +} +dformat=function(data){ + data%>%rowwise()%>%mutate(simkey=simkey_rename(simkey))%>%mutate(wireless=ifelse(wireless=="lora","LoRa","NbIoT")) +} + +build_stats=function(file){ +data=read_csv(file) +energy60=data%>%filter(wakeupfor==60) +energy60Snd=energy60%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),sd_energy=sd(energy),energy=mean(energy),type="Sender") +energy60Rcv=energy60%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),sd_energy=sd(energy),energy=mean(energy),type="Receiver") +energy60=energy60Snd%>%ungroup()%>%rbind(energy60Rcv) +energy60=energy60%>%mutate(sd_min=energy-sd,sd_max=energy+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd_min)))%>%mutate(sd_max_txt=paste0("+",r_(sd_max))) +energy60Baseline=energy60%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id="id")%>%mutate(simkey=simkeys[id]) +energy60=energy60%>%left_join(energy60Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) +energy60=energy60%>%mutate(ovhd=energy*100/energy_baseline-100) +energy60=energy60%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),"%)")) +success60Snd=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success60Rcv=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") +success60=rbind(success60Snd,success60Rcv) +success60=success60%>%rowwise()%>%mutate(success_txt=paste0("[",success,"]")) +energy60=energy60%>%left_join(success60)%>%rowwise()%>%mutate(infos_txt=paste0(ovhd_txt,"\n{",r_(energy/success_orig),"}"),infos=energy/success_orig) +energy60=energy60%>%mutate(type=factor(type,levels = c("Sender","Receiver")),wakeupfor=60) + + +energy180=data%>%filter(wakeupfor==180) +energy180Snd=energy180%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),sd_energy=sd(energy),energy=mean(energy),type="Sender") +energy180Rcv=energy180%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),sd_energy=sd(energy),energy=mean(energy),type="Receiver") +energy180=energy180Snd%>%ungroup()%>%rbind(energy180Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver"))) +energy180=energy180%>%mutate(sd_min=energy-sd,sd_max=energy+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd_min)))%>%mutate(sd_max_txt=paste0("+",r_(sd_max))) +energy180Baseline=energy180%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id="id")%>%mutate(simkey=simkeys[id]) +energy180=energy180%>%left_join(energy180Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) +energy180=energy180%>%mutate(ovhd=energy*100/energy_baseline-100) +energy180=energy180%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),"%)")) +success180Snd=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success180Rcv=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") +success180=rbind(success180Snd,success180Rcv) +success180=success180%>%rowwise()%>%mutate(success_txt=paste0("[",success,"]")) +energy180=energy180%>%left_join(success180)%>%rowwise()%>%mutate(infos_txt=paste0(ovhd_txt,"\n{",r_(energy/success_orig),"}"),infos=energy/success_orig) +energy180=energy180%>%mutate(type=factor(type,levels = c("Sender","Receiver")),wakeupfor=180) + +totalUptime60=data%>%filter(wakeupfor==60) +totalUptime60Snd=totalUptime60%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Sender") +totalUptime60Rcv=totalUptime60%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Receiver") +totalUptime60=totalUptime60Snd%>%ungroup()%>%rbind(totalUptime60Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver"))) +totalUptime60=totalUptime60%>%mutate(sd_min=totalUptime-sd,sd_max=totalUptime+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd_min)))%>%mutate(sd_max_txt=paste0("+",r_(sd_max))) +totalUptime60Baseline=totalUptime60%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id="id")%>%mutate(simkey=simkeys[id]) +totalUptime60=totalUptime60%>%left_join(totalUptime60Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) +totalUptime60=totalUptime60%>%mutate(ovhd=totalUptime-totalUptime_baseline) +totalUptime60=totalUptime60%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),")")) +totalUptime60=totalUptime60%>%mutate(type=factor(type,levels = c("Sender","Receiver")),,wakeupfor=60) + +totalUptime180=data%>%filter(wakeupfor==180) +totalUptime180Snd=totalUptime180%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Sender") +totalUptime180Rcv=totalUptime180%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Receiver") +totalUptime180=totalUptime180Snd%>%ungroup()%>%rbind(totalUptime180Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver"))) +totalUptime180=totalUptime180%>%mutate(sd_min=totalUptime-sd,sd_max=totalUptime+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd_min)))%>%mutate(sd_max_txt=paste0("+",r_(sd_max))) +totalUptime180Baseline=totalUptime180%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id="id")%>%mutate(simkey=simkeys[id]) +totalUptime180=totalUptime180%>%left_join(totalUptime180Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) +totalUptime180=totalUptime180%>%mutate(ovhd=totalUptime-totalUptime_baseline) +totalUptime180=totalUptime180%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),")")) +totalUptime180=totalUptime180%>%mutate(type=factor(type,levels = c("Sender","Receiver")),wakeupfor=180) + +totalUptime=rbind(totalUptime60,totalUptime180) +energy=rbind(energy60,energy180) +totalUptime%>%left_join(energy,by=c("simkey","wireless","wakeupfor","type"),suffix = c("","")) + +} + +build_table=function(strategy_csv){ + +# Load stats +stats=build_stats(paste0("../results/",strategy_csv,".csv")) +stats_prev=build_stats("../results/ccgrid2023.csv") +stats=stats%>%left_join(stats_prev,by=c("simkey","wireless","wakeupfor","type"),suffix=c("","_prev")) + +# Additional computations +stats=stats%>%mutate(energy_diff=energy-energy_prev) +stats=stats%>%mutate(success_diff=success-success_prev) +stats=stats%>%mutate(ovhd_diff=ovhd-ovhd_prev) +stats=stats%>%mutate(infos_diff=infos-infos_prev) + +# Final results +stats=stats%>%select(simkey,wireless,wakeupfor,type,energy,energy_diff,success_diff,ovhd_diff,infos_diff,ovhd,infos,success) + + + +tf=paste0("figures/table_",strategy_csv,".org") +fw=function(str){write(str,file=tf,append = TRUE)} +df=function(d,rcolor=FALSE){ + + if(is.na(d)||is.infinite(d)){ + return("") + } + else if(d<0){ + c="green!60" + if(rcolor){c="red!60"} + return(paste0(r"(~{\color{)",c,r"(}\textbf{)",r_(d),"}}")) + } + else if (d>0){ + c="red!60" + if(rcolor){c="green!60"} + return(paste0(r"(~{\color{)",c,r"(}\textbf{+)",r_(d),"}}")) + } + r"(~{\color{blue!60}\textbf{=}})" +} +mbox=function(v,d,alpha){ + if(is.infinite(v)) + v="--" + paste0(r"(\makebox[)",alpha,r"(cm]{\hfill )",v,r"(})",d) +} + +write_table=function(techno){ +stats%>%filter(wireless==techno)%>%group_by(wakeupfor)%>%group_walk(function(d1,g1){ + uptime=as.numeric(g1) + first=TRUE + d1%>%group_by(simkey)%>%group_walk(function(d2,g2){ + scenario=as.character(g2) + senders=d2%>%filter(type=="Sender") + receivers=d2%>%filter(type=="Receiver") + + #### Stats + sender_energy=r_(as.numeric(senders%>%select(energy))) + receiver_energy=r_(as.numeric(receivers%>%select(energy))) + sender_ovhd=r_(as.numeric(senders%>%select(ovhd))) + if(sender_ovhd>0) + sender_ovhd=paste0("+",sender_ovhd) + receiver_ovhd=r_(as.numeric(receivers%>%select(ovhd))) + if(receiver_ovhd>0) + receiver_ovhd=paste0("+",receiver_ovhd) + sender_eff=r_(as.numeric(senders%>%select(infos))) + receiver_eff=r_(as.numeric(receivers%>%select(infos))) + succ=r_(as.numeric(senders%>%select(success))) + + #### Diff + sender_energy_diff=df(r_(as.numeric(senders%>%select(energy_diff)))) + receiver_energy_diff=df(r_(as.numeric(receivers%>%select(energy_diff)))) + sender_ovhd_diff=df(r_(as.numeric(senders%>%select(ovhd_diff)))) + receiver_ovhd_diff=df(r_(as.numeric(receivers%>%select(ovhd_diff)))) + sender_eff_diff=df(r_(as.numeric(senders%>%select(infos_diff)))) + receiver_eff_diff=df(r_(as.numeric(receivers%>%select(infos_diff)))) + succ_diff=df(r_(as.numeric(senders%>%select(success_diff))),rcolor = TRUE) + + tw=paste0("&",scenario,"&", + mbox(succ,succ_diff,0.5),"&", + mbox(sender_energy,sender_energy_diff,0.8),"&", + mbox(receiver_energy,receiver_energy_diff,0.8),"&", + mbox(sender_ovhd,sender_ovhd_diff,0.7),"&", + mbox(receiver_ovhd,receiver_ovhd_diff,0.7),"&", + mbox(sender_eff,sender_eff_diff,0.65),"&", + mbox(receiver_eff,receiver_eff_diff,0.65)) + + + if(first) + tw=paste0(r"(\multirow{4}{*}{)",uptime,"}",tw) + fw(paste0(tw,r"(\\)")) + + first<<-FALSE + }) + if(uptime==60) + fw(r"(\midrule)") + }) +} + +header=paste0(r"(\begin{table*} +\centering +\caption{)","Simulation results using the ",strategy_csv,r"( strategy. Comparison between our previous results\cite{prev} are in color. Green indicates improvements, red shows regressions and blue indicates no change.)",r"(} +\begin{tabular}{crlllllll} +\toprule +\multirow{2}{*}{Uptime} & \multirow{2}{*}{Scenario} & \multirow{2}{*}{$\# Succ_p$} & \multicolumn{2}{c}{Energy Consumption (J)} & \multicolumn{2}{c}{$eOvhd(p)$ (\%)} & \multicolumn{2}{c}{$eff(p)$ (J)}\\ +\cmidrule(lr){4-5}\cmidrule(lr){6-7}\cmidrule(lr){8-9} +&&&Sender & Receiver&Sender & Receiver&Sender & Receiver\\ +\midrule)") +footer=r"(\bottomrule +\end{tabular} +\end{table*})" + + +write("",file=tf) +fw(header) +fw(r"(\multicolumn{9}{c}{LoRa}\\)") +fw(r"(\midrule)") +write_table("lora") +fw(r"(\midrule)") +fw(r"(\multicolumn{9}{c}{NbIoT}\\)") +fw(r"(\midrule)") +write_table("nbiot") +fw(footer) +} + +build_table("strategy_sor") +build_table("strategy_uor") +build_table("strategy_farhint") +build_table("strategy_combined") + + +## Print energy sd infos +stats_sor=build_stats("../results/strategy_sor.csv") +stats_uor=build_stats("../results/strategy_uor.csv") +stats_farhint=build_stats("../results/strategy_farhint.csv") +stats_combined=build_stats("../results/strategy_combined.csv") +message(paste0("Energy std SOR: min=", + round(min(stats_sor$sd_energy)), + " max=",round(max(stats_sor$sd_energy)), + " median=",round(median(stats_sor$sd_energy)))) + +message(paste0("Energy std UOR: min=", + round(min(stats_uor$sd_energy)), + " max=",round(max(stats_uor$sd_energy)), + " median=",round(median(stats_uor$sd_energy)))) + + +message(paste0("Energy std FARHINT: min=", + round(min(stats_farhint$sd_energy)), + " max=",round(max(stats_farhint$sd_energy)), + " median=",round(median(stats_farhint$sd_energy)))) + +message(paste0("Energy std combined: min=", + round(min(stats_combined$sd_energy)), + " max=",round(max(stats_combined$sd_energy)), + " median=",round(median(stats_combined$sd_energy)))) |