From 3a4c5500f7c3e139fbb44b2c98343bd0091ae593 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Wed, 30 Nov 2022 10:01:05 +0100 Subject: Minor changes --- analysis/figures/combined.pdf | Bin 1235707 -> 1161922 bytes analysis/figures/dimension_coverage.pdf | Bin 18248 -> 18212 bytes analysis/figures/dimension_efficiency.pdf | Bin 95369 -> 78855 bytes .../figures/dimension_energy-coverage-policy.pdf | Bin 147139 -> 139310 bytes .../dimension_energy-coverage-wakeupfor.pdf | Bin 147425 -> 137643 bytes analysis/figures/dimension_energy-coverage.pdf | Bin 156877 -> 149152 bytes analysis/figures/dimension_energy.pdf | Bin 127845 -> 111807 bytes .../figures/f1_scores_offline_ignoreHINTFALSE.csv | 3 +++ .../figures/f1_scores_offline_ignoreHINTTRUE.csv | 3 +++ analysis/figures/months_knn.pdf | Bin 23421 -> 23031 bytes analysis/figures/months_tree.pdf | Bin 20718 -> 20626 bytes .../figures/sim_dimension_coverage_NO_HINT.pdf | Bin 32982 -> 33148 bytes .../figures/sim_dimension_coverage_WITH_HINT.pdf | Bin 33358 -> 33626 bytes analysis/figures/sim_dimension_energy_NO_HINT.pdf | Bin 38035 -> 36693 bytes .../figures/sim_dimension_energy_WITH_HINT.pdf | Bin 38170 -> 36850 bytes analysis/figures/sim_results_NO_HINT.csv | 9 +++++++++ analysis/figures/sim_results_WITH_HINT.csv | 9 +++++++++ 17 files changed, 24 insertions(+) create mode 100644 analysis/figures/f1_scores_offline_ignoreHINTFALSE.csv create mode 100644 analysis/figures/f1_scores_offline_ignoreHINTTRUE.csv create mode 100644 analysis/figures/sim_results_NO_HINT.csv create mode 100644 analysis/figures/sim_results_WITH_HINT.csv (limited to 'analysis/figures') diff --git a/analysis/figures/combined.pdf b/analysis/figures/combined.pdf index 80f32bd..9a4ed4b 100644 Binary files a/analysis/figures/combined.pdf and b/analysis/figures/combined.pdf differ diff --git a/analysis/figures/dimension_coverage.pdf b/analysis/figures/dimension_coverage.pdf index 6761219..4081087 100644 Binary files a/analysis/figures/dimension_coverage.pdf and b/analysis/figures/dimension_coverage.pdf differ diff --git a/analysis/figures/dimension_efficiency.pdf b/analysis/figures/dimension_efficiency.pdf index cc4ac9b..bc639e4 100644 Binary files a/analysis/figures/dimension_efficiency.pdf and b/analysis/figures/dimension_efficiency.pdf differ diff --git a/analysis/figures/dimension_energy-coverage-policy.pdf b/analysis/figures/dimension_energy-coverage-policy.pdf index 1bcb5cc..c0440c7 100644 Binary files a/analysis/figures/dimension_energy-coverage-policy.pdf and b/analysis/figures/dimension_energy-coverage-policy.pdf differ diff --git a/analysis/figures/dimension_energy-coverage-wakeupfor.pdf b/analysis/figures/dimension_energy-coverage-wakeupfor.pdf index 22d7539..42869c6 100644 Binary files a/analysis/figures/dimension_energy-coverage-wakeupfor.pdf and b/analysis/figures/dimension_energy-coverage-wakeupfor.pdf differ diff --git a/analysis/figures/dimension_energy-coverage.pdf b/analysis/figures/dimension_energy-coverage.pdf index 02d04ec..6d7cf5c 100644 Binary files a/analysis/figures/dimension_energy-coverage.pdf and b/analysis/figures/dimension_energy-coverage.pdf differ diff --git a/analysis/figures/dimension_energy.pdf b/analysis/figures/dimension_energy.pdf index a2f0c51..5a5b51c 100644 Binary files a/analysis/figures/dimension_energy.pdf and b/analysis/figures/dimension_energy.pdf differ diff --git a/analysis/figures/f1_scores_offline_ignoreHINTFALSE.csv b/analysis/figures/f1_scores_offline_ignoreHINTFALSE.csv new file mode 100644 index 0000000..6f8b376 --- /dev/null +++ b/analysis/figures/f1_scores_offline_ignoreHINTFALSE.csv @@ -0,0 +1,3 @@ +model,f1_baseline,f1_hint,f1_extended,f1_hintandextended,accuracy +knn,0.83,0.73,0.9,0.79,0.69 +tree,0.9,0.75,0.86,0.79,0.7 diff --git a/analysis/figures/f1_scores_offline_ignoreHINTTRUE.csv b/analysis/figures/f1_scores_offline_ignoreHINTTRUE.csv new file mode 100644 index 0000000..fa754ff --- /dev/null +++ b/analysis/figures/f1_scores_offline_ignoreHINTTRUE.csv @@ -0,0 +1,3 @@ +model,f1_baseline,f1_hint,f1_extended,f1_hintandextended,accuracy +knn,0.88,NA,0.89,0.91,0.81 +tree,0.93,NA,0.86,0.92,0.83 diff --git a/analysis/figures/months_knn.pdf b/analysis/figures/months_knn.pdf index 17a4ad1..2eab11f 100644 Binary files a/analysis/figures/months_knn.pdf and b/analysis/figures/months_knn.pdf differ diff --git a/analysis/figures/months_tree.pdf b/analysis/figures/months_tree.pdf index 83d4f6d..60fe389 100644 Binary files a/analysis/figures/months_tree.pdf and b/analysis/figures/months_tree.pdf differ diff --git a/analysis/figures/sim_dimension_coverage_NO_HINT.pdf b/analysis/figures/sim_dimension_coverage_NO_HINT.pdf index b9b9519..096e285 100644 Binary files a/analysis/figures/sim_dimension_coverage_NO_HINT.pdf and b/analysis/figures/sim_dimension_coverage_NO_HINT.pdf differ diff --git a/analysis/figures/sim_dimension_coverage_WITH_HINT.pdf b/analysis/figures/sim_dimension_coverage_WITH_HINT.pdf index a226cf0..567ec38 100644 Binary files a/analysis/figures/sim_dimension_coverage_WITH_HINT.pdf and b/analysis/figures/sim_dimension_coverage_WITH_HINT.pdf differ diff --git a/analysis/figures/sim_dimension_energy_NO_HINT.pdf b/analysis/figures/sim_dimension_energy_NO_HINT.pdf index d5ab543..7a8129f 100644 Binary files a/analysis/figures/sim_dimension_energy_NO_HINT.pdf and b/analysis/figures/sim_dimension_energy_NO_HINT.pdf differ diff --git a/analysis/figures/sim_dimension_energy_WITH_HINT.pdf b/analysis/figures/sim_dimension_energy_WITH_HINT.pdf index 590bc80..cfdbf83 100644 Binary files a/analysis/figures/sim_dimension_energy_WITH_HINT.pdf and b/analysis/figures/sim_dimension_energy_WITH_HINT.pdf differ diff --git a/analysis/figures/sim_results_NO_HINT.csv b/analysis/figures/sim_results_NO_HINT.csv new file mode 100644 index 0000000..bb766bd --- /dev/null +++ b/analysis/figures/sim_results_NO_HINT.csv @@ -0,0 +1,9 @@ +wireless,wakeupfor,model,mean_energy,mean_coverage,sd_energy,sd_coverage +lora,60,knn,-32.58,-0.06,98.03,0.72 +lora,60,tree,-155.83,-0.98,119.03,0.87 +lora,180,knn,-1125.21,5.26,99.11,0.22 +lora,180,tree,-1659.57,2.44,199.05,0.44 +nbiot,60,knn,-497.99,0.32,52.86,0.3 +nbiot,60,tree,-520.09,-0.09,60.35,0.34 +nbiot,180,knn,12.46,2.32,149.98,0.17 +nbiot,180,tree,-284.82,2.18,257.4,0.29 diff --git a/analysis/figures/sim_results_WITH_HINT.csv b/analysis/figures/sim_results_WITH_HINT.csv new file mode 100644 index 0000000..b029bef --- /dev/null +++ b/analysis/figures/sim_results_WITH_HINT.csv @@ -0,0 +1,9 @@ +wireless,wakeupfor,model,mean_energy,mean_coverage,sd_energy,sd_coverage +lora,60,knn,-171.89,-0.78,119.98,0.88 +lora,60,tree,-207.11,-1.05,123.19,0.9 +lora,180,knn,-2629.47,0.11,202.56,0.44 +lora,180,tree,-2924.29,-1.44,172.87,0.38 +nbiot,60,knn,-560.44,-0.53,67.91,0.38 +nbiot,60,tree,-521.77,0.19,61.78,0.35 +nbiot,180,knn,-1543.86,1.51,377.76,0.43 +nbiot,180,tree,-1874.18,1.36,357.03,0.41 -- cgit v1.2.3