From e2ce68f59159426e227a8a2a742effe6f385238d Mon Sep 17 00:00:00 2001 From: junos Date: Tue, 5 Apr 2022 18:30:04 +0200 Subject: [PATCH] Defer creation of feature files to esm_features rule. --- rules/features.smk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rules/features.smk b/rules/features.smk index c27db7e8..5e349f1a 100644 --- a/rules/features.smk +++ b/rules/features.smk @@ -331,18 +331,20 @@ rule preprocess_esm: provider_key="{provider_key}", sensor_key="phone_esm", scales=lambda wildcards: config["PHONE_ESM"]["PROVIDERS"][wildcards.provider_key.upper()]["SCALES"] - output: "data/interim/{pid}/phone_esm_features/phone_esm_clean_{provider_key}.csv" + output: "data/interim/{pid}/phone_esm_clean.csv" script: "../src/features/phone_esm/straw/preprocess.py" rule esm_features: input: - sensor_data = "data/interim/{pid}/phone_esm_{feature}_clean.csv", + sensor_data = "data/interim/{pid}/phone_esm_clean.csv", time_segments_labels = "data/interim/time_segments/{pid}_time_segments_labels.csv" params: + provider = lambda wildcards: config["PHONE_ESM"]["PROVIDERS"][wildcards.provider_key.upper()], + provider_key = "{provider_key}", sensor_key = "phone_esm", - questionnaire_name = "{feature}" - output: "data/processed/{pid}/phone_esm_{feature}_features.csv" + scales=lambda wildcards: config["PHONE_ESM"]["PROVIDERS"][wildcards.provider_key.upper()]["SCALES"] + output: "data/interim/{pid}/phone_esm_features/phone_esm_clean_{provider_key}.csv" script: "../src/features/entry.R"