From e84c35a36a5485155fc11f3b3483f183bfa4b286 Mon Sep 17 00:00:00 2001 From: junos Date: Tue, 5 Apr 2022 18:35:25 +0200 Subject: [PATCH] Remove unnecessary parameters from preprocess_esm. And correct the newly named interim file. --- Snakefile | 2 +- rules/features.smk | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Snakefile b/Snakefile index c714259e..f60483e3 100644 --- a/Snakefile +++ b/Snakefile @@ -168,7 +168,7 @@ 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"])) files_to_compute.extend(expand("data/raw/{pid}/phone_esm_with_datetime.csv",pid=config["PIDS"])) - files_to_compute.extend(expand("data/interim/{pid}/phone_esm_features/phone_esm_clean_{provider_key}.csv",pid=config["PIDS"],provider_key=provider.lower())) + files_to_compute.extend(expand("data/interim/{pid}/phone_esm_clean.csv",pid=config["PIDS"],provider_key=provider.lower())) #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") diff --git a/rules/features.smk b/rules/features.smk index 5e349f1a..6c4a6b5d 100644 --- a/rules/features.smk +++ b/rules/features.smk @@ -327,10 +327,7 @@ rule conversation_r_features: rule preprocess_esm: input: "data/raw/{pid}/phone_esm_with_datetime.csv" params: - provider=lambda wildcards: config["PHONE_ESM"]["PROVIDERS"][wildcards.provider_key.upper()], - provider_key="{provider_key}", - sensor_key="phone_esm", - scales=lambda wildcards: config["PHONE_ESM"]["PROVIDERS"][wildcards.provider_key.upper()]["SCALES"] + scales=lambda wildcards: config["PHONE_ESM"]["PROVIDERS"]["STRAW"]["SCALES"] output: "data/interim/{pid}/phone_esm_clean.csv" script: "../src/features/phone_esm/straw/preprocess.py"