887fd7dc72
Merge branch 'empatica_calculating_features'
2022-07-06 11:53:21 +00:00
5a4696c548
Misc. changes
2022-07-06 11:30:18 +00:00
d2758eef46
Set not NaN sum insted of 0 sum for HRV features windows.
2022-07-06 07:36:35 +00:00
2d5d23b615
Testing files change and remove standardization from hrv sensors main files.
2022-07-06 07:35:39 +00:00
a5480f1369
Few changes during addition to file structure.
2022-07-04 13:00:47 +00:00
505c3a86b9
Testing different EDA findPeaks parameters.
2022-06-30 15:15:37 +00:00
c851ab0763
Fill EDA NaN values where numPeak is zero. Other small changes.
2022-06-21 14:09:49 +00:00
a8cd16f88c
Debugging eda_explorer
2022-06-16 11:32:59 +00:00
dda4554d46
Various small changes.
2022-06-15 13:57:46 +00:00
212cf300f8
Debugging EDA signal - preliminary step for imputation.
2022-06-14 15:09:14 +00:00
9ea39dc557
Standardization as a Snakefile's rule enabled for all E4 sensors.
2022-06-13 18:17:30 +00:00
402059871f
Making standardization as a rule. WIP: done only for BVP.
2022-06-13 14:12:03 +00:00
094743244d
Added SO feature for sum all rows that are non zero for BVP and IBI sensors.
2022-06-13 10:51:22 +00:00
e1d7607de4
Extraction of additional SO features. Min/max has been changed to nsmallest/nlargest means.
2022-06-10 12:34:48 +00:00
f371249b99
First order features standardization WIP
2022-06-09 13:35:15 +00:00
64e41cfa35
Second order features standardization in config.yaml.
2022-06-07 10:39:48 +00:00
2c7ac21465
Added standardization on SO features.
2022-06-06 13:51:15 +00:00
2acf6ff9fb
Exception handling in case of empty ibi. Changes of the method EDA uses in main.py. Other small corrections.
2022-06-03 12:34:36 +00:00
d300f0f8f0
Fixed RAPIDS bug: error when IBI.csv is empty.
2022-06-02 11:43:49 +00:00
fbf6a77dfc
Small misc changes
2022-06-02 06:41:53 +00:00
5532043b1f
Patching IBI with BVP - completed.
2022-05-25 19:39:47 +00:00
bb62497ba6
Patching IBI with BVP - selecting appropriate pipeline entry point. WIP
2022-05-24 11:07:18 +00:00
2a8f58f5c8
Patching IBI with BVP. WIP
2022-05-20 13:18:45 +00:00
1471c86c62
Cr-features version update in rapids venv.
2022-05-13 13:37:12 +00:00
6864cfe775
Changes after thorough testing with available data.
2022-05-13 13:35:34 +00:00
c1564f0cae
Changed wrapper method calculate_feature to its newest version (for TEMP and ACC).
2022-05-11 14:21:21 +00:00
31e36e7400
Alternating Second order and full segment features corresponding to config settings.
2022-05-11 08:50:15 +00:00
9cf9e1fe14
Testing and modifying the code with different E4 data.
2022-05-10 11:36:49 +00:00
f62a1302dd
Cr-features corrections for ACC and TEMP sensors
2022-05-09 11:01:52 +00:00
5638367999
Implementation of the second order features.
2022-04-25 13:07:03 +00:00
66451160e9
Calculating HRV features with IBI.csv.
2022-04-20 10:44:51 +00:00
8c8fe1fec7
Modifications, mostly imports, after changes in cr-features module.
2022-04-19 13:24:46 +00:00
075c64d1e5
HRV: changed wrapper calcFeat method with specialized one.
2022-04-14 11:51:53 +00:00
3c058e4463
Add option to calculate features within windows and store it in CSV (all sensors).
2022-04-13 13:18:23 +00: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
74cf4ada1c
Cr-feat window length for all empaticas sensors.
2022-04-12 14:00:44 +00: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
Primoz
=
junos