From 7173ca13e389830badce56f4535a6516bd619c1d Mon Sep 17 00:00:00 2001
From: junos <junos.lukan@ijs.si>
Date: Tue, 29 Mar 2022 18:34:43 +0200
Subject: [PATCH] Rename a parameter.

---
 Snakefile          | 4 ++--
 config.yaml        | 2 +-
 rules/features.smk | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Snakefile b/Snakefile
index 3bcadff4..7923788c 100644
--- a/Snakefile
+++ b/Snakefile
@@ -168,8 +168,8 @@ 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"]))
-        for feature in config["PHONE_ESM"]["PROVIDERS"][provider]["FEATURES"]:
-            files_to_compute.extend(expand("data/interim/{pid}/phone_esm_{feature}_clean.csv",pid=config["PIDS"],feature=feature))
+        for scale in config["PHONE_ESM"]["PROVIDERS"][provider]["SCALES"]:
+            files_to_compute.extend(expand("data/interim/{pid}/phone_esm_{scale}_clean.csv",pid=config["PIDS"],scale=scale))
         #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/config.yaml b/config.yaml
index dd841530..77088c26 100644
--- a/config.yaml
+++ b/config.yaml
@@ -239,7 +239,7 @@ PHONE_ESM:
   PROVIDERS:
     STRAW:
       COMPUTE: True
-      FEATURES: ["PANAS_positive_affect", "PANAS_negative_affect", "JCQ_job_demand", "JCQ_job_control", "JCQ_supervisor_support", "JCQ_coworker_support"]
+      SCALES: ["PANAS_positive_affect", "PANAS_negative_affect", "JCQ_job_demand", "JCQ_job_control", "JCQ_supervisor_support", "JCQ_coworker_support"]
       SRC_SCRIPT: src/features/phone_esm/rapids/main.py
 
 # See https://www.rapids.science/latest/features/phone-keyboard/
diff --git a/rules/features.smk b/rules/features.smk
index f778eada..22add826 100644
--- a/rules/features.smk
+++ b/rules/features.smk
@@ -327,8 +327,8 @@ rule conversation_r_features:
 rule preprocess_esm:
     input: "data/raw/{pid}/phone_esm_with_datetime.csv"
     params:
-        questionnaire_name = "{feature}"
-    output: "data/interim/{pid}/phone_esm_{feature}_clean.csv"
+        questionnaire_name = "{scale}"
+    output: "data/interim/{pid}/phone_esm_{scale}_clean.csv"
     script:
         "../src/features/phone_esm/straw/preprocess.py"