rapids

Commit Graph

Select branches

Hide Pull Requests

data_cleaning

develop

feature/aware_sql_split

feature/fitbit_steps_firststeptime_laststeptime

feature/plugin_sentimental

gh-pages

imputation_and_cleaning

labels

master

models

notes

old_docs

runner

sociality-task

update_libs

#103

#104

#106

#107

#108

#109

#111

#112

#113

#114

#123

#124

#125

#128

#129

#130

#131

#134

#136

#140

#141

#143

#144

#145

#147

#148

#149

#150

#152

#154

#155

#157

#158

#159

#160

#161

#162

#163

#164

#165

#166

#166

#167

#168

#168

#95

#96

#97

#98

v0.0-beta

v0.1.0

v0.2.0

v0.2.1

v0.2.2

v0.2.3

v0.2.4

v0.2.5

v0.2.6

v0.3.0

v0.3.1

v0.3.2

v0.4.0

v0.4.1

v0.4.2

v0.4.3

v1.0.0

v1.0.1

v1.1.0

v1.1.1

v1.2.0

v1.3.0

v1.4.0

v1.4.1

v1.5.0

v1.6.0

c1564f0cae Changed wrapper method calculate_feature to its newest version (for TEMP and ACC). Primoz 2022-05-11 14:21:21 +0000
31e36e7400 Alternating Second order and full segment features corresponding to config settings. Primoz 2022-05-11 08:50:15 +0000
9cf9e1fe14 Testing and modifying the code with different E4 data. Primoz 2022-05-10 11:36:49 +0000
f62a1302dd Cr-features corrections for ACC and TEMP sensors Primoz 2022-05-09 11:01:52 +0000
5638367999 Implementation of the second order features. Primoz 2022-04-25 13:07:03 +0000
66451160e9 Calculating HRV features with IBI.csv. Primoz 2022-04-20 10:44:51 +0000
8c8fe1fec7 Modifications, mostly imports, after changes in cr-features module. = 2022-04-19 13:24:46 +0000
075c64d1e5 HRV: changed wrapper calcFeat method with specialized one. = 2022-04-14 11:51:53 +0000
2fe1b37f55 Add feature preprocessing. junos 2022-04-13 17:05:31 +0200
c05b047c2d Correct outstanding baseline feature mistake. junos 2022-04-13 17:05:16 +0200
53ec52a954 Disable (SOME) feature cleaning for ESM data. junos 2022-04-13 16:01:31 +0200
3c058e4463 Add option to calculate features within windows and store it in CSV (all sensors). = 2022-04-13 13:18:23 +0000
144f0d0dcf Account for missing baseline data. junos 2022-04-13 14:56:28 +0200
ed5314aa98 Merge remote-tracking branch 'origin/master' junos 2022-04-12 17:27:25 +0200
11c64cfc1a Include all participants again. labels junos 2022-04-12 17:20:19 +0200
a6a37c7bd9 Drop NaN targets. junos 2022-04-12 17:01:49 +0200
9f5edf1c2b Revert "Add a rule for model baselines." junos 2022-04-12 16:59:42 +0200
4ad261fae5 Rename baseline features AGAIN. junos 2022-04-12 16:55:01 +0200
74cf4ada1c Cr-feat window length for all empaticas sensors. = 2022-04-12 14:00:44 +0000
9ab0c8f289 Add a rule for model baselines. junos 2022-04-12 14:23:58 +0200
570d2eb656 Add the file for population model to Snakefile. junos 2022-04-12 14:11:40 +0200
f5688f6154 Add a rule to merge sensor and baseline features. junos 2022-04-08 15:42:04 +0200
b1f356c3f7 Extract a function to be used elsewhere. junos 2022-04-08 15:36:32 +0200
7ff3dcf5fc Move and rename target variable. junos 2022-04-06 18:21:09 +0200
50c0defca7 Select target columns (no parsing necessary). junos 2022-04-06 18:16:49 +0200
ac86221662 [WIP] Add a rule to parse targets. junos 2022-04-06 17:47:03 +0200
baa94c4c4e Correct additional error in feature file naming. junos 2022-04-06 17:29:17 +0200
d2fbef5234 Merge branch 'labels' of https://repo.ijs.si/junoslukan/rapids into labels junos 2022-04-05 19:28:37 +0200
d326a1b09d Include the constant directly in main.py. junos 2022-04-05 19:08:43 +0200
2e545e81f0 Include feature calculations for different scales. junos 2022-04-05 19:05:34 +0200
cbc8ae4e03 Add necessary checks for empty data frames. junos 2022-04-05 18:58:09 +0200
f50a13167e Add feature files back to Snakefile. junos 2022-04-05 18:37:58 +0200
e84c35a36a Remove unnecessary parameters from preprocess_esm. junos 2022-04-05 18:35:25 +0200
e2ce68f591 Defer creation of feature files to esm_features rule. junos 2022-04-05 18:30:04 +0200
751b04f3f4 Pass scale names to Snakemake correctly. junos 2022-04-05 18:14:37 +0200
99245afca3 Try a different approach for preprocessing ESMs. junos 2022-04-05 18:02:31 +0200
ed298a9479 Implement the basic feature extraction steps. junos 2022-04-05 15:46:02 +0200
1c42347b9b Small changes. = 2022-04-04 12:19:33 +0000
c050174ca3 Various minimal changes. Primoz 2022-03-31 09:16:00 +0000
f9e40711e7 Modified README for RAPIDS-CalculatingFeatures integration. Primoz 2022-03-30 16:17:07 +0000
a357138f6e Added CF for HRV and shortened test data Primoz 2022-03-30 15:01:24 +0000
470993eeb0 Modification of getSampleRate method for all CF scripts. Primoz 2022-03-30 15:00:11 +0000
798ec973b4 [WIP] Add a rule for ESM features. junos 2022-03-30 10:43:30 +0200
3af8de6235 Create feature provider script. junos 2022-03-29 18:37:13 +0200
7173ca13e3 Rename a parameter. junos 2022-03-29 18:34:43 +0200
9478dc94f2 Add an else. junos 2022-03-16 18:59:29 +0100
ab0b9227d7 Added ACC calculated features and shorter version of ACC data. = 2022-03-29 09:41:51 +0000
a9244a60fc Corrections for TEMP cf src script. = 2022-03-28 14:26:37 +0000
8b76c96e47 Cleaning existing CF mains' and preparing src script for ACC. = 2022-03-28 14:18:29 +0000
ca59a54d8f Get a sample rate from two sequential timestamps. = 2022-03-28 13:50:08 +0000
393dab72f5 Added components for the temperature features extraction. = 2022-03-28 12:37:02 +0000
1902d02a86 Updating conda env. Primoz 2022-03-25 16:27:28 +0000
f389ac9d89 Delete CF features folder Primoz 2022-03-25 16:24:52 +0000
191e53e543 Added cf provider for EDA feature processing. Primoz 2022-03-23 15:13:53 +0000
d3a3f01f29 Preparation for the EDA features integration from CF. Primoz 2022-03-22 15:36:52 +0000
2da0911d4c Skeleton file main.py for EDA CalcFt. integration. Primoz 2022-03-22 12:48:43 +0000
bd5a811256 Shortening input CSVs' and added test for ACC. Primoz 2022-03-21 12:00:57 +0000
d1c59de2e9 Add folder structure for CF testing and EDA test. Primoz 2022-03-21 10:40:18 +0000
a80f7c0cc4 Change of the relative import statements. Primoz 2022-03-21 10:38:15 +0000
d63158c199 Build calc features lib and related packages. Primoz 2022-03-21 08:28:28 +0000
b18dba366e Add an else. junos 2022-03-16 18:59:29 +0100
916bb21a53 Merge branch 'labels' into run_test_participant junos 2022-03-16 18:56:00 +0100
c6144f8403 Reverse JCQ items. junos 2022-03-16 18:55:30 +0100
fec7cc9550 Merge branch 'labels' into run_test_participant junos 2022-03-16 18:30:03 +0100
23f0aaba3a Get the name of the questionnaire from Snakefile. junos 2022-03-16 18:28:57 +0100
8ed7d23348 Merge branch 'labels' into run_test_participant junos 2022-03-16 17:56:07 +0100
679f00dc19 Enable selecting any questionnaire as target. junos 2022-03-16 17:55:44 +0100
1374eda171 Flatten questionnaire ID dict. junos 2022-03-16 17:38:09 +0100
3e9cdde66e Merge branch 'master' into run_test_participant junos 2022-03-16 17:27:50 +0100
155395512c Merge branch 'labels' into run_test_participant junos 2022-03-16 17:09:53 +0100
cb116100dd Move preprocessing to features. junos 2022-03-16 17:06:42 +0100
19b9da0ba3 Separate function definitions from main. junos 2022-03-16 16:49:28 +0100
3f8e1cc252 Empatica features calculations with an example ZIP Primoz 2022-03-16 15:03:32 +0000
83a8bb6689 Add an option to disable calculation of baseline features. junos 2022-03-16 15:51:12 +0100
dc2b462145 Reseting files to defaults - for Minimal Working Example Primoz 2022-03-16 13:30:19 +0000
50358978cc Testing Git integration on PC Primoz 2022-03-15 12:49:51 +0000
ef57103bac Add questionnaire ID key. junos 2022-03-15 13:41:33 +0100
5f293211a7 Reformat. junos 2022-03-15 13:28:51 +0100
86c6312574 Added .devcontainer to gitignore Primoz 2022-03-14 18:36:10 +0000
d470eef27e Add a rule to preprocess and clean ESM. junos 2022-03-09 18:38:46 +0100
b09522a8af Merge branch 'labels' into run_test_participant junos 2022-03-09 17:58:44 +0100
d4a4bbbff0 Remove unused columns. junos 2022-03-09 17:58:36 +0100
085a6d144b Add files to compute and create an empty script. junos 2022-03-09 17:32:02 +0100
42d62f16d0 Add RAPIDS mandatory columns for ESM. junos 2022-03-09 17:31:37 +0100
a159ca3d3a Merge branch 'labels' into run_test_participant junos 2022-03-08 15:43:42 +0100
2bef86b1da Add a format for ESM and add to config. junos 2022-03-08 15:43:25 +0100
d8e9a309f7 Rename features and write baseline_interim. junos 2022-03-08 15:10:36 +0100
ba7c3e620b Merge branch 'master' into run_test_participant junos 2022-03-01 12:03:14 +0100
a3a4f04ffe Setting with : produces NaNs. junos 2022-03-01 12:02:57 +0100
aedb8b6785 Write questionnaire data to data/interim. junos 2022-03-01 11:39:58 +0100
631581cc8a Merge branch 'master' into run_test_participant junos 2022-03-01 11:42:19 +0100
d3ebfeeabd Write questionnaire data to data/interim. junos 2022-03-01 11:39:58 +0100
70e077f6ab Merge branch 'master' into run_test_participant junos 2022-03-01 11:40:17 +0100
f13a91044d Write questionnaire data to data/interim. junos 2022-03-01 11:39:58 +0100
b5a6317f4b Calculate JCQ control and demand control ratio. junos 2022-02-28 18:51:47 +0100
2fed962644 Calculate JCQ demand score. junos 2022-02-28 18:30:41 +0100
30ac8b1cd5 Start calculating demand control features. junos 2022-02-23 19:08:10 +0100
9a74e74d08 Add the baseline features rule to snakefile. junos 2022-02-23 18:15:26 +0100
43e5ac7918 Merge branch 'master' into run_test_participant junos 2022-02-23 18:06:07 +0100
07da6be398 Add age, gender, and language as features. junos 2022-02-23 18:05:23 +0100