Skip to content

Commit

Permalink
Merge pull request freqtrade#158 from JoeSchr/chore/remove-aroon
Browse files Browse the repository at this point in the history
Remove `aroon` in favor of ta.AROON
  • Loading branch information
xmatthias authored Feb 15, 2021
2 parents daa2fac + 5b8f265 commit 94bb669
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ The following indicators are available and have been 'wrapped' to be used on a d
* [chaikin_money_flow](https://www.tradingview.com/wiki/Chaikin_Money_Flow_(CMF)) - Chaikin Money Flow, requires dataframe and period
* [accumulation_distribution](https://www.investopedia.com/terms/a/accumulationdistribution.asp) - requires a dataframe
* osc - requires a dataframe and the periods
* [aroon](https://www.investopedia.com/terms/a/aroon.asp) - dataframe, period, field
* [atr](https://www.investopedia.com/terms/a/atr.asp) - dataframe, period, field
* [atr_percent](https://www.investopedia.com/terms/a/atr.asp) - dataframe, period, field
* [bollinger_bands](https://www.investopedia.com/terms/b/bollingerbands.asp) - dataframe, period, stdv, field, prefix
Expand Down Expand Up @@ -85,7 +84,7 @@ dataframe_long['rsi'] = ta.RSI(dataframe_long)
dataframe = resampled_merge(dataframe, dataframe_long, fill_na=True)

"""
The resulting dataframe will have 5 resampled columns in addition to the regular columns,
The resulting dataframe will have 5 resampled columns in addition to the regular columns,
following the template resample_<interval_in_minutes>_<orig_column_name>.
So in the above example:
['resample_240_open', 'resample_240_high', 'resample_240_low','resample_240_close', 'resample_240_rsi']
Expand Down
10 changes: 0 additions & 10 deletions technical/indicators/momentum.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"""

from numpy.core.records import ndarray
from pandas import DataFrame


########################################
Expand All @@ -14,16 +13,7 @@
# ADX Average Directional Movement Index
# ADXR Average Directional Movement Index Rating
# APO Absolute Price Oscillator

# AROON Aroon
def aroon(dataframe, period=25, field='close', colum_prefix="aroon") -> DataFrame:
from pyti.aroon import aroon_up as up
from pyti.aroon import aroon_down as down
dataframe["{}_up".format(colum_prefix)] = up(dataframe[field], period)
dataframe["{}_down".format(colum_prefix)] = down(dataframe[field], period)
return dataframe


# AROONOSC Aroon Oscillator
# BOP Balance Of Power

Expand Down
12 changes: 0 additions & 12 deletions tests/test_indicators.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
import pytest


@pytest.mark.skip(reason="this fails right now")
def test_arron(testdata_1m_btc):
from technical.indicators import aroon

print()
print(testdata_1m_btc)

result = aroon(testdata_1m_btc)

print(result)


def test_atr(testdata_1m_btc):
from technical.indicators import atr

Expand Down

0 comments on commit 94bb669

Please sign in to comment.