From 906caf329b9b0a9687a6a75c53f42b8090525f64 Mon Sep 17 00:00:00 2001 From: Janne Sinivirta Date: Sat, 11 Nov 2017 10:05:09 +0200 Subject: [PATCH] remove two unused or poorly performing indicators --- freqtrade/analyze.py | 2 -- freqtrade/tests/test_hyperopt.py | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index 5c734b24e..e9ef9c290 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -39,9 +39,7 @@ def populate_indicators(dataframe: DataFrame) -> DataFrame: dataframe['sma'] = ta.SMA(dataframe, timeperiod=40) dataframe['tema'] = ta.TEMA(dataframe, timeperiod=9) dataframe['mfi'] = ta.MFI(dataframe) - dataframe['cci'] = ta.CCI(dataframe) dataframe['rsi'] = ta.RSI(dataframe) - dataframe['mom'] = ta.MOM(dataframe) dataframe['ema5'] = ta.EMA(dataframe, timeperiod=5) dataframe['ema10'] = ta.EMA(dataframe, timeperiod=10) dataframe['ema50'] = ta.EMA(dataframe, timeperiod=50) diff --git a/freqtrade/tests/test_hyperopt.py b/freqtrade/tests/test_hyperopt.py index fce55fb08..40dd62607 100644 --- a/freqtrade/tests/test_hyperopt.py +++ b/freqtrade/tests/test_hyperopt.py @@ -32,8 +32,6 @@ def buy_strategy_generator(params): conditions.append(dataframe['fastd'] < params['fastd']['value']) if params['adx']['enabled']: conditions.append(dataframe['adx'] > params['adx']['value']) - if params['cci']['enabled']: - conditions.append(dataframe['cci'] < params['cci']['value']) if params['rsi']['enabled']: conditions.append(dataframe['rsi'] < params['rsi']['value']) if params['over_sar']['enabled']: @@ -99,11 +97,7 @@ def test_hyperopt(backtest_conf, backdata, mocker): ]), 'adx': hp.choice('adx', [ {'enabled': False}, - {'enabled': True, 'value': hp.uniform('adx-value', 10, 30)} - ]), - 'cci': hp.choice('cci', [ - {'enabled': False}, - {'enabled': True, 'value': hp.uniform('cci-value', -150, -100)} + {'enabled': True, 'value': hp.uniform('adx-value', 10, 50)} ]), 'rsi': hp.choice('rsi', [ {'enabled': False},