Commit Graph

140 Commits (e7fe4e8398c3440aa940ba93fbddd797ce473797)

Author SHA1 Message Date
junos e7fe4e8398 Simplify merge into join. 2021-08-17 13:53:19 +02:00
Junos Lukan cf28aa547a Merge branch 'communication' into 'master'
separated features

See merge request junoslukan/straw2analysis!2
2021-08-17 11:42:03 +00:00
junos d6f36ec8f8 [WIP] Finish the class by assigning columns and validating model. 2021-08-13 17:41:04 +02:00
junos b06ec6e1ae [WIP] Methods to get the labels and data plus aggregate them. 2021-08-12 19:07:14 +02:00
junos 622477f19f [WIP] Start merging steps into a class for a pipeline. 2021-08-12 17:38:08 +02:00
junos 577a874288 Add an example for linear regression. 2021-08-12 16:54:00 +02:00
junos c8bb481508 Add a parameter for grouping. 2021-08-12 15:07:20 +02:00
junos 98f1df81c6 Use the same function for ESM and other data. 2021-08-11 17:26:44 +02:00
junos ad85f79bc5 Move datetime calculation to a separate function. 2021-08-11 17:19:14 +02:00
junos 070cfdba80 Start machine learning pipeline example.
Select data and labels.
2021-08-11 16:42:30 +02:00
junos c6d0e4391e Add a couple of proximity features. 2021-08-11 16:40:19 +02:00
junos af65d0864f Add a simple function for recoding proximity. 2021-08-11 15:04:27 +02:00
junos a2180aee54 Fix assignment to use loc.
For assigning a value to selected rows (a subset), regular slicing using [] produces a KeyError.
2021-08-11 14:53:59 +02:00
Ivan Kobe 74b4f9ddbe separated features 2021-08-10 12:59:47 +02:00
junos a06ad0800f Explore missing application categories. 2021-08-09 16:02:23 +02:00
junos 06e1fe7410 Merge remote-tracking branch 'origin/communication' into communication 2021-08-06 18:53:57 +02:00
junos 02f2607be9 Fix formatting and typos. 2021-08-06 18:53:39 +02:00
junos cca5a29483 Rename features and add one for missed calls. 2021-08-06 18:53:39 +02:00
junos e3d735163f Add demonstrations of new functions. 2021-08-06 18:53:39 +02:00
Ivan Kobe 1b53865f0a deleted prototyping notebooks 2021-08-06 18:53:39 +02:00
Ivan Kobe 4ac5f37c19 additional communication features 2021-08-06 18:53:39 +02:00
junos 2fc80a34e7 Fix formatting and typos. 2021-08-06 18:53:18 +02:00
junos fbd9c2fc32 Rename features and add one for missed calls. 2021-08-06 18:51:13 +02:00
Junos Lukan d8899fa75b Merge branch 'communication' into 'master'
Communication

See merge request junoslukan/straw2analysis!1
2021-08-06 16:44:39 +00:00
Ivan Kobe 62af04fe09 Communication 2021-08-06 16:44:39 +00:00
junos 33ebf9caea Add demonstrations of new functions. 2021-08-06 18:38:21 +02:00
junos 40293c4752 Further reduce figure height and increase font size. 2021-08-04 18:05:52 +02:00
junos 9e87b1f176 Add an option to print figures and set font sizes. 2021-08-04 17:41:09 +02:00
Ivan Kobe 4a2ca581b3 deleted prototyping notebooks 2021-08-04 13:46:44 +02:00
Ivan Kobe d98b673824 additional communication features 2021-08-04 13:45:54 +02:00
junos 1bdb334c42 Fix formatting. 2021-07-27 20:57:21 +02:00
junos b99136a181 Document individual functions for event extraction. 2021-07-27 20:56:27 +02:00
junos 9bd42afa02 Simplify pivoting a table and fix other mistakes. 2021-07-27 20:41:13 +02:00
junos 0f5af21f71 Detect whether event was work related. 2021-07-27 19:53:44 +02:00
junos c4f7b6459d Extract event duration. 2021-07-27 19:47:54 +02:00
junos 19cddaa634 Convert event time to datetime. 2021-07-27 18:43:31 +02:00
junos 763b970a42 Detect stressful events and rename their stressfulness. 2021-07-27 18:30:05 +02:00
junos 3c12a6e74a Start extracting event features.
Calculate threat and challenge means.
2021-07-27 18:25:05 +02:00
junos 28e9db15f5 Add assertions for fields which are referenced in other functions. 2021-07-27 14:07:10 +02:00
junos 1aaf95fe9e Look at specific values of proximity. 2021-07-26 17:16:32 +02:00
junos d3f42ea402 Start exploring proximity. 2021-07-26 11:37:31 +02:00
junos 9580533c14 Explore between-participants differences in light. 2021-07-23 18:50:17 +02:00
junos dbb59c4aef Explore low levels of luminance. 2021-07-23 18:29:44 +02:00
junos 67e2d233b0 Start exploring light data. 2021-07-23 16:42:16 +02:00
junos 7de4beca6e Add a method for getting the light sensor data. 2021-07-23 16:19:56 +02:00
junos 7aeb40d674 Fix formatting. 2021-07-22 15:47:42 +02:00
junos ed0b013801 Finish the reversal test. 2021-07-22 15:46:57 +02:00
junos f49a80d5d8 [WIP] Explicitly check that the morning session was reclassified in the test. 2021-07-22 15:34:47 +02:00
junos 78d6e020ae [WIP] Outline screen feature calculation in TODOs. 2021-07-22 15:19:15 +02:00
junos 77c2ba87d5 [WIP] Add tests for ESM. 2021-07-16 16:58:18 +02:00