changed defaults
Seperated save trades and print trades options.
This commit is contained in:
parent
ec1960530b
commit
8d5da4e6ad
@ -101,7 +101,8 @@ class Backtesting(object):
|
|||||||
self.debug_vector = False # Debug vector calcs
|
self.debug_vector = False # Debug vector calcs
|
||||||
self.debug_timing_main_loop = False # print overall timing per pair - works in Backtest and Backslap
|
self.debug_timing_main_loop = False # print overall timing per pair - works in Backtest and Backslap
|
||||||
|
|
||||||
self.backslap_show_trades = True #prints trades in addition to summary report, also saves to backslap.txt
|
self.backslap_show_trades = False # prints trades in addition to summary report
|
||||||
|
self.backslap_save_trades = True # saves trades as a pretty table to backslap.txt
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@ -1055,17 +1056,25 @@ class Backtesting(object):
|
|||||||
results
|
results
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
#optional print trades
|
||||||
if self.backslap_show_trades:
|
if self.backslap_show_trades:
|
||||||
TradesFrame = results.filter(['open_time', 'pair', 'exit_type', 'profit_percent', 'profit_abs',
|
TradesFrame = results.filter(['open_time', 'pair', 'exit_type', 'profit_percent', 'profit_abs',
|
||||||
'buy_spend', 'sell_take', 'trade_duration', 'close_time'], axis=1)
|
'buy_spend', 'sell_take', 'trade_duration', 'close_time'], axis=1)
|
||||||
|
|
||||||
def to_fwf(df, fname):
|
def to_fwf(df, fname):
|
||||||
content = tabulate(df.values.tolist(), list(df.columns), floatfmt=".8f", tablefmt='psql')
|
content = tabulate(df.values.tolist(), list(df.columns), floatfmt=".8f", tablefmt='psql')
|
||||||
print(content)
|
print(content)
|
||||||
open(fname, "w").write(content)
|
|
||||||
|
|
||||||
DataFrame.to_fwf = to_fwf(TradesFrame, "backslap.txt")
|
DataFrame.to_fwf = to_fwf(TradesFrame, "backslap.txt")
|
||||||
|
|
||||||
|
#optional save trades
|
||||||
|
if self.backslap_save_trades:
|
||||||
|
TradesFrame = results.filter(['open_time', 'pair', 'exit_type', 'profit_percent', 'profit_abs',
|
||||||
|
'buy_spend', 'sell_take', 'trade_duration', 'close_time'], axis=1)
|
||||||
|
def to_fwf(df, fname):
|
||||||
|
content = tabulate(df.values.tolist(), list(df.columns), floatfmt=".8f", tablefmt='psql')
|
||||||
|
open(fname, "w").write(content)
|
||||||
|
DataFrame.to_fwf = to_fwf(TradesFrame, "backslap.txt")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
logger.info(
|
logger.info(
|
||||||
'\n================================================= '
|
'\n================================================= '
|
||||||
|
Loading…
Reference in New Issue
Block a user