8a6b52a97c
Switch to 30_before ERS with corresponding targets.
2022-11-29 11:35:49 +00:00
244a053730
Change output files settings to nonstandardized.
2022-11-29 11:19:43 +00:00
99c2fab8f9
Fix a bug in the making of the individual model (when there is no target in the participants columns).
2022-11-16 09:50:18 +00:00
ab803ee49c
Add additional appraisal targets.
2022-11-15 10:14:07 +00:00
bd41f42a5d
Rename target_ to segmenting_ method.
2022-11-14 15:07:36 +00:00
00350ef8ca
Change config for stressfulness event target method.
2022-11-10 10:32:58 +00:00
1da72a7cbe
Rename targets method in config.
2022-11-08 09:45:37 +00:00
c1c9f4d05a
Merge branch 'imputation_and_cleaning' of https://repo.ijs.si/junoslukan/rapids into imputation_and_cleaning
2022-11-04 09:11:58 +00:00
62f46ea376
Prepare method-based logic for ERS generating.
2022-11-04 09:11:53 +00:00
7ab0280d7e
Correctly rename stressful event target variable.
2022-11-04 08:58:08 +00:00
eefa9f3f4d
Add new target: stressfulness_event.
2022-11-03 14:49:54 +00:00
5e8174dd41
Add new target: stressfulness_period.
2022-11-03 13:52:45 +00:00
02264b21fd
Add logic for target selection in ERS processing.
2022-11-03 09:30:12 +00:00
cd137af15a
Config for 30 minute EMA segments.
2022-10-27 14:20:15 +00:00
936324d234
Switch config for 30 minutes event related segments.
2022-10-26 14:17:27 +00:00
f3ca56cdbf
Start with ERS logic integration within Snakemake.
2022-10-14 14:46:28 +00:00
797aa98f4f
Config for ERS testing.
2022-10-12 15:51:50 +00:00
001d400729
Clean features and create input files based on all possible targets.
2022-10-06 14:28:12 +00:00
a34412a18d
E4 data yield corrections. Changes in overal cs - standardization.
2022-10-05 14:16:55 +00:00
53f6cc60d5
Config and cleaning script necessary changes ...
2022-10-03 13:06:39 +00:00
44531c6d94
Code cleaning, reworking cleaning individual based on changes in overall script. Changes in thresholds.
2022-09-30 10:04:07 +00:00
7ac7cd5a37
Preparation of the overall cleaning script.
2022-09-29 14:33:21 +00:00
68fd69dada
Cleaning script for individuals: corrections and comments.
2022-09-29 11:55:25 +00:00
8af4ef11dc
Contextual imputation by feature type.
2022-09-28 10:02:47 +00:00
7fcdb873fe
Merge branch 'imputation_and_cleaning' of https://repo.ijs.si/junoslukan/rapids into imputation_and_cleaning
2022-09-27 07:50:29 +00:00
5c7bb0f4c1
Config changes
2022-09-27 07:48:32 +00:00
bd53dc1684
Empatica data yield usage in the cleaning script.
2022-09-26 15:54:00 +00:00
eaf4340afd
Small imputation and cleaning corrections.
2022-09-20 08:03:48 +00:00
52e11cdcab
Configurations for new standardization path.
2022-09-19 07:25:54 +00:00
18b63127de
Removed all standardizaton rules and configurations.
2022-09-19 06:16:26 +00:00
d27a4a71c8
Reorganisation and reordering of the cleaning script.
2022-09-12 13:44:17 +00:00
15d792089d
Changes in cleaning script:
...
- target extracted from config to remove rows where target is nan
- prepared sns.heatmap for further missing values analysis
- necessary changes in config and participant p01
- picture of heatmap which shows the values state after cleaning
2022-09-01 10:33:36 +00:00
c498ecb742
Include baseline models (+corrections), disable columns drop in cleaning function.
2022-08-23 14:12:14 +00:00
4cfe5a3a98
Disable discarding rows if DATA_YIELD_RATIO_THRESHOLD==0.
2022-08-19 13:10:56 +00:00
607da820f2
Configuration and cleaning changes
2022-08-18 14:21:05 +00:00
fb577bc9ad
Squashed commit of the following:
...
commit 43ecc243cb62bb31eed85cb477ca4131555c7fe7
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 22 15:26:09 2022 +0000
Adding TODO comments
commit 2df1ebf90c3a93812b112b8ed0ee4e23cd74533f
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 21 13:59:23 2022 +0000
README update
commit 5182c2b16dff3537aad42984b8ea5214743cdb32
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 21 11:03:01 2022 +0000
Few corrections for all_cleaning
commit 3d9254c1b3bed6e95e631d4e0402548830a19534
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 21 10:28:05 2022 +0000
Adding the min overlap for corr threshold and preservation of esm cols.
commit e27c49cc8fa4c51f9fe8e593a8d25e9a032ab393
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 21 09:02:00 2022 +0000
Commenting and cleaning.
commit 31a47a5ee4569264e39d7c445525a6e64bb7700a
Author: Primoz <sisko.primoz@gmail.com>
Date: Wed Jul 20 13:49:22 2022 +0000
Environment version change.
commit 5b274ed8993f58e783bda6d82fce936764209c28
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 16:10:07 2022 +0000
Enabled cleaning for all participants + standardization files.
commit 203fdb31e0f3c647ef8c8a60cb9531831b7ab924
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 14:14:51 2022 +0000
Features cleaning fixes after testing. Visualization script for phone features values.
commit 176178d73b154c30b9eb9eb4a67514f00d6a924e
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 09:05:14 2022 +0000
Revert "Necessary config changes."
This reverts commit 6ec1ef50430d2e1f5ce4670d505d5e84ac47f0a0.
commit 26ea6512c9d512f95837e7b047fe510c1d196403
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 13:19:47 2022 +0000
Adding cleaning function condition and cleaning functionality.
commit 575c29eef9c21e6f2d7832871e73bc0941643734
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 12:51:56 2022 +0000
Translation of the cleaning individual RAPIDS function from R to py.
commit 6ec1ef50430d2e1f5ce4670d505d5e84ac47f0a0
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 12:02:18 2022 +0000
Necessary config changes.
commit b5669f51612fbd8378848615d639677851ab032f
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 15:26:00 2022 +0000
Modified snakemake rule to dynamically choose script extention.
commit 66636be1e8ae4828228b37c59b9df1faf3fc3d3d
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 14:43:08 2022 +0000
Trying to modify the snakefile rule to execute scripts in two languages depended on the provider.
commit 574778b00f3cbb368ef4bc74de15cf5070c65ea9
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 09:49:41 2022 +0000
gitignore: adding required files so that RAPIDS can be run successfully.
commit 71018ab178256970535e78961602ab8c7f0ebb14
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 08:34:19 2022 +0000
Standardization bug fixes
commit 6253c470a624e6bfbb02e0c453b652452eb2dbbc
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 14 15:28:02 2022 +0000
Seperate rules for empatica vs. nonempatica standardization.
Parameter in config that controls the creation of standardized merged files for individual and all participants..
commit 90f902778565e0896d3bae22ae8551be8b487e67
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 12 14:23:03 2022 +0000
Preparing for final csvs' standardization.
commit d25dde3998786a9a582f5cda544ee104386778f9
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 12:08:47 2022 +0000
Revert "Changes in config to be reverted."
This reverts commit bea7608e7095021fb7c53a9afa07074448fe4313.
commit 6b23e70857e63deda98eb98d190af9090626c84b
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 12:08:26 2022 +0000
Enabled standardization for rest (previously active) phone features.
Testing still needed.
commit 8ec58a6f34ba3d42e5cc71d26e6d91837472ca5f
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 09:07:55 2022 +0000
Enabled standardization for phone calls.
All steps completed and tested.
commit bea7608e7095021fb7c53a9afa07074448fe4313
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 07:47:51 2022 +0000
Changes in config to be reverted.
commit 4e84ca0e51bf709bff56fd09437b95310ec6bedd
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 8 14:11:24 2022 +0000
Standardization for the rest of the features.
commit cc581aa788e3d5c17131af8f3d5dd6b0c3b5aff7
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 8 14:11:08 2022 +0000
README update again
2022-07-22 15:31:30 +00:00
6ba4a66deb
Squashed commit of the following:
...
commit 31a47a5ee4569264e39d7c445525a6e64bb7700a
Author: Primoz <sisko.primoz@gmail.com>
Date: Wed Jul 20 13:49:22 2022 +0000
Environment version change.
commit 5b274ed8993f58e783bda6d82fce936764209c28
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 16:10:07 2022 +0000
Enabled cleaning for all participants + standardization files.
commit 203fdb31e0f3c647ef8c8a60cb9531831b7ab924
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 14:14:51 2022 +0000
Features cleaning fixes after testing. Visualization script for phone features values.
commit 176178d73b154c30b9eb9eb4a67514f00d6a924e
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 19 09:05:14 2022 +0000
Revert "Necessary config changes."
This reverts commit 6ec1ef50430d2e1f5ce4670d505d5e84ac47f0a0.
commit 26ea6512c9d512f95837e7b047fe510c1d196403
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 13:19:47 2022 +0000
Adding cleaning function condition and cleaning functionality.
commit 575c29eef9c21e6f2d7832871e73bc0941643734
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 12:51:56 2022 +0000
Translation of the cleaning individual RAPIDS function from R to py.
commit 6ec1ef50430d2e1f5ce4670d505d5e84ac47f0a0
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 18 12:02:18 2022 +0000
Necessary config changes.
commit b5669f51612fbd8378848615d639677851ab032f
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 15:26:00 2022 +0000
Modified snakemake rule to dynamically choose script extention.
commit 66636be1e8ae4828228b37c59b9df1faf3fc3d3d
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 14:43:08 2022 +0000
Trying to modify the snakefile rule to execute scripts in two languages depended on the provider.
commit 574778b00f3cbb368ef4bc74de15cf5070c65ea9
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 09:49:41 2022 +0000
gitignore: adding required files so that RAPIDS can be run successfully.
commit 71018ab178256970535e78961602ab8c7f0ebb14
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 15 08:34:19 2022 +0000
Standardization bug fixes
commit 6253c470a624e6bfbb02e0c453b652452eb2dbbc
Author: Primoz <sisko.primoz@gmail.com>
Date: Thu Jul 14 15:28:02 2022 +0000
Seperate rules for empatica vs. nonempatica standardization.
Parameter in config that controls the creation of standardized merged files for individual and all participants..
commit 90f902778565e0896d3bae22ae8551be8b487e67
Author: Primoz <sisko.primoz@gmail.com>
Date: Tue Jul 12 14:23:03 2022 +0000
Preparing for final csvs' standardization.
commit d25dde3998786a9a582f5cda544ee104386778f9
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 12:08:47 2022 +0000
Revert "Changes in config to be reverted."
This reverts commit bea7608e7095021fb7c53a9afa07074448fe4313.
commit 6b23e70857e63deda98eb98d190af9090626c84b
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 12:08:26 2022 +0000
Enabled standardization for rest (previously active) phone features.
Testing still needed.
commit 8ec58a6f34ba3d42e5cc71d26e6d91837472ca5f
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 09:07:55 2022 +0000
Enabled standardization for phone calls.
All steps completed and tested.
commit bea7608e7095021fb7c53a9afa07074448fe4313
Author: Primoz <sisko.primoz@gmail.com>
Date: Mon Jul 11 07:47:51 2022 +0000
Changes in config to be reverted.
commit 4e84ca0e51bf709bff56fd09437b95310ec6bedd
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 8 14:11:24 2022 +0000
Standardization for the rest of the features.
commit cc581aa788e3d5c17131af8f3d5dd6b0c3b5aff7
Author: Primoz <sisko.primoz@gmail.com>
Date: Fri Jul 8 14:11:08 2022 +0000
README update again
2022-07-20 13:51:22 +00:00
5a777ac79f
Working version that integrates both phone and empatica feature calculations.
2022-07-07 15:00:47 +00:00
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
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
Primoz