Merge branch 'labels' into run_test_participant

labels
junos 2022-03-09 17:58:44 +01:00
commit b09522a8af
5 changed files with 18 additions and 7 deletions

View File

@ -164,6 +164,10 @@ for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():
files_to_compute.extend(expand("data/processed/features/{pid}/all_sensor_features.csv", pid=config["PIDS"])) files_to_compute.extend(expand("data/processed/features/{pid}/all_sensor_features.csv", pid=config["PIDS"]))
files_to_compute.append("data/processed/features/all_participants/all_sensor_features.csv") files_to_compute.append("data/processed/features/all_participants/all_sensor_features.csv")
for provider in config["PHONE_ESM"]["PROVIDERS"].keys():
if config["PHONE_ESM"]["PROVIDERS"][provider]["COMPUTE"]:
files_to_compute.extend(expand("data/raw/{pid}/phone_esm_raw.csv",pid=config["PIDS"]))
# We can delete these if's as soon as we add feature PROVIDERS to any of these sensors # We can delete these if's as soon as we add feature PROVIDERS to any of these sensors
if isinstance(config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"], dict): if isinstance(config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"], dict):
for provider in config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"].keys(): for provider in config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"].keys():

View File

@ -237,10 +237,10 @@ PHONE_DATA_YIELD:
PHONE_ESM: PHONE_ESM:
CONTAINER: esm CONTAINER: esm
PROVIDERS: PROVIDERS:
RAPIDS: STRAW:
COMPUTE: False COMPUTE: True
FEATURES: FEATURES:
SRC_SCRIPT: src/features/phone_keyboard/rapids/main.py SRC_SCRIPT: src/features/phone_esm/rapids/main.py
# See https://www.rapids.science/latest/features/phone-keyboard/ # See https://www.rapids.science/latest/features/phone-keyboard/
PHONE_KEYBOARD: PHONE_KEYBOARD:

View File

@ -186,17 +186,14 @@ PHONE_CONVERSATION:
PHONE_ESM: PHONE_ESM:
ANDROID: ANDROID:
RAPIDS_COLUMN_MAPPINGS: RAPIDS_COLUMN_MAPPINGS:
TIMESTAMP: timestamp TIMESTAMP: double_esm_user_answer_timestamp
DEVICE_ID: device_id DEVICE_ID: device_id
ESM_STATUS: esm_status ESM_STATUS: esm_status
ESM_USER_ANSWER: esm_user_answer ESM_USER_ANSWER: esm_user_answer
ESM_NOTIFICATION_TIMEOUT: esm_notification_timeout
ESM_JSON: esm_json ESM_JSON: esm_json
DOUBLE_ESM_USER_ANSWER_TIMESTAMP: double_esm_user_answer_timestamp
ESM_TRIGGER: esm_trigger ESM_TRIGGER: esm_trigger
ESM_SESSION: esm_session ESM_SESSION: esm_session
ESM_NOTIFICATION_ID: esm_notification_id ESM_NOTIFICATION_ID: esm_notification_id
ESM_EXPIRATION_THRESHOLD: esm_expiration_threshold
MUTATION: MUTATION:
COLUMN_MAPPINGS: COLUMN_MAPPINGS:
SCRIPTS: SCRIPTS:

View File

@ -67,6 +67,16 @@ PHONE_CONVERSATION:
- DOUBLE_CONVO_START - DOUBLE_CONVO_START
- DOUBLE_CONVO_END - DOUBLE_CONVO_END
PHONE_ESM:
- TIMESTAMP
- DEVICE_ID
- ESM_STATUS
- ESM_USER_ANSWER
- ESM_JSON
- ESM_TRIGGER
- ESM_SESSION
- ESM_NOTIFICATION_ID
PHONE_KEYBOARD: PHONE_KEYBOARD:
- TIMESTAMP - TIMESTAMP
- DEVICE_ID - DEVICE_ID