ce04394679
Merge commit 'c05b047c2d9452151553961928c846c01d7395bc'
2022-06-25 20:06:24 +02:00
c05b047c2d
Correct outstanding baseline feature mistake.
2022-04-13 17:05:16 +02:00
53ec52a954
Disable (SOME) feature cleaning for ESM data.
2022-04-13 16:01:31 +02:00
144f0d0dcf
Account for missing baseline data.
2022-04-13 14:56:28 +02:00
ed5314aa98
Merge remote-tracking branch 'origin/master'
2022-04-12 17:27:25 +02:00
11c64cfc1a
Include all participants again.
2022-04-12 17:20:19 +02:00
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
9f5edf1c2b
Revert "Add a rule for model baselines."
...
The example was for a classification rather than regression problem.
This reverts commit 9ab0c8f289
2022-04-12 16:59:42 +02:00
4ad261fae5
Rename baseline features AGAIN.
...
Correct other mistakes.
2022-04-12 16:55:01 +02:00
9ab0c8f289
Add a rule for model baselines.
...
Add baselines and helper functions to main models dir.
2022-04-12 14:23:58 +02:00
570d2eb656
Add the file for population model to Snakefile.
2022-04-12 14:11:40 +02:00
f5688f6154
Add a rule to merge sensor and baseline features.
...
And select target as before.
2022-04-08 15:42:04 +02:00
b1f356c3f7
Extract a function to be used elsewhere.
2022-04-08 15:36:32 +02:00
7ff3dcf5fc
Move and rename target variable.
2022-04-06 18:21:09 +02:00
50c0defca7
Select target columns (no parsing necessary).
2022-04-06 18:16:49 +02:00
ac86221662
[WIP] Add a rule to parse targets.
...
Does nothing for now.
2022-04-06 17:47:03 +02:00
baa94c4c4e
Correct additional error in feature file naming.
...
Add the final feature file to the list in Snakefile.
2022-04-06 17:29:17 +02:00
d2fbef5234
Merge branch 'labels' of https://repo.ijs.si/junoslukan/rapids into labels
...
# Conflicts:
# src/features/phone_esm/straw/preprocess.py
2022-04-05 19:28:37 +02:00
d326a1b09d
Include the constant directly in main.py.
2022-04-05 19:08:43 +02:00
2e545e81f0
Include feature calculations for different scales.
2022-04-05 19:05:34 +02:00
cbc8ae4e03
Add necessary checks for empty data frames.
2022-04-05 18:58:09 +02:00
f50a13167e
Add feature files back to Snakefile.
2022-04-05 18:37:58 +02:00
e84c35a36a
Remove unnecessary parameters from preprocess_esm.
...
And correct the newly named interim file.
2022-04-05 18:36:09 +02:00
e2ce68f591
Defer creation of feature files to esm_features rule.
2022-04-05 18:30:04 +02:00
751b04f3f4
Pass scale names to Snakemake correctly.
2022-04-05 18:14:37 +02:00
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
ed298a9479
Implement the basic feature extraction steps.
2022-04-05 15:46:02 +02:00
798ec973b4
[WIP] Add a rule for ESM features.
2022-03-30 10:43:30 +02:00
3af8de6235
Create feature provider script.
2022-03-30 10:40:53 +02:00
7173ca13e3
Rename a parameter.
2022-03-30 10:40:53 +02:00
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
b18dba366e
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-16 18:59:29 +01:00
916bb21a53
Merge branch 'labels' into run_test_participant
2022-03-16 18:56:00 +01:00
c6144f8403
Reverse JCQ items.
2022-03-16 18:55:46 +01:00
fec7cc9550
Merge branch 'labels' into run_test_participant
2022-03-16 18:30:03 +01:00
23f0aaba3a
Get the name of the questionnaire from Snakefile.
2022-03-16 18:28:57 +01:00
8ed7d23348
Merge branch 'labels' into run_test_participant
2022-03-16 17:56:07 +01:00
679f00dc19
Enable selecting any questionnaire as target.
2022-03-16 17:55:44 +01:00
1374eda171
Flatten questionnaire ID dict.
2022-03-16 17:38:09 +01:00
3e9cdde66e
Merge branch 'master' into run_test_participant
2022-03-16 17:27:50 +01:00
155395512c
Merge branch 'labels' into run_test_participant
2022-03-16 17:09:53 +01:00
cb116100dd
Move preprocessing to features.
2022-03-16 17:06:42 +01:00
19b9da0ba3
Separate function definitions from main.
2022-03-16 16:49:28 +01:00
83a8bb6689
Add an option to disable calculation of baseline features.
2022-03-16 15:51:12 +01:00
ef57103bac
Add questionnaire ID key.
2022-03-15 13:41:33 +01:00
5f293211a7
Reformat.
2022-03-15 13:28:51 +01:00
d470eef27e
Add a rule to preprocess and clean ESM.
2022-03-09 18:38:46 +01:00
b09522a8af
Merge branch 'labels' into run_test_participant
2022-03-09 17:58:44 +01:00
d4a4bbbff0
Remove unused columns.
2022-03-09 17:58:36 +01:00
085a6d144b
Add files to compute and create an empty script.
2022-03-09 17:32:02 +01:00
junos