4 more tests
This commit is contained in:
Stefano
@@ -16,7 +16,6 @@ class RecursiveAnalysisSubFunctions:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def text_table_recursive_analysis_instances(
|
def text_table_recursive_analysis_instances(
|
||||||
config: Dict[str, Any],
|
|
||||||
recursive_instances: List[RecursiveAnalysis]):
|
recursive_instances: List[RecursiveAnalysis]):
|
||||||
startups = recursive_instances[0]._startup_candle
|
startups = recursive_instances[0]._startup_candle
|
||||||
headers = ['indicators']
|
headers = ['indicators']
|
||||||
@@ -99,7 +98,7 @@ class RecursiveAnalysisSubFunctions:
|
|||||||
# report the results
|
# report the results
|
||||||
if RecursiveAnalysis_instances:
|
if RecursiveAnalysis_instances:
|
||||||
RecursiveAnalysisSubFunctions.text_table_recursive_analysis_instances(
|
RecursiveAnalysisSubFunctions.text_table_recursive_analysis_instances(
|
||||||
config, RecursiveAnalysis_instances)
|
RecursiveAnalysis_instances)
|
||||||
else:
|
else:
|
||||||
logger.error("There were no strategies specified neither through "
|
logger.error("There were no strategies specified neither through "
|
||||||
"--strategy nor through "
|
"--strategy nor through "
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ def recursive_conf(default_conf_usdt):
|
|||||||
Path(__file__).parent.parent / "strategy/strats")
|
Path(__file__).parent.parent / "strategy/strats")
|
||||||
default_conf_usdt['strategy'] = 'strategy_test_v3_recursive_issue'
|
default_conf_usdt['strategy'] = 'strategy_test_v3_recursive_issue'
|
||||||
default_conf_usdt['pairs'] = ['UNITTEST/USDT']
|
default_conf_usdt['pairs'] = ['UNITTEST/USDT']
|
||||||
|
default_conf_usdt['startup_candle'] = [100]
|
||||||
return default_conf_usdt
|
return default_conf_usdt
|
||||||
|
|
||||||
|
|
||||||
@@ -54,11 +55,11 @@ def recursive_conf(default_conf_usdt):
|
|||||||
|
|
||||||
# # Test invalid config
|
# # Test invalid config
|
||||||
# args = [
|
# args = [
|
||||||
# "lookahead-analysis",
|
# "recursive-analysis",
|
||||||
# "--strategy",
|
# "--strategy",
|
||||||
# "strategy_test_v3_with_lookahead_bias",
|
# "strategy_test_v3_with_recursive_bias",
|
||||||
# "--strategy-path",
|
# "--strategy-path",
|
||||||
# str(Path(__file__).parent.parent / "strategy/strats/lookahead_bias"),
|
# str(Path(__file__).parent.parent / "strategy/strats/recursive_bias"),
|
||||||
# "--targeted-trade-amount",
|
# "--targeted-trade-amount",
|
||||||
# "10",
|
# "10",
|
||||||
# "--minimum-trade-amount",
|
# "--minimum-trade-amount",
|
||||||
@@ -68,15 +69,15 @@ def recursive_conf(default_conf_usdt):
|
|||||||
# pargs['config'] = None
|
# pargs['config'] = None
|
||||||
# with pytest.raises(OperationalException,
|
# with pytest.raises(OperationalException,
|
||||||
# match=r"Targeted trade amount can't be smaller than minimum trade amount.*"):
|
# match=r"Targeted trade amount can't be smaller than minimum trade amount.*"):
|
||||||
# start_lookahead_analysis(pargs)
|
# start_recursive_analysis(pargs)
|
||||||
|
|
||||||
# # Missing timerange
|
# # Missing timerange
|
||||||
# args = [
|
# args = [
|
||||||
# "lookahead-analysis",
|
# "recursive-analysis",
|
||||||
# "--strategy",
|
# "--strategy",
|
||||||
# "strategy_test_v3_with_lookahead_bias",
|
# "strategy_test_v3_with_recursive_bias",
|
||||||
# "--strategy-path",
|
# "--strategy-path",
|
||||||
# str(Path(__file__).parent.parent / "strategy/strats/lookahead_bias"),
|
# str(Path(__file__).parent.parent / "strategy/strats/recursive_bias"),
|
||||||
# "--pairs",
|
# "--pairs",
|
||||||
# "UNITTEST/BTC",
|
# "UNITTEST/BTC",
|
||||||
# "--max-open-trades",
|
# "--max-open-trades",
|
||||||
@@ -86,10 +87,10 @@ def recursive_conf(default_conf_usdt):
|
|||||||
# pargs['config'] = None
|
# pargs['config'] = None
|
||||||
# with pytest.raises(OperationalException,
|
# with pytest.raises(OperationalException,
|
||||||
# match=r"Please set a timerange\..*"):
|
# match=r"Please set a timerange\..*"):
|
||||||
# start_lookahead_analysis(pargs)
|
# start_recursive_analysis(pargs)
|
||||||
|
|
||||||
|
|
||||||
# def test_lookahead_helper_invalid_config(recursive_conf) -> None:
|
# def test_recursive_helper_invalid_config(recursive_conf) -> None:
|
||||||
# conf = deepcopy(recursive_conf)
|
# conf = deepcopy(recursive_conf)
|
||||||
# conf['targeted_trade_amount'] = 10
|
# conf['targeted_trade_amount'] = 10
|
||||||
# conf['minimum_trade_amount'] = 40
|
# conf['minimum_trade_amount'] = 40
|
||||||
@@ -98,7 +99,7 @@ def recursive_conf(default_conf_usdt):
|
|||||||
# RecursiveAnalysisSubFunctions.start(conf)
|
# RecursiveAnalysisSubFunctions.start(conf)
|
||||||
|
|
||||||
|
|
||||||
# def test_lookahead_helper_no_strategy_defined(recursive_conf):
|
# def test_recursive_helper_no_strategy_defined(recursive_conf):
|
||||||
# conf = deepcopy(recursive_conf)
|
# conf = deepcopy(recursive_conf)
|
||||||
# conf['pairs'] = ['UNITTEST/USDT']
|
# conf['pairs'] = ['UNITTEST/USDT']
|
||||||
# del conf['strategy']
|
# del conf['strategy']
|
||||||
@@ -107,229 +108,72 @@ def recursive_conf(default_conf_usdt):
|
|||||||
# RecursiveAnalysisSubFunctions.start(conf)
|
# RecursiveAnalysisSubFunctions.start(conf)
|
||||||
|
|
||||||
|
|
||||||
# def test_lookahead_helper_start(recursive_conf, mocker) -> None:
|
def test_recursive_helper_start(recursive_conf, mocker) -> None:
|
||||||
# single_mock = MagicMock()
|
single_mock = MagicMock()
|
||||||
# text_table_mock = MagicMock()
|
text_table_mock = MagicMock()
|
||||||
# mocker.patch.multiple(
|
mocker.patch.multiple(
|
||||||
# 'freqtrade.optimize.lookahead_analysis_helpers.RecursiveAnalysisSubFunctions',
|
'freqtrade.optimize.recursive_analysis_helpers.RecursiveAnalysisSubFunctions',
|
||||||
# initialize_single_lookahead_analysis=single_mock,
|
initialize_single_recursive_analysis=single_mock,
|
||||||
# text_table_lookahead_analysis_instances=text_table_mock,
|
text_table_recursive_analysis_instances=text_table_mock,
|
||||||
# )
|
)
|
||||||
# RecursiveAnalysisSubFunctions.start(recursive_conf)
|
RecursiveAnalysisSubFunctions.start(recursive_conf)
|
||||||
# assert single_mock.call_count == 1
|
assert single_mock.call_count == 1
|
||||||
# assert text_table_mock.call_count == 1
|
assert text_table_mock.call_count == 1
|
||||||
|
|
||||||
# single_mock.reset_mock()
|
single_mock.reset_mock()
|
||||||
# text_table_mock.reset_mock()
|
text_table_mock.reset_mock()
|
||||||
|
|
||||||
|
|
||||||
# def test_lookahead_helper_text_table_lookahead_analysis_instances(recursive_conf):
|
def test_recursive_helper_text_table_recursive_analysis_instances(recursive_conf):
|
||||||
# analysis = Analysis()
|
dict_diff = dict()
|
||||||
# analysis.has_bias = True
|
dict_diff['rsi'] = {}
|
||||||
# analysis.total_signals = 5
|
dict_diff['rsi'][100] = "0.078%"
|
||||||
# analysis.false_entry_signals = 4
|
|
||||||
# analysis.false_exit_signals = 3
|
|
||||||
|
|
||||||
# strategy_obj = {
|
strategy_obj = {
|
||||||
# 'name': "strategy_test_v3_with_lookahead_bias",
|
'name': "strategy_test_v3_recursive_issue",
|
||||||
# 'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
|
'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
|
||||||
# }
|
}
|
||||||
|
|
||||||
# instance = LookaheadAnalysis(recursive_conf, strategy_obj)
|
instance = RecursiveAnalysis(recursive_conf, strategy_obj)
|
||||||
# instance.current_analysis = analysis
|
instance.dict_recursive = dict_diff
|
||||||
# table, headers, data = (RecursiveAnalysisSubFunctions.
|
table, headers, data = (RecursiveAnalysisSubFunctions.
|
||||||
# text_table_lookahead_analysis_instances(recursive_conf, [instance]))
|
text_table_recursive_analysis_instances([instance]))
|
||||||
|
|
||||||
# # check row contents for a try that has too few signals
|
# check row contents for a try that has too few signals
|
||||||
# assert data[0][0] == 'strategy_test_v3_with_lookahead_bias.py'
|
assert data[0][0] == 'rsi'
|
||||||
# assert data[0][1] == 'strategy_test_v3_with_lookahead_bias'
|
assert data[0][1] == '0.078%'
|
||||||
# assert data[0][2].__contains__('too few trades')
|
assert len(data[0]) == 2
|
||||||
# assert len(data[0]) == 3
|
|
||||||
|
|
||||||
# # now check for an error which occured after enough trades
|
# now check when there is no issue
|
||||||
# analysis.total_signals = 12
|
dict_diff = dict()
|
||||||
# analysis.false_entry_signals = 11
|
instance = RecursiveAnalysis(recursive_conf, strategy_obj)
|
||||||
# analysis.false_exit_signals = 10
|
instance.dict_recursive = dict_diff
|
||||||
# instance = LookaheadAnalysis(recursive_conf, strategy_obj)
|
table, headers, data = (RecursiveAnalysisSubFunctions.
|
||||||
# instance.current_analysis = analysis
|
text_table_recursive_analysis_instances([instance]))
|
||||||
# table, headers, data = (RecursiveAnalysisSubFunctions.
|
assert len(data) == 0
|
||||||
# text_table_lookahead_analysis_instances(recursive_conf, [instance]))
|
|
||||||
# assert data[0][2].__contains__("error")
|
|
||||||
|
|
||||||
# # edit it into not showing an error
|
|
||||||
# instance.failed_bias_check = False
|
|
||||||
# table, headers, data = (RecursiveAnalysisSubFunctions.
|
|
||||||
# text_table_lookahead_analysis_instances(recursive_conf, [instance]))
|
|
||||||
# assert data[0][0] == 'strategy_test_v3_with_lookahead_bias.py'
|
|
||||||
# assert data[0][1] == 'strategy_test_v3_with_lookahead_bias'
|
|
||||||
# assert data[0][2] # True
|
|
||||||
# assert data[0][3] == 12
|
|
||||||
# assert data[0][4] == 11
|
|
||||||
# assert data[0][5] == 10
|
|
||||||
# assert data[0][6] == ''
|
|
||||||
|
|
||||||
# analysis.false_indicators.append('falseIndicator1')
|
|
||||||
# analysis.false_indicators.append('falseIndicator2')
|
|
||||||
# table, headers, data = (RecursiveAnalysisSubFunctions.
|
|
||||||
# text_table_lookahead_analysis_instances(recursive_conf, [instance]))
|
|
||||||
|
|
||||||
# assert data[0][6] == 'falseIndicator1, falseIndicator2'
|
|
||||||
|
|
||||||
# # check amount of returning rows
|
|
||||||
# assert len(data) == 1
|
|
||||||
|
|
||||||
# # check amount of multiple rows
|
|
||||||
# table, headers, data = (RecursiveAnalysisSubFunctions.text_table_lookahead_analysis_instances(
|
|
||||||
# recursive_conf, [instance, instance, instance]))
|
|
||||||
# assert len(data) == 3
|
|
||||||
|
|
||||||
|
|
||||||
# def test_lookahead_helper_export_to_csv(recursive_conf):
|
def test_initialize_single_recursive_analysis(recursive_conf, mocker, caplog):
|
||||||
# import pandas as pd
|
mocker.patch('freqtrade.data.history.get_timerange', get_timerange)
|
||||||
# recursive_conf['lookahead_analysis_exportfilename'] = "temp_csv_lookahead_analysis.csv"
|
patch_exchange(mocker)
|
||||||
|
mocker.patch('freqtrade.plugins.pairlistmanager.PairListManager.whitelist',
|
||||||
|
PropertyMock(return_value=['UNITTEST/BTC']))
|
||||||
|
recursive_conf['pairs'] = ['UNITTEST/BTC']
|
||||||
|
|
||||||
# # just to be sure the test won't fail: remove file if exists for some reason
|
recursive_conf['timeframe'] = '5m'
|
||||||
# # (repeat this at the end once again to clean up)
|
recursive_conf['timerange'] = '20180119-20180122'
|
||||||
# if Path(recursive_conf['lookahead_analysis_exportfilename']).exists():
|
start_mock = mocker.patch('freqtrade.optimize.recursive_analysis.RecursiveAnalysis.start')
|
||||||
# Path(recursive_conf['lookahead_analysis_exportfilename']).unlink()
|
strategy_obj = {
|
||||||
|
'name': "strategy_test_v3_recursive_issue",
|
||||||
|
'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
|
||||||
|
}
|
||||||
|
|
||||||
# # before we can start we have to delete the
|
instance = RecursiveAnalysisSubFunctions.initialize_single_recursive_analysis(
|
||||||
|
recursive_conf, strategy_obj)
|
||||||
|
assert log_has_re(r"Recursive test of .* started\.", caplog)
|
||||||
|
assert start_mock.call_count == 1
|
||||||
|
|
||||||
# # 1st check: create a new file and verify its contents
|
assert instance.strategy_obj['name'] == "strategy_test_v3_recursive_issue"
|
||||||
# analysis1 = Analysis()
|
|
||||||
# analysis1.has_bias = True
|
|
||||||
# analysis1.total_signals = 12
|
|
||||||
# analysis1.false_entry_signals = 11
|
|
||||||
# analysis1.false_exit_signals = 10
|
|
||||||
# analysis1.false_indicators.append('falseIndicator1')
|
|
||||||
# analysis1.false_indicators.append('falseIndicator2')
|
|
||||||
# recursive_conf['lookahead_analysis_exportfilename'] = "temp_csv_lookahead_analysis.csv"
|
|
||||||
|
|
||||||
# strategy_obj1 = {
|
|
||||||
# 'name': "strat1",
|
|
||||||
# 'location': Path("file1.py"),
|
|
||||||
# }
|
|
||||||
|
|
||||||
# instance1 = LookaheadAnalysis(recursive_conf, strategy_obj1)
|
|
||||||
# instance1.failed_bias_check = False
|
|
||||||
# instance1.current_analysis = analysis1
|
|
||||||
|
|
||||||
# RecursiveAnalysisSubFunctions.export_to_csv(recursive_conf, [instance1])
|
|
||||||
# saved_data1 = pd.read_csv(recursive_conf['lookahead_analysis_exportfilename'])
|
|
||||||
|
|
||||||
# expected_values1 = [
|
|
||||||
# [
|
|
||||||
# 'file1.py', 'strat1', True,
|
|
||||||
# 12, 11, 10,
|
|
||||||
# "falseIndicator1,falseIndicator2"
|
|
||||||
# ],
|
|
||||||
# ]
|
|
||||||
# expected_columns = ['filename', 'strategy', 'has_bias',
|
|
||||||
# 'total_signals', 'biased_entry_signals', 'biased_exit_signals',
|
|
||||||
# 'biased_indicators']
|
|
||||||
# expected_data1 = pd.DataFrame(expected_values1, columns=expected_columns)
|
|
||||||
|
|
||||||
# assert Path(recursive_conf['lookahead_analysis_exportfilename']).exists()
|
|
||||||
# assert expected_data1.equals(saved_data1)
|
|
||||||
|
|
||||||
# # 2nd check: update the same strategy (which internally changed or is being retested)
|
|
||||||
# expected_values2 = [
|
|
||||||
# [
|
|
||||||
# 'file1.py', 'strat1', False,
|
|
||||||
# 22, 21, 20,
|
|
||||||
# "falseIndicator3,falseIndicator4"
|
|
||||||
# ],
|
|
||||||
# ]
|
|
||||||
# expected_data2 = pd.DataFrame(expected_values2, columns=expected_columns)
|
|
||||||
|
|
||||||
# analysis2 = Analysis()
|
|
||||||
# analysis2.has_bias = False
|
|
||||||
# analysis2.total_signals = 22
|
|
||||||
# analysis2.false_entry_signals = 21
|
|
||||||
# analysis2.false_exit_signals = 20
|
|
||||||
# analysis2.false_indicators.append('falseIndicator3')
|
|
||||||
# analysis2.false_indicators.append('falseIndicator4')
|
|
||||||
|
|
||||||
# strategy_obj2 = {
|
|
||||||
# 'name': "strat1",
|
|
||||||
# 'location': Path("file1.py"),
|
|
||||||
# }
|
|
||||||
|
|
||||||
# instance2 = LookaheadAnalysis(recursive_conf, strategy_obj2)
|
|
||||||
# instance2.failed_bias_check = False
|
|
||||||
# instance2.current_analysis = analysis2
|
|
||||||
|
|
||||||
# RecursiveAnalysisSubFunctions.export_to_csv(recursive_conf, [instance2])
|
|
||||||
# saved_data2 = pd.read_csv(recursive_conf['lookahead_analysis_exportfilename'])
|
|
||||||
|
|
||||||
# assert expected_data2.equals(saved_data2)
|
|
||||||
|
|
||||||
# # 3rd check: now we add a new row to an already existing file
|
|
||||||
# expected_values3 = [
|
|
||||||
# [
|
|
||||||
# 'file1.py', 'strat1', False,
|
|
||||||
# 22, 21, 20,
|
|
||||||
# "falseIndicator3,falseIndicator4"
|
|
||||||
# ],
|
|
||||||
# [
|
|
||||||
# 'file3.py', 'strat3', True,
|
|
||||||
# 32, 31, 30, "falseIndicator5,falseIndicator6"
|
|
||||||
# ],
|
|
||||||
# ]
|
|
||||||
|
|
||||||
# expected_data3 = pd.DataFrame(expected_values3, columns=expected_columns)
|
|
||||||
|
|
||||||
# analysis3 = Analysis()
|
|
||||||
# analysis3.has_bias = True
|
|
||||||
# analysis3.total_signals = 32
|
|
||||||
# analysis3.false_entry_signals = 31
|
|
||||||
# analysis3.false_exit_signals = 30
|
|
||||||
# analysis3.false_indicators.append('falseIndicator5')
|
|
||||||
# analysis3.false_indicators.append('falseIndicator6')
|
|
||||||
# recursive_conf['lookahead_analysis_exportfilename'] = "temp_csv_lookahead_analysis.csv"
|
|
||||||
|
|
||||||
# strategy_obj3 = {
|
|
||||||
# 'name': "strat3",
|
|
||||||
# 'location': Path("file3.py"),
|
|
||||||
# }
|
|
||||||
|
|
||||||
# instance3 = LookaheadAnalysis(recursive_conf, strategy_obj3)
|
|
||||||
# instance3.failed_bias_check = False
|
|
||||||
# instance3.current_analysis = analysis3
|
|
||||||
|
|
||||||
# RecursiveAnalysisSubFunctions.export_to_csv(recursive_conf, [instance3])
|
|
||||||
# saved_data3 = pd.read_csv(recursive_conf['lookahead_analysis_exportfilename'])
|
|
||||||
# assert expected_data3.equals(saved_data3)
|
|
||||||
|
|
||||||
# # remove csv file after the test is done
|
|
||||||
# if Path(recursive_conf['lookahead_analysis_exportfilename']).exists():
|
|
||||||
# Path(recursive_conf['lookahead_analysis_exportfilename']).unlink()
|
|
||||||
|
|
||||||
|
|
||||||
# def test_initialize_single_lookahead_analysis(recursive_conf, mocker, caplog):
|
|
||||||
# mocker.patch('freqtrade.data.history.get_timerange', get_timerange)
|
|
||||||
# mocker.patch(f'{EXMS}.get_fee', return_value=0.0)
|
|
||||||
# mocker.patch(f'{EXMS}.get_min_pair_stake_amount', return_value=0.00001)
|
|
||||||
# mocker.patch(f'{EXMS}.get_max_pair_stake_amount', return_value=float('inf'))
|
|
||||||
# patch_exchange(mocker)
|
|
||||||
# mocker.patch('freqtrade.plugins.pairlistmanager.PairListManager.whitelist',
|
|
||||||
# PropertyMock(return_value=['UNITTEST/BTC']))
|
|
||||||
# recursive_conf['pairs'] = ['UNITTEST/USDT']
|
|
||||||
|
|
||||||
# recursive_conf['timeframe'] = '5m'
|
|
||||||
# recursive_conf['timerange'] = '20180119-20180122'
|
|
||||||
# start_mock = mocker.patch('freqtrade.optimize.lookahead_analysis.LookaheadAnalysis.start')
|
|
||||||
# strategy_obj = {
|
|
||||||
# 'name': "strategy_test_v3_with_lookahead_bias",
|
|
||||||
# 'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
|
|
||||||
# }
|
|
||||||
|
|
||||||
# instance = RecursiveAnalysisSubFunctions.initialize_single_lookahead_analysis(
|
|
||||||
# recursive_conf, strategy_obj)
|
|
||||||
# assert log_has_re(r"Bias test of .* started\.", caplog)
|
|
||||||
# assert start_mock.call_count == 1
|
|
||||||
|
|
||||||
# assert instance.strategy_obj['name'] == "strategy_test_v3_with_lookahead_bias"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('scenario', [
|
@pytest.mark.parametrize('scenario', [
|
||||||
|
|||||||
Reference in New Issue
Block a user