From 79e126bc9241f636f4cbfd3d1af76ca068084781 Mon Sep 17 00:00:00 2001
From: JulioV <JulioV@users.noreply.github.com>
Date: Wed, 6 Nov 2019 14:46:23 -0500
Subject: [PATCH] Rename activity recognition rule and script and update conda
 env

---
 Snakefile                                     |  2 +-
 environment.yml                               | 23 ++++---------------
 rules/features.snakefile                      |  4 ++--
 ...tion.py => google_activity_recognition.py} |  0
 4 files changed, 8 insertions(+), 21 deletions(-)
 rename src/features/{activity_recognition.py => google_activity_recognition.py} (100%)

diff --git a/Snakefile b/Snakefile
index ed3ae3ed..ae30484c 100644
--- a/Snakefile
+++ b/Snakefile
@@ -28,7 +28,7 @@ rule all:
         expand("data/processed/{pid}/bluetooth_{segment}.csv",
                             pid=config["PIDS"], 
                             segment = config["BLUETOOTH"]["DAY_SEGMENTS"]),
-        expand("data/processed/{pid}/activity_extracted.csv",pid=config["PIDS"]),
+        expand("data/processed/{pid}/google_activity_recognition.csv",pid=config["PIDS"]),
         # Reports
         expand("reports/figures/{pid}/{sensor}_heatmap_rows.html", pid=config["PIDS"], sensor=config["SENSORS"]),
         expand("reports/figures/{pid}/compliance_heatmap.html", pid=config["PIDS"], sensor=config["SENSORS"]),
diff --git a/environment.yml b/environment.yml
index f4b2656b..ba17b356 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,5 +1,6 @@
-name: moshi-env
+name: moshi-env2
 channels:
+  - anaconda
   - defaults
   - conda-forge
 dependencies:
@@ -40,7 +41,7 @@ dependencies:
   - ncurses=6.1=h0a44026_1002
   - numpy=1.17.2=py37h99e6662_0
   - numpy-base=1.17.2=py37h6575580_0
-  - openssl=1.1.1d=h1de35cc_3
+  - openssl=1.1.1=h1de35cc_0
   - pandas=0.25.2=py37h0a44026_0
   - pbr=5.4.3=py_0
   - pip=19.3.1=py37_0
@@ -49,7 +50,6 @@ dependencies:
   - psutil=5.6.3=py37h1de35cc_0
   - pycparser=2.19=py37_1
   - pyopenssl=19.0.0=py37_0
-  - pyrsistent=0.15.4=py37h1de35cc_0
   - pysocks=1.7.1=py37_0
   - python=3.7.3=h93065d6_1
   - python-dateutil=2.8.0=py37_0
@@ -58,6 +58,7 @@ dependencies:
   - readline=8.0=hcfe32e1_0
   - requests=2.22.0=py37_1
   - retrying=1.3.3=py37_2
+  - scipy=1.3.1=py37h1410ff5_0
   - setuptools=41.6.0=py37_0
   - six=1.12.0=py37_0
   - smmap2=2.0.5=py37_0
@@ -72,23 +73,9 @@ dependencies:
   - zipp=0.6.0=py_0
   - zlib=1.2.11=h0b31af3_1006
   - pip:
-    - appdirs==1.4.3
-    - attrs==19.3.0
     - configargparse==0.15.1
-    - datrie==0.8
-    - docutils==0.15.2
-    - gitdb2==2.0.6
-    - gitpython==3.0.4
-    - importlib-metadata==0.23
-    - jsonschema==3.1.1
-    - more-itertools==7.2.0
-    - psutil==5.6.3
     - pyrsistent==0.15.5
-    - pyyaml==5.1.2
     - ratelimiter==1.2.0.post0
-    - smmap2==2.0.5
     - snakemake==5.7.1
-    - wrapt==1.11.2
-    - zipp==0.6.0
-prefix: /usr/local/Caskroom/miniconda/base/envs/moshi-env
+prefix: /usr/local/Caskroom/miniconda/base/envs/moshi-env2
 
diff --git a/rules/features.snakefile b/rules/features.snakefile
index 5c6f4483..125cee80 100644
--- a/rules/features.snakefile
+++ b/rules/features.snakefile
@@ -56,6 +56,6 @@ rule activity_metrics:
     input:
         "data/raw/{pid}/plugin_google_activity_recognition_with_datetime.csv"
     output:
-        "data/processed/{pid}/activity_extracted.csv"
+        "data/processed/{pid}/google_activity_recognition.csv"
     script:
-        "../src/features/activity_recognition.py"
+        "../src/features/google_activity_recognition.py"
diff --git a/src/features/activity_recognition.py b/src/features/google_activity_recognition.py
similarity index 100%
rename from src/features/activity_recognition.py
rename to src/features/google_activity_recognition.py