From b886fcab35743b1e4a26e6c96890856e2317f473 Mon Sep 17 00:00:00 2001 From: kaguillera Date: Wed, 1 Jul 2020 16:34:47 -0400 Subject: [PATCH] Add testing for battery features --- tests/Snakefile | 7 +++ .../processed/test01/battery_afternoon.csv | 2 + tests/data/processed/test01/battery_daily.csv | 2 + .../data/processed/test01/battery_deltas.csv | 12 ++++ .../data/processed/test01/battery_evening.csv | 2 + .../data/processed/test01/battery_morning.csv | 2 + tests/data/processed/test01/battery_night.csv | 2 + .../processed/test02/battery_afternoon.csv | 2 + tests/data/processed/test02/battery_daily.csv | 2 + .../data/processed/test02/battery_deltas.csv | 12 ++++ .../data/processed/test02/battery_evening.csv | 2 + .../data/processed/test02/battery_morning.csv | 2 + tests/data/processed/test02/battery_night.csv | 2 + .../processed/test03/battery_afternoon.csv | 1 + tests/data/processed/test03/battery_daily.csv | 1 + .../data/processed/test03/battery_deltas.csv | 1 + .../data/processed/test03/battery_evening.csv | 1 + .../data/processed/test03/battery_morning.csv | 1 + tests/data/processed/test03/battery_night.csv | 1 + .../processed/test04/battery_afternoon.csv | 1 + tests/data/processed/test04/battery_daily.csv | 1 + .../data/processed/test04/battery_deltas.csv | 1 + .../data/processed/test04/battery_evening.csv | 1 + .../data/processed/test04/battery_morning.csv | 1 + tests/data/processed/test04/battery_night.csv | 1 + tests/data/raw/test01/battery_raw.csv | 20 +++---- tests/data/raw/test02/battery_raw.csv | 58 +++++++++++++++++++ tests/data/raw/test03/battery_raw.csv | 1 + tests/data/raw/test04/battery_raw.csv | 1 + tests/settings/config.yaml | 2 +- tests/settings/testing_config.yaml | 10 +++- 31 files changed, 142 insertions(+), 13 deletions(-) create mode 100644 tests/data/processed/test01/battery_afternoon.csv create mode 100644 tests/data/processed/test01/battery_daily.csv create mode 100644 tests/data/processed/test01/battery_deltas.csv create mode 100644 tests/data/processed/test01/battery_evening.csv create mode 100644 tests/data/processed/test01/battery_morning.csv create mode 100644 tests/data/processed/test01/battery_night.csv create mode 100644 tests/data/processed/test02/battery_afternoon.csv create mode 100644 tests/data/processed/test02/battery_daily.csv create mode 100644 tests/data/processed/test02/battery_deltas.csv create mode 100644 tests/data/processed/test02/battery_evening.csv create mode 100644 tests/data/processed/test02/battery_morning.csv create mode 100644 tests/data/processed/test02/battery_night.csv create mode 100644 tests/data/processed/test03/battery_afternoon.csv create mode 100644 tests/data/processed/test03/battery_daily.csv create mode 100644 tests/data/processed/test03/battery_deltas.csv create mode 100644 tests/data/processed/test03/battery_evening.csv create mode 100644 tests/data/processed/test03/battery_morning.csv create mode 100644 tests/data/processed/test03/battery_night.csv create mode 100644 tests/data/processed/test04/battery_afternoon.csv create mode 100644 tests/data/processed/test04/battery_daily.csv create mode 100644 tests/data/processed/test04/battery_deltas.csv create mode 100644 tests/data/processed/test04/battery_evening.csv create mode 100644 tests/data/processed/test04/battery_morning.csv create mode 100644 tests/data/processed/test04/battery_night.csv create mode 100644 tests/data/raw/test02/battery_raw.csv create mode 100644 tests/data/raw/test03/battery_raw.csv create mode 100644 tests/data/raw/test04/battery_raw.csv diff --git a/tests/Snakefile b/tests/Snakefile index 20d56e19..060f017e 100644 --- a/tests/Snakefile +++ b/tests/Snakefile @@ -30,6 +30,13 @@ if config["SCREEN"]["COMPUTE"]: files_to_compute.extend(expand("data/processed/{pid}/screen_deltas.csv", pid=config["PIDS"])) files_to_compute.extend(expand("data/processed/{pid}/screen_{day_segment}.csv", pid = config["PIDS"], day_segment = config["SCREEN"]["DAY_SEGMENTS"])) +if config["BATTERY"]["COMPUTE"]: + files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"])) + files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"])) + files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"])) + files_to_compute.extend(expand("data/processed/{pid}/battery_deltas.csv", pid=config["PIDS"])) + files_to_compute.extend(expand("data/processed/{pid}/battery_{day_segment}.csv", pid = config["PIDS"], day_segment = config["BATTERY"]["DAY_SEGMENTS"])) + rule all: input: files_to_compute diff --git a/tests/data/processed/test01/battery_afternoon.csv b/tests/data/processed/test01/battery_afternoon.csv new file mode 100644 index 00000000..4544acf8 --- /dev/null +++ b/tests/data/processed/test01/battery_afternoon.csv @@ -0,0 +1,2 @@ +local_date,battery_afternoon_countdischarge,battery_afternoon_sumdurationdischarge,battery_afternoon_avgconsumptionrate,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge +2020-07-01,2,12.141000000000004,0.3148499579639538,0.3655119197498273,2,19.457666666666668 diff --git a/tests/data/processed/test01/battery_daily.csv b/tests/data/processed/test01/battery_daily.csv new file mode 100644 index 00000000..b69d3523 --- /dev/null +++ b/tests/data/processed/test01/battery_daily.csv @@ -0,0 +1,2 @@ +local_date,battery_daily_countdischarge,battery_daily_sumdurationdischarge,battery_daily_avgconsumptionrate,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_sumdurationcharge +2020-07-01,6,54.820549999999955,0.3388682207181443,0.4262039670118132,5,49.705000000000034 diff --git a/tests/data/processed/test01/battery_deltas.csv b/tests/data/processed/test01/battery_deltas.csv new file mode 100644 index 00000000..71e63cf7 --- /dev/null +++ b/tests/data/processed/test01/battery_deltas.csv @@ -0,0 +1,12 @@ +"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment" +3,9.46978333333333,"2020-07-01 00:08:10","2020-07-01 00:17:38","2020-07-01","2020-07-01","night","night" +-3,10.091,"2020-07-01 03:20:30","2020-07-01 03:30:35","2020-07-01","2020-07-01","night","night" +3,7.03888333333333,"2020-07-01 05:57:30","2020-07-01 06:04:32","2020-07-01","2020-07-01","night","morning" +-3,8.591,"2020-07-01 08:04:32","2020-07-01 08:13:07","2020-07-01","2020-07-01","morning","morning" +3,11.0243333333333,"2020-07-01 10:23:17","2020-07-01 10:34:18","2020-07-01","2020-07-01","morning","morning" +-3,12.1576666666667,"2020-07-01 11:55:58","2020-07-01 12:08:07","2020-07-01","2020-07-01","morning","afternoon" +3,8.20766666666667,"2020-07-01 13:52:07","2020-07-01 14:00:19","2020-07-01","2020-07-01","afternoon","afternoon" +-3,11.341,"2020-07-01 16:13:27","2020-07-01 16:24:47","2020-07-01","2020-07-01","afternoon","afternoon" +3,11.35555,"2020-07-01 17:56:03","2020-07-01 18:07:24","2020-07-01","2020-07-01","afternoon","evening" +-3,7.52433333333333,"2020-07-01 20:03:03","2020-07-01 20:10:34","2020-07-01","2020-07-01","evening","evening" +3,7.72433333333333,"2020-07-01 21:30:04","2020-07-01 21:37:47","2020-07-01","2020-07-01","evening","evening" diff --git a/tests/data/processed/test01/battery_evening.csv b/tests/data/processed/test01/battery_evening.csv new file mode 100644 index 00000000..d8dd2c3c --- /dev/null +++ b/tests/data/processed/test01/battery_evening.csv @@ -0,0 +1,2 @@ +local_date,battery_evening_countdischarge,battery_evening_sumdurationdischarge,battery_evening_avgconsumptionrate,battery_evening_maxconsumptionrate,battery_evening_countcharge,battery_evening_sumdurationcharge +2020-07-01,2,15.12433333333333,0.3262855140774751,0.3883830319768698,1,7.52433333333333 diff --git a/tests/data/processed/test01/battery_morning.csv b/tests/data/processed/test01/battery_morning.csv new file mode 100644 index 00000000..1bc5aa67 --- /dev/null +++ b/tests/data/processed/test01/battery_morning.csv @@ -0,0 +1,2 @@ +local_date,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_avgconsumptionrate,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_sumdurationcharge +2020-07-01,2,15.557666666666634,0.3491646327968694,0.4262039670118131,2,12.607666666666667 diff --git a/tests/data/processed/test01/battery_night.csv b/tests/data/processed/test01/battery_night.csv new file mode 100644 index 00000000..304297ec --- /dev/null +++ b/tests/data/processed/test01/battery_night.csv @@ -0,0 +1,2 @@ +local_date,battery_night_countdischarge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationcharge +2020-07-01,2,11.953116666666663,0.37150053891108137,0.4262039670118132,1,10.091000000000001 diff --git a/tests/data/processed/test02/battery_afternoon.csv b/tests/data/processed/test02/battery_afternoon.csv new file mode 100644 index 00000000..4544acf8 --- /dev/null +++ b/tests/data/processed/test02/battery_afternoon.csv @@ -0,0 +1,2 @@ +local_date,battery_afternoon_countdischarge,battery_afternoon_sumdurationdischarge,battery_afternoon_avgconsumptionrate,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge +2020-07-01,2,12.141000000000004,0.3148499579639538,0.3655119197498273,2,19.457666666666668 diff --git a/tests/data/processed/test02/battery_daily.csv b/tests/data/processed/test02/battery_daily.csv new file mode 100644 index 00000000..b69d3523 --- /dev/null +++ b/tests/data/processed/test02/battery_daily.csv @@ -0,0 +1,2 @@ +local_date,battery_daily_countdischarge,battery_daily_sumdurationdischarge,battery_daily_avgconsumptionrate,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_sumdurationcharge +2020-07-01,6,54.820549999999955,0.3388682207181443,0.4262039670118132,5,49.705000000000034 diff --git a/tests/data/processed/test02/battery_deltas.csv b/tests/data/processed/test02/battery_deltas.csv new file mode 100644 index 00000000..71e63cf7 --- /dev/null +++ b/tests/data/processed/test02/battery_deltas.csv @@ -0,0 +1,12 @@ +"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment" +3,9.46978333333333,"2020-07-01 00:08:10","2020-07-01 00:17:38","2020-07-01","2020-07-01","night","night" +-3,10.091,"2020-07-01 03:20:30","2020-07-01 03:30:35","2020-07-01","2020-07-01","night","night" +3,7.03888333333333,"2020-07-01 05:57:30","2020-07-01 06:04:32","2020-07-01","2020-07-01","night","morning" +-3,8.591,"2020-07-01 08:04:32","2020-07-01 08:13:07","2020-07-01","2020-07-01","morning","morning" +3,11.0243333333333,"2020-07-01 10:23:17","2020-07-01 10:34:18","2020-07-01","2020-07-01","morning","morning" +-3,12.1576666666667,"2020-07-01 11:55:58","2020-07-01 12:08:07","2020-07-01","2020-07-01","morning","afternoon" +3,8.20766666666667,"2020-07-01 13:52:07","2020-07-01 14:00:19","2020-07-01","2020-07-01","afternoon","afternoon" +-3,11.341,"2020-07-01 16:13:27","2020-07-01 16:24:47","2020-07-01","2020-07-01","afternoon","afternoon" +3,11.35555,"2020-07-01 17:56:03","2020-07-01 18:07:24","2020-07-01","2020-07-01","afternoon","evening" +-3,7.52433333333333,"2020-07-01 20:03:03","2020-07-01 20:10:34","2020-07-01","2020-07-01","evening","evening" +3,7.72433333333333,"2020-07-01 21:30:04","2020-07-01 21:37:47","2020-07-01","2020-07-01","evening","evening" diff --git a/tests/data/processed/test02/battery_evening.csv b/tests/data/processed/test02/battery_evening.csv new file mode 100644 index 00000000..d8dd2c3c --- /dev/null +++ b/tests/data/processed/test02/battery_evening.csv @@ -0,0 +1,2 @@ +local_date,battery_evening_countdischarge,battery_evening_sumdurationdischarge,battery_evening_avgconsumptionrate,battery_evening_maxconsumptionrate,battery_evening_countcharge,battery_evening_sumdurationcharge +2020-07-01,2,15.12433333333333,0.3262855140774751,0.3883830319768698,1,7.52433333333333 diff --git a/tests/data/processed/test02/battery_morning.csv b/tests/data/processed/test02/battery_morning.csv new file mode 100644 index 00000000..1bc5aa67 --- /dev/null +++ b/tests/data/processed/test02/battery_morning.csv @@ -0,0 +1,2 @@ +local_date,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_avgconsumptionrate,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_sumdurationcharge +2020-07-01,2,15.557666666666634,0.3491646327968694,0.4262039670118131,2,12.607666666666667 diff --git a/tests/data/processed/test02/battery_night.csv b/tests/data/processed/test02/battery_night.csv new file mode 100644 index 00000000..304297ec --- /dev/null +++ b/tests/data/processed/test02/battery_night.csv @@ -0,0 +1,2 @@ +local_date,battery_night_countdischarge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationcharge +2020-07-01,2,11.953116666666663,0.37150053891108137,0.4262039670118132,1,10.091000000000001 diff --git a/tests/data/processed/test03/battery_afternoon.csv b/tests/data/processed/test03/battery_afternoon.csv new file mode 100644 index 00000000..a95b9366 --- /dev/null +++ b/tests/data/processed/test03/battery_afternoon.csv @@ -0,0 +1 @@ +local_date,battery_afternoon_countdischarge,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_avgconsumptionrate,battery_afternoon_sumdurationcharge,battery_afternoon_sumdurationdischarge diff --git a/tests/data/processed/test03/battery_daily.csv b/tests/data/processed/test03/battery_daily.csv new file mode 100644 index 00000000..ef6083bb --- /dev/null +++ b/tests/data/processed/test03/battery_daily.csv @@ -0,0 +1 @@ +local_date,battery_daily_sumdurationcharge,battery_daily_sumdurationdischarge,battery_daily_countdischarge,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_avgconsumptionrate diff --git a/tests/data/processed/test03/battery_deltas.csv b/tests/data/processed/test03/battery_deltas.csv new file mode 100644 index 00000000..a3714a6e --- /dev/null +++ b/tests/data/processed/test03/battery_deltas.csv @@ -0,0 +1 @@ +"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment" diff --git a/tests/data/processed/test03/battery_evening.csv b/tests/data/processed/test03/battery_evening.csv new file mode 100644 index 00000000..65b9c934 --- /dev/null +++ b/tests/data/processed/test03/battery_evening.csv @@ -0,0 +1 @@ +local_date,battery_evening_sumdurationcharge,battery_evening_countdischarge,battery_evening_avgconsumptionrate,battery_evening_countcharge,battery_evening_maxconsumptionrate,battery_evening_sumdurationdischarge diff --git a/tests/data/processed/test03/battery_morning.csv b/tests/data/processed/test03/battery_morning.csv new file mode 100644 index 00000000..2d4ee156 --- /dev/null +++ b/tests/data/processed/test03/battery_morning.csv @@ -0,0 +1 @@ +local_date,battery_morning_sumdurationcharge,battery_morning_sumdurationdischarge,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_avgconsumptionrate,battery_morning_countdischarge diff --git a/tests/data/processed/test03/battery_night.csv b/tests/data/processed/test03/battery_night.csv new file mode 100644 index 00000000..e978126f --- /dev/null +++ b/tests/data/processed/test03/battery_night.csv @@ -0,0 +1 @@ +local_date,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_sumdurationcharge,battery_night_countdischarge diff --git a/tests/data/processed/test04/battery_afternoon.csv b/tests/data/processed/test04/battery_afternoon.csv new file mode 100644 index 00000000..db64a165 --- /dev/null +++ b/tests/data/processed/test04/battery_afternoon.csv @@ -0,0 +1 @@ +local_date,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge,battery_afternoon_sumdurationdischarge,battery_afternoon_maxconsumptionrate,battery_afternoon_avgconsumptionrate,battery_afternoon_countdischarge diff --git a/tests/data/processed/test04/battery_daily.csv b/tests/data/processed/test04/battery_daily.csv new file mode 100644 index 00000000..033d0b06 --- /dev/null +++ b/tests/data/processed/test04/battery_daily.csv @@ -0,0 +1 @@ +local_date,battery_daily_maxconsumptionrate,battery_daily_countdischarge,battery_daily_countcharge,battery_daily_avgconsumptionrate,battery_daily_sumdurationdischarge,battery_daily_sumdurationcharge diff --git a/tests/data/processed/test04/battery_deltas.csv b/tests/data/processed/test04/battery_deltas.csv new file mode 100644 index 00000000..a3714a6e --- /dev/null +++ b/tests/data/processed/test04/battery_deltas.csv @@ -0,0 +1 @@ +"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment" diff --git a/tests/data/processed/test04/battery_evening.csv b/tests/data/processed/test04/battery_evening.csv new file mode 100644 index 00000000..5dd6b96b --- /dev/null +++ b/tests/data/processed/test04/battery_evening.csv @@ -0,0 +1 @@ +local_date,battery_evening_sumdurationdischarge,battery_evening_sumdurationcharge,battery_evening_maxconsumptionrate,battery_evening_avgconsumptionrate,battery_evening_countdischarge,battery_evening_countcharge diff --git a/tests/data/processed/test04/battery_morning.csv b/tests/data/processed/test04/battery_morning.csv new file mode 100644 index 00000000..23a19699 --- /dev/null +++ b/tests/data/processed/test04/battery_morning.csv @@ -0,0 +1 @@ +local_date,battery_morning_countcharge,battery_morning_avgconsumptionrate,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_maxconsumptionrate,battery_morning_sumdurationcharge diff --git a/tests/data/processed/test04/battery_night.csv b/tests/data/processed/test04/battery_night.csv new file mode 100644 index 00000000..c9bb058a --- /dev/null +++ b/tests/data/processed/test04/battery_night.csv @@ -0,0 +1 @@ +local_date,battery_night_countdischarge,battery_night_maxconsumptionrate,battery_night_sumdurationdischarge,battery_night_countcharge,battery_night_sumdurationcharge,battery_night_avgconsumptionrate diff --git a/tests/data/raw/test01/battery_raw.csv b/tests/data/raw/test01/battery_raw.csv index ec0cb2b4..b9a6d337 100644 --- a/tests/data/raw/test01/battery_raw.csv +++ b/tests/data/raw/test01/battery_raw.csv @@ -13,7 +13,7 @@ timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,b 1593597450123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,80,100,4170,23,0,2,Li-ion 1593597589435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,79,100,4094,23,0,2,Li-ion - + 1593597739321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,78,100,4157,23,0,2,Li-ion 1593597872456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,77,100,4157,23,0,2,Li-ion @@ -33,7 +33,7 @@ timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,b 1593619168435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,63,100,4094,23,0,2,Li-ion 1593619477679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,64,100,4157,23,0,2,Li-ion -1593619687 876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,65,100,4157,23,0,2,Li-ion +1593619687876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,65,100,4157,23,0,2,Li-ion 1593625927416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,64,100,4170,23,0,2,Li-ion 1593626099435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,63,100,4094,23,0,2,Li-ion @@ -43,15 +43,15 @@ timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,b 1593630629603,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,4,77,100,4157,23,0,2,Li-ion 1593634407416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,60,100,4170,23,0,2,Li-ion -1593634497435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,61,100,4094,23,0,2,Li-ion -1593634567679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,62,100,4157,23,0,2,Li-ion -1593634723876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,63,100,4157,23,0,2,Li-ion +1593634677435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,61,100,4094,23,0,2,Li-ion +1593634887679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,62,100,4157,23,0,2,Li-ion +1593635087876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,63,100,4157,23,0,2,Li-ion -1593640683123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,60,100,4170,23,0,2,Li-ion -1593640793435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,59,100,4094,23,0,2,Li-ion +1593640563123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,60,100,4170,23,0,2,Li-ion +1593640781435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,59,100,4094,23,0,2,Li-ion -1593640853321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,58,100,4157,23,0,2,Li-ion -1593640983456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,57,100,4157,23,0,2,Li-ion +1593641054321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,58,100,4157,23,0,2,Li-ion +1593641244456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,57,100,4157,23,0,2,Li-ion 1593648183416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,72,100,4170,23,0,2,Li-ion 1593648312435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,73,100,4094,23,0,2,Li-ion @@ -63,4 +63,4 @@ timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,b 1593653404416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,74,100,4170,23,0,2,Li-ion 1593653534435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,73,100,4094,23,0,2,Li-ion 1593653723679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,72,100,4157,23,0,2,Li-ion -1593653867876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,71,100,4157,23,0,2,Li-ion +1593653867876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3,71,100,4157,23,0,2,Li-ion \ No newline at end of file diff --git a/tests/data/raw/test02/battery_raw.csv b/tests/data/raw/test02/battery_raw.csv new file mode 100644 index 00000000..c3d965dd --- /dev/null +++ b/tests/data/raw/test02/battery_raw.csv @@ -0,0 +1,58 @@ +timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,battery_temperature,battery_adaptor,battery_health,battery_technology +1593576490416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,80,100,4170,23,0,2,Li-ion +1593576683435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,79,100,4094,23,0,2,Li-ion +1593576930630,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,78,100,4157,23,0,2,Li-ion +1593577058603,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,77,100,4157,23,0,2,Li-ion + +1593588030416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,77,100,4170,23,0,2,Li-ion +1593588230435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,78,100,4094,23,0,2,Li-ion +1593588635630,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,79,100,4157,23,0,2,Li-ion +1593588635876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,80,100,4157,23,0,2,Li-ion + +1593597450123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,80,100,4170,23,0,2,Li-ion +1593597589435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,79,100,4094,23,0,2,Li-ion + +1593597739321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,78,100,4157,23,0,2,Li-ion +1593597872456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,77,100,4157,23,0,2,Li-ion + +1593605072416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,72,100,4170,23,0,2,Li-ion +1593605232435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,73,100,4094,23,0,2,Li-ion +1593605392679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,74,100,4157,23,0,2,Li-ion +1593605587876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,75,100,4157,23,0,2,Li-ion + +1593613397416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,74,100,4170,23,0,2,Li-ion +1593613583435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,73,100,4094,23,0,2,Li-ion +1593613783679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,72,100,4157,23,0,2,Li-ion +1593614058876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,71,100,4157,23,0,2,Li-ion + +1593618958416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,62,100,4170,23,0,2,Li-ion +1593619168435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,63,100,4094,23,0,2,Li-ion + +1593619477679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,64,100,4157,23,0,2,Li-ion +1593619687876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,65,100,4157,23,0,2,Li-ion + +1593625927416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,64,100,4170,23,0,2,Li-ion +1593626099435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,63,100,4094,23,0,2,Li-ion +1593626229679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,62,100,4157,23,0,2,Li-ion +1593626419876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,61,100,4157,23,0,2,Li-ion + +1593634407416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,60,100,4170,23,0,2,Li-ion +1593634677435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,61,100,4094,23,0,2,Li-ion +1593634887679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,62,100,4157,23,0,2,Li-ion +1593635087876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,63,100,4157,23,0,2,Li-ion + +1593640563123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,60,100,4170,23,0,2,Li-ion +1593640781435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,59,100,4094,23,0,2,Li-ion + +1593641054321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,58,100,4157,23,0,2,Li-ion +1593641244456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,57,100,4157,23,0,2,Li-ion + +1593648183416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,72,100,4170,23,0,2,Li-ion +1593648312435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,73,100,4094,23,0,2,Li-ion +1593648444679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,74,100,4157,23,0,2,Li-ion +1593648634876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,75,100,4157,23,0,2,Li-ion + +1593653404416,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,74,100,4170,23,0,2,Li-ion +1593653534435,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,73,100,4094,23,0,2,Li-ion +1593653723679,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,72,100,4157,23,0,2,Li-ion +1593653867876,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,71,100,4157,23,0,2,Li-ion diff --git a/tests/data/raw/test03/battery_raw.csv b/tests/data/raw/test03/battery_raw.csv new file mode 100644 index 00000000..7e8b84a4 --- /dev/null +++ b/tests/data/raw/test03/battery_raw.csv @@ -0,0 +1 @@ +timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,battery_temperature,battery_adaptor,battery_health,battery_technology \ No newline at end of file diff --git a/tests/data/raw/test04/battery_raw.csv b/tests/data/raw/test04/battery_raw.csv new file mode 100644 index 00000000..7e8b84a4 --- /dev/null +++ b/tests/data/raw/test04/battery_raw.csv @@ -0,0 +1 @@ +timestamp,device_id,battery_status,battery_level,battery_scale,battery_voltage,battery_temperature,battery_adaptor,battery_health,battery_technology \ No newline at end of file diff --git a/tests/settings/config.yaml b/tests/settings/config.yaml index 77f16f19..e46e3e56 100644 --- a/tests/settings/config.yaml +++ b/tests/settings/config.yaml @@ -2,4 +2,4 @@ directory: ./ configfile: ./tests/settings/testing_config.yaml snakefile: ./tests/Snakefile cores: 1 -forcerun: [messages_features, call_features, screen_features] \ No newline at end of file +forcerun: [messages_features, call_features, screen_features, battery_features] diff --git a/tests/settings/testing_config.yaml b/tests/settings/testing_config.yaml index f1fc17f2..12eb03b6 100644 --- a/tests/settings/testing_config.yaml +++ b/tests/settings/testing_config.yaml @@ -1,9 +1,10 @@ # Add as many sensor tables as you have, they all improve the computation of PHONE_SENSED_BINS. # If you are extracting screen or Barnett's location features, screen and locations tables are mandatory. -TABLES_FOR_SENSED_BINS: [messages, calls, screen] +TABLES_FOR_SENSED_BINS: [messages, calls, screen, battery] # Participants to include in the analysis # You must create a file for each participant named pXXX containing their device_id. This can be done manually or automatically +# PIDS: [test01, test02, test03, test04] PIDS: [test01, test02, test03, test04] @@ -32,7 +33,6 @@ CALLS: outgoing: [count, distinctcontacts, meanduration, sumduration, minduration, maxduration, stdduration, modeduration, entropyduration, timefirstcall, timelastcall, countmostfrequentcontact] DAY_SEGMENTS: *day_segments - SCREEN: COMPUTE: True DB_TABLE: screen @@ -40,3 +40,9 @@ SCREEN: REFERENCE_HOUR_FIRST_USE: 0 FEATURES_DELTAS: ["countepisode", "episodepersensedminutes", "sumduration", "maxduration", "minduration", "avgduration", "stdduration", "firstuseafter"] EPISODE_TYPES: ["unlock"] + +BATTERY: + COMPUTE: True + DB_TABLE: battery + DAY_SEGMENTS: *day_segments + FEATURES: ["countdischarge", "sumdurationdischarge", "countcharge", "sumdurationcharge", "avgconsumptionrate", "maxconsumptionrate"]