From 886b47589e89ee32108ce16a064f3faa42329758 Mon Sep 17 00:00:00 2001 From: brinnaebent Date: Fri, 5 Jun 2020 17:04:57 -0400 Subject: [PATCH] Fixed small errors --- setup.py | 4 ++-- wearablevar/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index f56ef8c..ade29b1 100644 --- a/setup.py +++ b/setup.py @@ -2,10 +2,10 @@ setup(name='wearablevar', packages = ['wearablevar'], - version='0.2', + version='0.3', description='Variability Metrics from Longitudinal Wearable Sensors', url='https://github.com/brinnaebent/wearablevar', - download_url = 'https://github.com/brinnaebent/wearablevar/archive/0.2.tar.gz', + download_url = 'https://github.com/brinnaebent/wearablevar/archive/0.3.tar.gz', author='Brinnae Bent', author_email='runsdata@gmail.com', keywords = ['wearables', 'features', 'feature engineering'], diff --git a/wearablevar/__init__.py b/wearablevar/__init__.py index 3479c35..09cef03 100644 --- a/wearablevar/__init__.py +++ b/wearablevar/__init__.py @@ -29,7 +29,7 @@ ''' -def importe4(filename, f = '%Y-%m-%d %H:%M:%S.%f'): +def importe4(filename, f='%Y-%m-%d %H:%M:%S.%f'): """ Function for importing and formatting for use with other functions. Args: @@ -44,7 +44,7 @@ def importe4(filename, f = '%Y-%m-%d %H:%M:%S.%f'): df = df.reset_index() return df -def importe4acc(filename, f = '%Y-%m-%d %H:%M:%S.%f'): +def importe4acc(filename, f='%Y-%m-%d %H:%M:%S.%f'): """ Function for importing and formatting for use with other functions. Args: @@ -98,7 +98,7 @@ def intradaycv(df): intradaycv = [] for i in pd.unique(df['Day']): - intradaycv.append(interdaycv_(df[df['Day']==i])) + intradaycv.append(interdaycv(df[df['Day']==i])) intradaycv_mean = np.mean(intradaycv) intradaycv_median = np.median(intradaycv)