Minor structure changes for frequnecy testing
parent
bccc9a0697
commit
2a752b6aa7
|
@ -0,0 +1,4 @@
|
|||
tOmCKs02-4GfR-G5I6-7iKL-wYESbVwIMBun
|
||||
android
|
||||
test05 android
|
||||
2020/01/01,2020/06/01
|
|
@ -0,0 +1,4 @@
|
|||
3jAbRIXO-xKTC-0bhC-PZXC-7yKzcQm4sf5w
|
||||
ios
|
||||
test06 ios
|
||||
2020/01/01,2020/06/01
|
|
@ -1,14 +0,0 @@
|
|||
"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
|
||||
"thirtyminutes0000#2020-07-02#00:00:00#2020-07-02#00:29:59","thirtyminutes0000","2020-07-02","00:00:00","2020-07-02","00:29:59",1,1,1
|
||||
"thirtyminutes0001#2020-07-02#00:30:00#2020-07-02#00:59:59","thirtyminutes0001","2020-07-02","00:30:00","2020-07-02","00:59:59",1,1,1
|
||||
"thirtyminutes0007#2020-07-02#03:30:00#2020-07-02#03:59:59","thirtyminutes0007","2020-07-02","03:30:00","2020-07-02","03:59:59",1,1,1
|
||||
"thirtyminutes0011#2020-07-02#05:30:00#2020-07-02#05:59:59","thirtyminutes0011","2020-07-02","05:30:00","2020-07-02","05:59:59",1,1,1
|
||||
"thirtyminutes0012#2020-07-02#06:00:00#2020-07-02#06:29:59","thirtyminutes0012","2020-07-02","06:00:00","2020-07-02","06:29:59",1,1,1
|
||||
"thirtyminutes0014#2020-07-02#07:00:00#2020-07-02#07:29:59","thirtyminutes0014","2020-07-02","07:00:00","2020-07-02","07:29:59",1,1,1
|
||||
"thirtyminutes0023#2020-07-02#11:30:00#2020-07-02#11:59:59","thirtyminutes0023","2020-07-02","11:30:00","2020-07-02","11:59:59",1,1,1
|
||||
"thirtyminutes0024#2020-07-02#12:00:00#2020-07-02#12:29:59","thirtyminutes0024","2020-07-02","12:00:00","2020-07-02","12:29:59",1,1,1
|
||||
"thirtyminutes0035#2020-07-02#17:30:00#2020-07-02#17:59:59","thirtyminutes0035","2020-07-02","17:30:00","2020-07-02","17:59:59",1,1,1
|
||||
"thirtyminutes0036#2020-07-02#18:00:00#2020-07-02#18:29:59","thirtyminutes0036","2020-07-02","18:00:00","2020-07-02","18:29:59",1,1,1
|
||||
"thirtyminutes0039#2020-07-02#19:30:00#2020-07-02#19:59:59","thirtyminutes0039","2020-07-02","19:30:00","2020-07-02","19:59:59",1,1,1
|
||||
"thirtyminutes0042#2020-07-02#21:00:00#2020-07-02#21:29:59","thirtyminutes0042","2020-07-02","21:00:00","2020-07-02","21:29:59",1,1,1
|
||||
"thirtyminutes0047#2020-07-02#23:30:00#2020-07-02#23:59:59","thirtyminutes0047","2020-07-02","23:30:00","2020-07-02","23:59:59",2,2,1
|
|
|
@ -1,14 +0,0 @@
|
|||
"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
|
||||
"thirtyminutes0000#2020-07-02#00:00:00#2020-07-02#00:29:59","thirtyminutes0000","2020-07-02","00:00:00","2020-07-02","00:29:59",1,1,1
|
||||
"thirtyminutes0001#2020-07-02#00:30:00#2020-07-02#00:59:59","thirtyminutes0001","2020-07-02","00:30:00","2020-07-02","00:59:59",1,1,1
|
||||
"thirtyminutes0007#2020-07-02#03:30:00#2020-07-02#03:59:59","thirtyminutes0007","2020-07-02","03:30:00","2020-07-02","03:59:59",1,1,1
|
||||
"thirtyminutes0011#2020-07-02#05:30:00#2020-07-02#05:59:59","thirtyminutes0011","2020-07-02","05:30:00","2020-07-02","05:59:59",1,1,1
|
||||
"thirtyminutes0012#2020-07-02#06:00:00#2020-07-02#06:29:59","thirtyminutes0012","2020-07-02","06:00:00","2020-07-02","06:29:59",1,1,1
|
||||
"thirtyminutes0014#2020-07-02#07:00:00#2020-07-02#07:29:59","thirtyminutes0014","2020-07-02","07:00:00","2020-07-02","07:29:59",1,1,1
|
||||
"thirtyminutes0023#2020-07-02#11:30:00#2020-07-02#11:59:59","thirtyminutes0023","2020-07-02","11:30:00","2020-07-02","11:59:59",1,1,1
|
||||
"thirtyminutes0024#2020-07-02#12:00:00#2020-07-02#12:29:59","thirtyminutes0024","2020-07-02","12:00:00","2020-07-02","12:29:59",1,1,1
|
||||
"thirtyminutes0035#2020-07-02#17:30:00#2020-07-02#17:59:59","thirtyminutes0035","2020-07-02","17:30:00","2020-07-02","17:59:59",1,1,1
|
||||
"thirtyminutes0036#2020-07-02#18:00:00#2020-07-02#18:29:59","thirtyminutes0036","2020-07-02","18:00:00","2020-07-02","18:29:59",1,1,1
|
||||
"thirtyminutes0039#2020-07-02#19:30:00#2020-07-02#19:59:59","thirtyminutes0039","2020-07-02","19:30:00","2020-07-02","19:59:59",1,1,1
|
||||
"thirtyminutes0042#2020-07-02#21:00:00#2020-07-02#21:29:59","thirtyminutes0042","2020-07-02","21:00:00","2020-07-02","21:29:59",1,1,1
|
||||
"thirtyminutes0047#2020-07-02#23:30:00#2020-07-02#23:59:59","thirtyminutes0047","2020-07-02","23:30:00","2020-07-02","23:59:59",2,1,2
|
|
|
@ -0,0 +1,14 @@
|
|||
"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
|
||||
"thirtyminutes0000#2020-07-02 00:00:00,2020-07-02 00:29:59","thirtyminutes0000","2020-07-02 00:00:00","2020-07-02 00:29:59",1,1,1
|
||||
"thirtyminutes0001#2020-07-02 00:30:00,2020-07-02 00:59:59","thirtyminutes0001","2020-07-02 00:30:00","2020-07-02 00:59:59",1,1,1
|
||||
"thirtyminutes0007#2020-07-02 03:30:00,2020-07-02 03:59:59","thirtyminutes0007","2020-07-02 03:30:00","2020-07-02 03:59:59",1,1,1
|
||||
"thirtyminutes0011#2020-07-02 05:30:00,2020-07-02 05:59:59","thirtyminutes0011","2020-07-02 05:30:00","2020-07-02 05:59:59",1,1,1
|
||||
"thirtyminutes0012#2020-07-02 06:00:00,2020-07-02 06:29:59","thirtyminutes0012","2020-07-02 06:00:00","2020-07-02 06:29:59",1,1,1
|
||||
"thirtyminutes0014#2020-07-02 07:00:00,2020-07-02 07:29:59","thirtyminutes0014","2020-07-02 07:00:00","2020-07-02 07:29:59",1,1,1
|
||||
"thirtyminutes0023#2020-07-02 11:30:00,2020-07-02 11:59:59","thirtyminutes0023","2020-07-02 11:30:00","2020-07-02 11:59:59",1,1,1
|
||||
"thirtyminutes0024#2020-07-02 12:00:00,2020-07-02 12:29:59","thirtyminutes0024","2020-07-02 12:00:00","2020-07-02 12:29:59",1,1,1
|
||||
"thirtyminutes0035#2020-07-02 17:30:00,2020-07-02 17:59:59","thirtyminutes0035","2020-07-02 17:30:00","2020-07-02 17:59:59",1,1,1
|
||||
"thirtyminutes0036#2020-07-02 18:00:00,2020-07-02 18:29:59","thirtyminutes0036","2020-07-02 18:00:00","2020-07-02 18:29:59",1,1,1
|
||||
"thirtyminutes0039#2020-07-02 19:30:00,2020-07-02 19:59:59","thirtyminutes0039","2020-07-02 19:30:00","2020-07-02 19:59:59",1,1,1
|
||||
"thirtyminutes0042#2020-07-02 21:00:00,2020-07-02 21:29:59","thirtyminutes0042","2020-07-02 21:00:00","2020-07-02 21:29:59",1,1,1
|
||||
"thirtyminutes0047#2020-07-02 23:30:00,2020-07-02 23:59:59","thirtyminutes0047","2020-07-02 23:30:00","2020-07-02 23:59:59",2,2,1
|
|
|
@ -0,0 +1,14 @@
|
|||
"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
|
||||
"thirtyminutes0000#2020-07-02 00:00:00,2020-07-02 00:29:59","thirtyminutes0000","2020-07-02 00:00:00","2020-07-02 00:29:59",1,1,1
|
||||
"thirtyminutes0001#2020-07-02 00:30:00,2020-07-02 00:59:59","thirtyminutes0001","2020-07-02 00:30:00","2020-07-02 00:59:59",1,1,1
|
||||
"thirtyminutes0007#2020-07-02 03:30:00,2020-07-02 03:59:59","thirtyminutes0007","2020-07-02 03:30:00","2020-07-02 03:59:59",1,1,1
|
||||
"thirtyminutes0011#2020-07-02 05:30:00,2020-07-02 05:59:59","thirtyminutes0011","2020-07-02 05:30:00","2020-07-02 05:59:59",1,1,1
|
||||
"thirtyminutes0012#2020-07-02 06:00:00,2020-07-02 06:29:59","thirtyminutes0012","2020-07-02 06:00:00","2020-07-02 06:29:59",1,1,1
|
||||
"thirtyminutes0014#2020-07-02 07:00:00,2020-07-02 07:29:59","thirtyminutes0014","2020-07-02 07:00:00","2020-07-02 07:29:59",1,1,1
|
||||
"thirtyminutes0023#2020-07-02 11:30:00,2020-07-02 11:59:59","thirtyminutes0023","2020-07-02 11:30:00","2020-07-02 11:59:59",1,1,1
|
||||
"thirtyminutes0024#2020-07-02 12:00:00,2020-07-02 12:29:59","thirtyminutes0024","2020-07-02 12:00:00","2020-07-02 12:29:59",1,1,1
|
||||
"thirtyminutes0035#2020-07-02 17:30:00,2020-07-02 17:59:59","thirtyminutes0035","2020-07-02 17:30:00","2020-07-02 17:59:59",1,1,1
|
||||
"thirtyminutes0036#2020-07-02 18:00:00,2020-07-02 18:29:59","thirtyminutes0036","2020-07-02 18:00:00","2020-07-02 18:29:59",1,1,1
|
||||
"thirtyminutes0039#2020-07-02 19:30:00,2020-07-02 19:59:59","thirtyminutes0039","2020-07-02 19:30:00","2020-07-02 19:59:59",1,1,1
|
||||
"thirtyminutes0042#2020-07-02 21:00:00,2020-07-02 21:29:59","thirtyminutes0042","2020-07-02 21:00:00","2020-07-02 21:29:59",1,1,1
|
||||
"thirtyminutes0047#2020-07-02 23:30:00,2020-07-02 23:59:59","thirtyminutes0047","2020-07-02 23:30:00","2020-07-02 23:59:59",2,1,2
|
|
|
@ -0,0 +1,15 @@
|
|||
timestamp,device_id,bt_address,bt_name,bt_rssi,label
|
||||
1593684000123,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,A6:93:AF:8C:36,Phone,-92,1593684000123
|
||||
1593705599321,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,A6:93:AF:8C:36,Phone,-79,1593684000123
|
||||
1593687638456,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,7E:D1:4E:80:2B,,-96,1593684000123
|
||||
1593705600654,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,7E:D1:4E:80:2B,,-92,1593705600654
|
||||
1593727199546,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,4B:2C:AA:88:1B,Smart TV,-95,1593705600654
|
||||
1593727200564,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,F5:F6:EC:8D:6C,Laptop,-88,1593727200564
|
||||
1593748799465,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,A6:93:AF:8C:36,Phone,-91,1593727200564
|
||||
1593738619645,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,10:6F:61:E4:A9,Speakers,-90,1593727200564
|
||||
1593747525789,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,7E:D1:4E:80:2B,,-84,1593727200564
|
||||
1593733518987,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,A6:93:AF:8C:36,Phone,-78,1593727200564
|
||||
1593662400798,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,7E:D1:4E:80:2B,,-76,1593662400798
|
||||
1593683999978,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,F5:F6:EC:8D:6C,Laptop,-97,1593662400798
|
||||
1593675299879,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,10:6F:61:E4:A9,Speakers,-93,1593662400798
|
||||
1593665344132,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,4B:2C:AA:88:1B,Smart TV,-94,1593662400798
|
|
|
@ -0,0 +1,15 @@
|
|||
timestamp,device_id,bt_address,bt_name,bt_rssi,label
|
||||
1593684000123,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,qaRo3mcQ-m0aJ-awAa-ACT9-6HcxDD26tsxe,Phone,-99,1593684000123
|
||||
1593705599132,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,ed0moSsY-5Qzi-4kDS-tAyj-eiTUK3LmEG9S,Laptop,-87,1593684000123
|
||||
1593687638321,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,R3cS8NPr-f43b-sIKF-fEjr-oRHjMuwzYX1V,Smart TV,-89,1593684000123
|
||||
1593705600312,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,R3cS8NPr-f43b-sIKF-fEjr-oRHjMuwzYX1V,Smart TV,-96,1593705600312
|
||||
1593727199456,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,ed0moSsY-5Qzi-4kDS-tAyj-eiTUK3LmEG9S,Laptop,-82,1593705600312
|
||||
1593727200465,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,skYoi2Iy-Hk69-45Ss-mMEc-mdSt0Xi4iwA5,,-79,1593727200465
|
||||
1593748799546,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,R3cS8NPr-f43b-sIKF-fEjr-oRHjMuwzYX1V,Smart TV,-88,1593662400789
|
||||
1593738619564,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,R3cS8NPr-f43b-sIKF-fEjr-oRHjMuwzYX1V,Smart TV,-97,1593662400789
|
||||
1593747525654,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,R3cS8NPr-f43b-sIKF-fEjr-oRHjMuwzYX1V,Smart TV,-82,1593662400789
|
||||
1593733518645,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,ed0moSsY-5Qzi-4kDS-tAyj-eiTUK3LmEG9S,Laptop,-98,1593662400789
|
||||
1593662400789,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,skYoi2Iy-Hk69-45Ss-mMEc-mdSt0Xi4iwA5,,-84,1593662400789
|
||||
1593683999798,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,skYoi2Iy-Hk69-45Ss-mMEc-mdSt0Xi4iwA5,,-99,1593662400789
|
||||
1593675299879,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,An2oCwIE-LOSJ-teZQ-Bjls-VTgbq1wmTA1e,Speakers,-81,1593662400789
|
||||
1593665344987,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,An2oCwIE-LOSJ-teZQ-Bjls-VTgbq1wmTA1e,Speakers,-96,1593662400789
|
|
|
@ -70,8 +70,8 @@ echo Disabling downloading of dataset...
|
|||
sed -e '27,39 s/^/#/' -e 's/rules.download_dataset.output/"data\/raw\/\{pid\}\/\{sensor\}_raw\.csv"/' rules/preprocessing.smk > tmp
|
||||
mv tmp rules/preprocessing.smk
|
||||
|
||||
echo $1
|
||||
echo $2
|
||||
#echo $1
|
||||
#echo $2
|
||||
|
||||
if [ $# -eq 1 ]
|
||||
then
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# 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: [test03, test04,test05, test06]
|
||||
|
||||
# Global var with common day segments
|
||||
DAY_SEGMENTS: &day_segments
|
||||
|
|
Loading…
Reference in New Issue