junos
c05b047c2d
Correct outstanding baseline feature mistake.
2022-04-13 17:05:16 +02:00
junos
53ec52a954
Disable (SOME) feature cleaning for ESM data.
2022-04-13 16:01:31 +02:00
junos
144f0d0dcf
Account for missing baseline data.
2022-04-13 14:56:28 +02:00
junos
ed5314aa98
Merge remote-tracking branch 'origin/master'
2022-04-12 17:27:25 +02:00
junos
a6a37c7bd9
Drop NaN targets.
...
This mirrors INNER join in merge_features_and_targets_for_individual_model.py:
data = pd.concat([sensor_features, targets[["target"]]], axis=1, join="inner")
2022-04-12 17:01:49 +02:00
junos
9f5edf1c2b
Revert "Add a rule for model baselines."
...
The example was for a classification rather than regression problem.
This reverts commit 9ab0c8f289
.
# Conflicts:
# rules/models.smk
2022-04-12 16:59:42 +02:00
junos
4ad261fae5
Rename baseline features AGAIN.
...
Correct other mistakes.
2022-04-12 16:55:01 +02:00
junos
9ab0c8f289
Add a rule for model baselines.
...
Add baselines and helper functions to main models dir.
2022-04-12 14:23:58 +02:00
junos
f5688f6154
Add a rule to merge sensor and baseline features.
...
And select target as before.
2022-04-08 15:42:04 +02:00
junos
b1f356c3f7
Extract a function to be used elsewhere.
2022-04-08 15:36:32 +02:00
junos
7ff3dcf5fc
Move and rename target variable.
2022-04-06 18:21:09 +02:00
junos
50c0defca7
Select target columns (no parsing necessary).
2022-04-06 18:16:49 +02:00
junos
ac86221662
[WIP] Add a rule to parse targets.
...
Does nothing for now.
2022-04-06 17:47:03 +02:00
junos
d326a1b09d
Include the constant directly in main.py.
2022-04-05 19:08:43 +02:00
junos
2e545e81f0
Include feature calculations for different scales.
2022-04-05 19:05:34 +02:00
junos
cbc8ae4e03
Add necessary checks for empty data frames.
2022-04-05 18:58:09 +02:00
junos
751b04f3f4
Pass scale names to Snakemake correctly.
2022-04-05 18:14:37 +02:00
junos
99245afca3
Try a different approach for preprocessing ESMs.
...
It is important that this follows generic RAPIDS pattern.
In the subsequent step of calculating features,
there is an expected file and folder structure of data/interim.
See rules/common.smk/find_features_files()
2022-04-05 18:02:31 +02:00
junos
ed298a9479
Implement the basic feature extraction steps.
2022-04-05 15:46:02 +02:00
junos
3af8de6235
Create feature provider script.
2022-03-30 10:40:53 +02:00
junos
9478dc94f2
Add an else.
...
This is to make sure that in case the reversing fails, we do not get any output items.
Snakemake will inform us of an error in this event.
2022-03-30 10:40:53 +02:00
junos
c6144f8403
Reverse JCQ items.
2022-03-16 18:55:46 +01:00
junos
23f0aaba3a
Get the name of the questionnaire from Snakefile.
2022-03-16 18:28:57 +01:00
junos
679f00dc19
Enable selecting any questionnaire as target.
2022-03-16 17:55:44 +01:00
junos
1374eda171
Flatten questionnaire ID dict.
2022-03-16 17:38:09 +01:00
junos
19b9da0ba3
Separate function definitions from main.
2022-03-16 16:49:28 +01:00
junos
ef57103bac
Add questionnaire ID key.
2022-03-15 13:41:33 +01:00
junos
5f293211a7
Reformat.
2022-03-15 13:28:51 +01:00
junos
d470eef27e
Add a rule to preprocess and clean ESM.
2022-03-09 18:38:46 +01:00
junos
d4a4bbbff0
Remove unused columns.
2022-03-09 17:58:36 +01:00
junos
085a6d144b
Add files to compute and create an empty script.
2022-03-09 17:32:02 +01:00
junos
42d62f16d0
Add RAPIDS mandatory columns for ESM.
2022-03-09 17:31:37 +01:00
junos
2bef86b1da
Add a format for ESM and add to config.
2022-03-08 15:43:25 +01:00
junos
d8e9a309f7
Rename features and write baseline_interim.
2022-03-08 15:10:36 +01:00
junos
a3a4f04ffe
Setting with : produces NaNs.
2022-03-01 12:02:57 +01:00
junos
aedb8b6785
Write questionnaire data to data/interim.
2022-03-01 12:02:36 +01:00
junos
b5a6317f4b
Calculate JCQ control and demand control ratio.
...
Include norms and corresponding quartile.
2022-02-28 18:51:47 +01:00
junos
2fed962644
Calculate JCQ demand score.
...
Hardcode question IDs to be reversed.
2022-02-28 18:30:41 +01:00
junos
30ac8b1cd5
Start calculating demand control features.
2022-02-23 19:08:10 +01:00
junos
9a74e74d08
Add the baseline features rule to snakefile.
...
Correct age calculation for a single value instead of dataframe.
2022-02-23 18:15:26 +01:00
junos
07da6be398
Add age, gender, and language as features.
...
Move calculation of age from merge_baseline_data.py to baseline_features.py.
2022-02-23 18:05:23 +01:00
junos
176367631b
Prepare baseline feature rule.
2022-02-23 11:09:33 +01:00
junos
bf9c764c97
Split baseline data to participants.
...
And some csv I/O settings.
2022-02-04 18:37:57 +01:00
junos
16e608db74
First merge baseline datasets.
2022-02-04 18:21:42 +01:00
junos
204f6f50b0
Read the relevant files.
2022-02-04 18:06:02 +01:00
junos
685ed6a546
Set up demographic data download.
2022-02-04 17:37:00 +01:00
Meng Li
463ac0a2aa
Fix bug#169 ( #174 )
2022-01-27 11:27:32 -05:00
Sam
10e896ca1d
Add data stream for AWARE Micro server ( #173 )
...
* Add data stream for AWARE Micro server
* Fix one documentation typo and one ommission
2022-01-27 10:47:50 -05:00
junos
afa3b8546f
Mutate data in an R script.
...
The Python script did not read the timestamp correctly for some reason. All timestamps were 0.
2022-01-26 16:34:19 +01:00
Sam
e5dbbfce44
Avoid NA problem in barnett location evaluation ( #172 )
...
* Avoid occasional issue where does_not_span evaluates to NA, which breaks the if()
* Restored original warning
2022-01-18 10:16:37 -05:00