fix: resolve merge conflict

The-Motor-Unit · May 20, 2022 · 3331f42 · 3331f42
2 parents 635b913 + 9fd71c5
commit 3331f42
Show file tree

Hide file tree

Showing 7 changed files with 826 additions and 85 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -26,11 +26,11 @@ jobs:
     - name: Test with pytest
       run: poetry run pytest tests/ --cov=emgdecompy --cov-report=xml
 
-# Can't use Codecov because repo is private
-#     - name: Use Codecov to track coverage
-#       uses: codecov/codecov-action@v2
-#       with:
-#         files: ./coverage.xml   # coverage report
+    - name: Use Codecov to track coverage
+      uses: codecov/codecov-action@v2
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.xml   # coverage report
 
     - name: Build documentation
       run: poetry run make html --directory docs/
@@ -84,7 +84,7 @@ jobs:
           pip install \
           --index-url https://test.pypi.org/simple/ \
           --extra-index-url https://pypi.org/simple \
-          emg-decompy
+          emgdecompy
 
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,89 @@
 
 <!--next-version-placeholder-->
 
+## v0.2.0 (2022-05-19)
+### Feature
+* Add whiten function to emg-decompy.py ([`3682a09`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/3682a0977e1eca8268e109d5dea808963674d1a7))
+* Create functions script, debug extension functions, write docstrings ([`af7e346`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/af7e3469e4abea67eb44884cf423f1fb1fe2a0e7))
+
+### Fix
+* Correct package name ([`233aac0`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/233aac0bd2dceaa03af9385dd60960e9f7ceb767))
+* Incorrectly called create_emg_data() ([`fe93f12`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/fe93f12b76edff9cf58cb68020c45659268cef6e))
+* Rearrange functions so create_emg_data() defined before called in test functions ([`7a6c50b`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/7a6c50b1ec4437934eec4282475b56f42bb2f86a))
+* Tweak create_emg_data to use np.empty so that shape is consistent with real data ([`97d67c9`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/97d67c9ef6c663e4aab3c31167dd6775a1a313c1))
+* Tweak test_flatten_signal to test for empty arrays pre-flatten ([`a7c0da4`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/a7c0da45dd6f07dc81c05a7409505e6723cbbac1))
+* Small change to create_emg_data() function to not allow 1 dimensional arrays to be created ([`e744a7c`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/e744a7c704cfdfba43fd37003d47f0bae9de231c))
+* Change output dimensions so there are no 'channels' ([`3cacf69`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/3cacf69dc747bbabbe75505822f78e208dba72ce))
+* Add reg factor to whiten but leave commented out ([`7491d10`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/7491d10378f6ea6f23f9604273fd04d2368d90c9))
+* Fix transpose error ([`265592e`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/265592e5a45324e62f48190f4e44cd8c286dbb1d))
+* Correct test name for extend_all_channels ([`8f787ec`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/8f787eceb08468705dc07ea0c8cfb540ce9a4aef))
+* Import linalg from scipy ([`0ad2d15`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/0ad2d152557c656add1bf44e603d0a2d3bab4c19))
+* Properly call center_matrix function ([`db209b3`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/db209b3b47062d3c38a0f4abc604ae3b53d8b01e))
+* Output correct dimensions for extend_all_channels() ([`deba7a4`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/deba7a4b0f2d5ae8e14026607c3ec774f9ce6d25))
+* Get rid of codecov because repo is private ([`dd2bb66`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/dd2bb66954bed78714abe962e1bac58e769e74c6))
+* Extend() function now outputs what we agreed upon ([`98cfa16`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/98cfa16bc36207cd5d7f89aa4263d202ef750d61))
+* Figures were all showing weird, adding fig.pos='h' fixed it ([`db47734`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/db477347e20d5fd1b098a968664c3f2cb4454d27))
+* Correct package name ([`f4bf67f`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/f4bf67f01b7e27d1c169e8f7668644eaaed161a8))
+* Correct package name ([`76ae9fb`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/76ae9fbd31c14dd3c16d75eed39750f4bf4b9336))
+* Import packages, reference package name in functions ([`62d839a`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/62d839ad84c9ddd6d66d49ec141cf240dfbce419))
+* Remove packages line ([`1d0a6be`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/1d0a6be7eeb5bc9c7f363f893e966a1034bc7c24))
+* Correct package name ([`0163446`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/0163446f8afebdbb52cd22c379a35ea622d80e89))
+* Fix merge conflict and import emgdecompy ([`0005d9f`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/0005d9fb573367ece1a3f7eb5616bd349d7daefa))
+* Changing file name to new package ([`a8c18d5`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/a8c18d585c1a1f6d31324208f5e0cbc70a9c611d))
+* Changing package name in all documents ([`22f3129`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/22f3129ce2d37fd585a38c66dd78fd19fd43d4c0))
+* Put vector extension tests within functions ([`9b2fd18`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/9b2fd187c6821ff2f8733a6847a085a65157343f))
+
+### Documentation
+* Update creator names ([`42f581e`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/42f581e52c90a2e0f7d8c5ca2d11ddfe91132105))
+* Add codecov badge ([`a778710`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/a778710bea0a1c3fd8129241aec38fe6924e0042))
+* Update package name in test_extend_input_by_R ([`f3022da`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/f3022da9f77a3d282607c887396845625684c6a6))
+* Minor docstring inconsistencies in extend_all_channels() ([`ce5fdd8`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/ce5fdd8dc8869a3c55cc044105adebef975d503b))
+* Add clarification comment to test_flatten() according to Jasmine's feedback ([`bcc735c`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/bcc735cbed770547beacf584a1579ab481e3ba00))
+* Fix doc string for test_extend_by_R() ([`79490f4`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/79490f462fa946c123b747b38187e2cc919c0fc7))
+* Fix reference on page 2 ([`ee57a46`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/ee57a467b95ee92df39bc3dcf252146a7c31c590))
+* Make docstrings simpler and improve code commenting ([`5b397c0`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/5b397c0607d72df06b16160fa71c7e07dd0c2434))
+* Correct format of examples in center_matrix and make it simpler ([`200bd66`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/200bd6655a663221907b8776865d511fbf17bf85))
+* Correct docstring for extend_input_by_R ([`3e8e9df`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/3e8e9df975228029caa32f3e6eb9bad2301d4a58))
+* Fix grammar in docstrings ([`1190161`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/1190161f5c5e63e5af1c5774a561a303d25a0226))
+* Correct examples line in docstrings ([`9a4441a`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/9a4441af7f5e0282a6301b3e6a693bf31fa83556))
+* Correct spelling of fibre in summary ([`ea95835`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/ea95835c487ab4beaec90a2be9c2a71cbdce73b6))
+* Bold figure cross-references' ([`45a361f`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/45a361ff13ad7e677d474db1907d0a0250c014ff))
+* Made corrections to wordings, citations, figure locations ([`9c48f68`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/9c48f689152b73261b8974571f43dfa86bd9884d))
+* Replace emg hardware image ([`dc33fae`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/dc33faee41497ed10d001c978f48cac759f5d739))
+* Replace ot screenshot with higher quality one ([`ab702a6`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/ab702a68a9f1387c77d77b555cd4bae50d8e725d))
+* Replace ot screenshot with higher quality one ([`80cfd4b`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/80cfd4bbc13703eae55d96db9f7412f3b6dd9b7a))
+* Add visual of algorithm ([`e88f15d`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/e88f15d4c8b78f6c999ac41bb4be93b34531610a))
+* Edit Timeline ([`c4b210b`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/c4b210b1a0ef511902ce8c0c94307018821094d0))
+* Add more citations and figures ([`80de991`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/80de99168ac46dc829d178f74830edd9a3cf14d1))
+* Update timeline ([`afd53d2`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/afd53d2492b52a2d432bb6a812ca6182ef841ab6))
+* Add raw EMG image ([`b638e46`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/b638e46fb9bf4d91d84f21e2461b21625ac78c5f))
+* Fix Tools sections based on Alexi's feedback ([`6f64943`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/6f64943da4338915c61a88798acfd7098b6a8a26))
+* Fix package name ([`eb2b26a`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/eb2b26ae30761a5e78eff405be74ebcf958f81a1))
+* Add Alexi's corrections ([`5317c70`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/5317c7048ddb7b0c6f4bf65a70f396f75542c0cb))
+* Fix badge formatting ([`f4aa37d`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/f4aa37d84bdfb08e17e90e52b2d165a43688c183))
+* Add ci-cd badge ([`1d3cbf9`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/1d3cbf9c74c6608a1b7d03234e903818bd68e10a))
+* Change package description ([`16bf912`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/16bf91282eb532923487b43bfb0bb91bde34b0b7))
+* Bottleneck is spelled with an e lol ([`9fb41bc`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/9fb41bcf3982791ea1a7ad82f3384277fe336210))
+* Improve docstring based on Daniel's advice ([`7848f49`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/7848f49e0b35078a93e28ba28024fdd13a13b72c))
+* Add proposal section to README ([`89618b6`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/89618b66b3de0ced78df0435a48067308cbf998a))
+* Create layout of proposal and render to pdf ([`423d6b3`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/423d6b314338de95b8ac827adfd83dd07b9e632c))
+* Make corrections ([`adaa064`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/adaa0648e5959313c804fbc46abfec7684378cb1))
+* Add bibtex references ([`b299959`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/b299959789f45c7f26b01ba5e87cb2d65519a5d2))
+* Fix section on the interactive learning component ([`e8fc753`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/e8fc753f0d41f4ff9baa13415d3b96c641239ec6))
+* Make some edits and add bibtex ([`6b79ea7`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/6b79ea709d32ff665abe282748ad4f200bb5e3cd))
+* Remove obsolete citations file ([`1483e64`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/1483e6409ce389084dfe50d9a358d9574722bbc2))
+* Fix line breaks ([`a1707a6`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/a1707a6cd0a4698fb40cab04b3ea23cfc8f82761))
+* Make corrections to techniques section and add bibtex ([`d4af629`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/d4af629aaf795aa95645cd632a34e0030de27c03))
+* Remove html output ([`9107441`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/9107441ee64cafee5a7b3e3ed80f0b417ad103a5))
+* Move titles from child docs to parent doc ([`0abf1d6`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/0abf1d6696fc18037fe94e7978d535510948457b))
+* Create bibtex file ([`f5c6920`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/f5c692040951357e3cf3ef6643723771d22e8f1c))
+* Add title to data science technique section ([`f3ff884`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/f3ff884aa0cc0a1dbe5c6cb65dc4d17910099dce))
+* Add yaml metadata ([`0a625c1`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/0a625c1cff2f5028070b4aeb7735e39e263af122))
+* Add proposal intro rmd ([`472635a`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/472635a024c725f713f995a6b904d857b7c32e86))
+* Rewrite tools section to use sentenses instead of bullet points ([`503a4c2`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/503a4c2bdf83500a0750d02998eb90314e09c387))
+* Create proposal folder and components ([`042a808`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/042a8086c45bbc27bb9a76a1fcfba0a845f81f48))
+* Create teamwork contract ([`272638c`](https://github.com/UBC-SPL-MDS/EMGdecomPy/commit/272638c07cc0bf64372c88c4ccb4ec13de913c12))
+
 ## v0.1.0 (03/05/2022)
 
 - First release of `emgdecompy`!
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # emgdecompy
 [![ci-cd](https://github.com/UBC-SPL-MDS/emg-decomPy/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/UBC-SPL-MDS/emg-decomPy/actions/workflows/ci-cd.yml)
+[![codecov](https://codecov.io/gh/UBC-SPL-MDS/EMGdecomPy/branch/main/graph/badge.svg?token=78ZU40UEOE)](https://codecov.io/gh/UBC-SPL-MDS/EMGdecomPy)
+
 
 A package for decomposing raw EMG signals into individual motor unit activity.
 
@@ -27,7 +29,7 @@ Interested in contributing? Check out the contributing guidelines. Please note t
 
 ## License
 
-`emgdecompy` was created by Daniel King. It is licensed under the terms of the MIT license.
+`emgdecompy` was created by Daniel King, Jasmine Ortega, Rada Rudyak, and Rowan Sivanandam. It is licensed under the terms of the MIT license.
 
 ## Credits