Skip to content

Commit

Permalink
Fixed errors with indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
brinnaebent committed Jun 5, 2020
1 parent 3119203 commit bfe28ef
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
version='0.1',
description='Variability Metrics from Longitudinal Wearable Sensors',
url='https://github.com/brinnaebent/wearablevar',
download_url = 'https://github.com/brinnaebent/wearablevar/archive/0.1.tar.gz'
download_url = 'https://github.com/brinnaebent/wearablevar/archive/0.1.tar.gz',
author='Brinnae Bent',
author_email='[email protected]',
keywords = ['wearables', 'features', 'feature engineering'],
Expand Down
15 changes: 8 additions & 7 deletions wearablevar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def interdaysd(df):
return interdaysd

def intradaycv(df):
"""
"""
computes the intradaycv, returns the mean, median, and sd of intraday cv Sensor column in pandas dataframe
Args:
df (pandas.DataFrame):
Expand All @@ -94,6 +94,7 @@ def intradaycv(df):
intradaycv_sd (IntegerType): SD of intraday coefficient of variation
"""
intradaycv = []

for i in pd.unique(df['Day']):
intradaycv.append(interdaycv_(df[df['Day']==i]))

Expand All @@ -104,15 +105,15 @@ def intradaycv(df):
return intradaycv_mean, intradaycv_median, intradaycv_sd

def intradaysd(df):
"""
"""
computes the intradaysd, returns the mean, median, and sd of intraday sd Sensor column in pandas dataframe
Args:
df (pandas.DataFrame):
Returns:
intradaysd_mean (IntegerType): Mean, Median, and SD of intraday standard deviation
intradaysd_median (IntegerType): Median of intraday standard deviation
intradaysd_sd (IntegerType): SD of intraday standard deviation
"""
"""
intradaysd =[]
for i in pd.unique(df['Day']):
intradaysd.append(np.std(df[df['Day']==i]))
Expand All @@ -124,7 +125,7 @@ def intradaysd(df):
return intradaysd_mean, intradaysd_median, intradaysd_sd

def intradaymean(df):
"""
"""
computes the intradaymean, returns the mean, median, and sd of the intraday mean of the Sensor data
Args:
df (pandas.DataFrame):
Expand All @@ -144,8 +145,8 @@ def intradaymean(df):
return intradaymean_mean, intradaymean_median, intradaymean_sd


def TIR(df, sd=1, sr=1)):
"""
def TIR(df, sd=1, sr=1):
"""
computes time in the range of (default=1 sd from the mean) sensor column in pandas dataframe
Args:
df (pandas.DataFrame):
Expand Down Expand Up @@ -179,7 +180,7 @@ def TOR(df, sd=1, sr=1):


def POR(df, sd=1, sr=1):
"""
"""
computes percent time outside the range of (default=1 sd from the mean) sensor column in pandas dataframe
Args:
df (pandas.DataFrame):
Expand Down

0 comments on commit bfe28ef

Please sign in to comment.