MAINT hwc colum renaming and reqs update

This commit is contained in:
Kevin Johnson
2021-07-04 09:58:14 -07:00
parent 1deb7559f6
commit 5d83ddf561
3 changed files with 16 additions and 12 deletions
+3 -2
View File
@@ -131,7 +131,6 @@ AlphaVantageAPI/
# Data & NB Exclusions
*.csv
jnb/*.ipynb
data/datas.csv
data/f500.csv
data/GLD_D_tv.csv
@@ -142,4 +141,6 @@ data/SPY_D_TV2.csv
data/SPY_D_TV3.csv
data/TV_5min.csv
data/tulip.csv
examples/*.csv
examples/*.csv
jnb/*.ipynb
jnb/*.txt
+8 -8
View File
@@ -85,25 +85,25 @@ def hwc(close, na=None, nb=None, nc=None, nd=None, scalar=None, channel_eval=Non
# Name and Categorize it
# suffix = f'{str(na).replace(".", "")}-{str(nb).replace(".", "")}-{str(nc).replace(".", "")}'
hwc.name = 'HW-MID'
hwc_upper.name = "HW-UPPER"
hwc_lower.name = "HW-LOWER"
hwc.name = "HWM"
hwc_upper.name = "HWU"
hwc_lower.name = "HWL"
hwc.category = hwc_upper.category = hwc_lower.category = "volatility"
if channel_eval:
hwc_width.name = 'HW-WIDTH'
hwc_pctwidth.name = 'HW-PCTW'
hwc_width.name = "HWW"
hwc_pctwidth.name = "HWPCT"
# Prepare DataFrame to return
if channel_eval:
data = {hwc.name: hwc, hwc_upper.name: hwc_upper, hwc_lower.name: hwc_lower,
hwc_width.name: hwc_width, hwc_pctwidth.name: hwc_pctwidth}
df = DataFrame(data)
df.name = "hwc"
df.name = "HWC"
df.category = hwc.category
else:
data = {hwc.name: hwc, hwc_upper.name: hwc_upper, hwc_lower.name: hwc_lower}
df = DataFrame(data)
df.name = "hwc"
df.name = "HWC"
df.category = hwc.category
return df
@@ -149,5 +149,5 @@ Kwargs:
fillna (value, optional): pd.DataFrame.fillna(value)
fill_method (value, optional): Type of fill method
Returns:
pd.DataFrame: HW-MID, HW-UPPER, HW-LOWER columns.
pd.DataFrame: HWM (Mid), HWU (Upper), HWL (Lower) columns.
"""
+5 -2
View File
@@ -1,2 +1,5 @@
numpy>=1.20.2
pandas>=1.2.4
numpy==1.21.0
pandas==1.3.0
python-dateutil==2.8.1
pytz==2021.1
six==1.16.0