Skip to content

Commit

Permalink
Merge pull request #16 from PfizerRD/development
Browse files Browse the repository at this point in the history
Update to version 0.2.0
  • Loading branch information
LukasAdamowicz authored Oct 30, 2020
2 parents 5e344f4 + 3482128 commit ed90430
Show file tree
Hide file tree
Showing 62 changed files with 5,481 additions and 992 deletions.
21 changes: 21 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[run]
data_file = coverage/.coverage
omit =
# setup files
*setup.py
# init files
*__init__.py
# version file
*version.py
source = src/

[report]
# regexes for lines to exclude from consideration
exclude_lines =
pragma: no cover
def __repr__
def __str__
if version_info

[html]
directory = coverage
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
.idea/*
.idea*

# other
.DS_Store


# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -138,3 +141,4 @@ dmypy.json
!src/skimu/features/lib/
/docs/ref/gait/generated/
/docs/**/generated/
/coverage/
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
# -----------------------------------------------------------------------------
intersphinx_mapping = {
'python': ('https://docs.python.org/dev', None),
'numpy': ('https://numpy.org/doc/stable/reference/index.html', None),
'numpy': ('https://numpy.org/doc/stable/', None),
'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
'pandas': ('https://pandas.pydata.org/pandas-docs/stable', None),
}
Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
contain the root `toctree` directive.
Welcome to SciKit-IMU's documentation!
=================================
======================================

.. image:: https://github.com/PfizerRD/scikit-imu/workflows/skimu/badge.svg)
.. image:: https://github.com/PfizerRD/scikit-imu/workflows/skimu/badge.svg
:alt: GitHub Actions Badge

`Scikit-IMU` is a Python package with methods for reading, pre-processing, manipulating, and analyzing Inertial Meausurement Unit data. `SciKit-IMU` contains the following sub-modules:
`SciKit-IMU` is a Python package with methods for reading, pre-processing, manipulating, and analyzing Inertial Meausurement Unit data. `scikit-imu` contains the following sub-modules:

sit2stand
---------
Expand Down
7 changes: 5 additions & 2 deletions docs/ref/index.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
.. _skimu api reference
API Reference
================
=============

.. toctree::
:maxdepth: 2

skimu
read
features
gait
features
sit2stand
2 changes: 2 additions & 0 deletions docs/ref/read.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.. automodule:: skimu.read
:ignore-module-all:
2 changes: 2 additions & 0 deletions docs/ref/sit2stand.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.. automodule:: skimu.sit2stand
:ignore-module-all:
2 changes: 2 additions & 0 deletions docs/ref/skimu.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.. automodule:: skimu
:ignore-module-all:
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ def parse_setuppy_commands():
'scipy>=1.3.1',
'pandas>=0.23.4',
'lightgbm>=2.3.0',
'pywavelets'
'pywavelets',
'scikit-learn' # needed for lightgbm
]

if sys.version_info < (3, 7):
Expand Down Expand Up @@ -204,7 +205,8 @@ def configuration(parent_package='', top_path=None):
# ========================
config.add_data_files(
('skimu/gait/model', 'src/skimu/gait/model/final_features.json'),
('skimu/gait/model', 'src/skimu/gait/model/lgbm_gait_classifier_no-stairs.lgbm')
('skimu/gait/model', 'src/skimu/gait/model/lgbm_gait_classifier_no-stairs_50hz.lgbm'),
('skimu/gait/model', 'src/skimu/gait/model/lgbm_gait_classifier_no-stairs_20hz.lgbm')
)
# ========================

Expand Down
29 changes: 28 additions & 1 deletion src/skimu/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,35 @@
"""
Scikit IMU (:mod:`skimu`)
=======================================
.. currentmodule:: skimu
Pipeline Processing
-------------------
.. autosummary::
:toctree: generated/
Pipeline
Utility Functions
-----------------
.. autosummary::
:toctree: generated/
utility.compute_window_samples
utility.get_windowed_view
"""
from skimu.version import __version__

from skimu.pipeline import Pipeline
from skimu import utility

from skimu import gait
from skimu import sit2stand
from skimu import features
from skimu import read

__skimu_version__ = __version__
__all__ = ['gait', 'sit2stand', 'features', '__skimu_version__']
__all__ = ['Pipeline', 'gait', 'sit2stand', 'read', 'features', 'utility', '__skimu_version__']
66 changes: 0 additions & 66 deletions src/skimu/activity/core.py

This file was deleted.

156 changes: 0 additions & 156 deletions src/skimu/activity/metrics.py

This file was deleted.

Loading

0 comments on commit ed90430

Please sign in to comment.