Added go-back-time (#2)

* Added go-back-time Added two variants of go-back time. Version one: includes any inter-character regression. Version two: only includes inter-word (inter-region) regression. * wip * fix test errors * release cleanup * circleci
amnda-d · Oct 20, 2018 · ff48cf2 · ff48cf2
1 parent 53becc0
commit ff48cf2
Show file tree

Hide file tree

Showing 11 changed files with 478 additions and 292 deletions.
diff --git a/README.rst b/README.rst
@@ -216,7 +216,7 @@ A number specifying the level of detail in terminal output.
     :scale: 100%
     :target: https://sideeye.readthedocs.io/en/latest/?badge=latest
 
-.. |circleci| image:: https://circleci.com/gh/zediski/sideeye/tree/master.svg?style=shield
+.. |circleci| image:: https://circleci.com/gh/amnda-d/sideeye/tree/master.svg?style=shield
     :alt: Build Status
     :scale: 100%
-    :target: https://circleci.com/gh/zediski/sideeye/tree/master
+    :target: https://circleci.com/gh/amnda-d/sideeye/tree/master
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -1,6 +1,10 @@
 Version History
 ===============
 
+`1.0.0a6 <https://pypi.org/project/sideeye/1.0.0a6/>`_
+------------------------------------------------------
+- Added go-back time by region and character.
+
 `1.0.0a5 <https://pypi.org/project/sideeye/1.0.0a5/>`_
 ------------------------------------------------------
 - Ignore non-DA1 files when parsing an experiment.

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0a4'
+release = '1.0.0a6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/configFile.rst b/doc/source/configFile.rst
@@ -133,6 +133,8 @@ The measures in this section of the config file are:
   landing_position
   launch_site
   first_pass_fixation_count
+  go_back_time_region
+  go_back_time_char
 
 trial_measures
 ~~~~~~~~~~~~~~

diff --git a/doc/source/default_config.json.rst b/doc/source/default_config.json.rst
@@ -4,7 +4,7 @@ Default Configuration
 ::
 
   {
-    "da1_fields" : {
+    "da1_fields": {
       "index": 0,
       "condition": 1,
       "number": 2,
@@ -17,106 +17,114 @@ Default Configuration
       "boundaries_start": 3,
       "includes_y": false
     },
-    "cutoffs":{
+    "cutoffs": {
       "min": -1,
       "max": -1,
       "include_fixation": false,
       "include_saccades": false
     },
-    "region_measures":{
-      "skip":{
-         "include": true,
-         "cutoff": -1
-      },
-      "first_pass_regressions_out":{
-         "include": true,
-         "cutoff": -1
-      },
-      "first_pass_regressions_in":{
-         "include": true,
-         "cutoff": -1
-      },
-      "first_fixation_duration":{
-         "include": true,
-         "cutoff": -1
-      },
-      "single_fixation_duration":{
-         "include": true,
-         "cutoff": -1
-      },
-      "first_pass":{
-         "include": true,
-         "cutoff": -1
-      },
-      "go_past":{
-         "include": true,
-         "cutoff": -1
-      },
-      "total_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "right_bounded_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "reread_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "second_pass":{
-         "include": true,
-         "cutoff": -1
-      },
-      "spillover_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "refixation_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "landing_position":{
-         "include": true,
-         "cutoff": -1
-      },
-      "launch_site":{
-         "include": true,
-         "cutoff": -1
-      },
-      "first_pass_fixation_count":{
-         "include": true,
-         "cutoff": -1
+    "region_measures": {
+      "skip": {
+        "include": true,
+        "cutoff": -1
+      },
+      "first_pass_regressions_out": {
+        "include": true,
+        "cutoff": -1
+      },
+      "first_pass_regressions_in": {
+        "include": true,
+        "cutoff": -1
+      },
+      "first_fixation_duration": {
+        "include": true,
+        "cutoff": -1
+      },
+      "single_fixation_duration": {
+        "include": true,
+        "cutoff": -1
+      },
+      "first_pass": {
+        "include": true,
+        "cutoff": -1
+      },
+      "go_past": {
+        "include": true,
+        "cutoff": -1
+      },
+      "total_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "right_bounded_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "reread_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "second_pass": {
+        "include": true,
+        "cutoff": -1
+      },
+      "spillover_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "refixation_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "landing_position": {
+        "include": true,
+        "cutoff": -1
+      },
+      "launch_site": {
+        "include": true,
+        "cutoff": -1
+      },
+      "first_pass_fixation_count": {
+        "include": true,
+        "cutoff": -1
+      },
+      "go_back_time_region": {
+        "include": true,
+        "cutoff": -1
+      },
+      "go_back_time_char": {
+        "include": true,
+        "cutoff": -1
       }
-   },
-   "trial_measures":{
-      "location_first_regression":{
-         "include": true,
-         "cutoff": -1
-      },
-      "latency_first_regression":{
-         "include": true,
-         "cutoff": -1
-      },
-      "fixation_count":{
-         "include": true,
-         "cutoff": -1
-      },
-      "percent_regressions":{
-         "include": true,
-         "cutoff": -1
-      },
-      "trial_total_time":{
-         "include": true,
-         "cutoff": -1
-      },
-      "average_forward_saccade":{
-         "include": true,
-         "cutoff": -1
-      },
-      "average_backward_saccade":{
-         "include": true,
-         "cutoff": -1
+    },
+    "trial_measures": {
+      "location_first_regression": {
+        "include": true,
+        "cutoff": -1
+      },
+      "latency_first_regression": {
+        "include": true,
+        "cutoff": -1
+      },
+      "fixation_count": {
+        "include": true,
+        "cutoff": -1
+      },
+      "percent_regressions": {
+        "include": true,
+        "cutoff": -1
+      },
+      "trial_total_time": {
+        "include": true,
+        "cutoff": -1
+      },
+      "average_forward_saccade": {
+        "include": true,
+        "cutoff": -1
+      },
+      "average_backward_saccade": {
+        "include": true,
+        "cutoff": -1
       }
     },
     "region_output": {