From b2a76ebcd9bdf5db8b3d31aaa1c4ece1c532fe84 Mon Sep 17 00:00:00 2001 From: enarjord Date: Mon, 23 Aug 2021 14:10:29 +0200 Subject: [PATCH] fixes for scalp --- plotting.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plotting.py b/plotting.py index 3e5d4d115..7899aa3f8 100644 --- a/plotting.py +++ b/plotting.py @@ -60,10 +60,10 @@ def dump_plots(result: dict, fdf: pd.DataFrame, df: pd.DataFrame): if result['long']['enabled']: table.add_row([' ', ' ']) table.add_row(['Long', result['long']['enabled']]) - table.add_row(["No. inital entries", len(longs[longs.type.str.contains('long_ientry')])]) - table.add_row(["No. reentries", len(longs[longs.type.str.contains('long_rentry')])]) - table.add_row(["No. normal closes", len(longs[longs.type.str.contains('long_nclose')])]) - table.add_row(["No. stoploss closes", len(longs[longs.type.str.contains('long_sclose')])]) + table.add_row(["No. inital entries", len(longs[longs.type.str.contains('ientry')])]) + table.add_row(["No. reentries", len(longs[longs.type.str.contains('rentry')])]) + table.add_row(["No. normal closes", len(longs[longs.type.str.contains('nclose')])]) + table.add_row(["No. stoploss closes", len(longs[longs.type.str.contains('sclose')])]) table.add_row(["No. partial fills", len(longs[longs.type.str.contains('partial')])]) table.add_row(['Mean hours between fills (long)', round_dynamic(result['result']['mean_hrs_between_fills_long'], 6)]) table.add_row(['Max hours no fills (long)', round_dynamic(result['result']['max_hrs_no_fills_long'], 6)]) @@ -73,10 +73,10 @@ def dump_plots(result: dict, fdf: pd.DataFrame, df: pd.DataFrame): if result['shrt']['enabled']: table.add_row([' ', ' ']) table.add_row(['Short', result['shrt']['enabled']]) - table.add_row(["No. initial entries", len(shrts[shrts.type.str.contains('shrt_ientry')])]) - table.add_row(["No. reentries", len(shrts[shrts.type.str.contains('shrt_rentry')])]) - table.add_row(["No. normal closes", len(shrts[shrts.type.str.contains('shrt_nclose')])]) - table.add_row(["No. stoploss closes", len(shrts[shrts.type.str.contains('shrt_sclose')])]) + table.add_row(["No. initial entries", len(shrts[shrts.type.str.contains('ientry')])]) + table.add_row(["No. reentries", len(shrts[shrts.type.str.contains('rentry')])]) + table.add_row(["No. normal closes", len(shrts[shrts.type.str.contains('nclose')])]) + table.add_row(["No. stoploss closes", len(shrts[shrts.type.str.contains('sclose')])]) table.add_row(["No. partial fills", len(shrts[shrts.type.str.contains('partial')])]) table.add_row(['Mean hours between fills (short)', round_dynamic(result['result']['mean_hrs_between_fills_shrt'], 6)]) table.add_row(['Max hours no fills (short)', round_dynamic(result['result']['max_hrs_no_fills_shrt'], 6)])