minor improvements

This commit is contained in:
Gert Wohlgemuth 2018-05-16 23:43:58 -07:00
parent 51e9cdb42c
commit 5d16569233
21 changed files with 146 additions and 25 deletions

View File

@ -204,7 +204,7 @@ class Analyze(object):
if self.strategy.stoploss is not None and trade.stop_loss >= current_rate: if self.strategy.stoploss is not None and trade.stop_loss >= current_rate:
if 'trailing_stop' in self.config and self.config['trailing_stop']: if 'trailing_stop' in self.config and self.config['trailing_stop']:
logger.warning( logger.debug(
"HIT STOP: current price at {:.6f}, stop loss is {:.6f}, " "HIT STOP: current price at {:.6f}, stop loss is {:.6f}, "
"initial stop loss was at {:.6f}, trade opened at {:.6f}".format( "initial stop loss was at {:.6f}, trade opened at {:.6f}".format(
current_rate, trade.stop_loss, trade.initial_stop_loss, trade.open_rate)) current_rate, trade.stop_loss, trade.initial_stop_loss, trade.open_rate))

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -14,8 +14,131 @@ arguments = arguments.Arguments(sys.argv[1:], 'download utility')
arguments.testdata_dl_options() arguments.testdata_dl_options()
args = arguments.parse_args() args = arguments.parse_args()
TICKER_INTERVALS = ['1m', '5m'] TICKER_INTERVALS = ['1m', '5m', '1h', '4h']
PAIRS = [] PAIRS = [
"ETH/BTC",
"LTC/BTC",
"BNB/BTC",
"NEO/BTC",
"GAS/BTC",
"MCO/BTC",
"WTC/BTC",
"QTUM/BTC",
"OMG/BTC",
"ZRX/BTC",
"STRAT/BTC",
"SNGLS/BTC",
"BQX/BTC",
"KNC/BTC",
"FUN/BTC",
"SNM/BTC",
"LINK/BTC",
"XVG/BTC",
"SALT/BTC",
"IOTA/BTC",
"MDA/BTC",
"MTL/BTC",
"SUB/BTC",
"EOS/BTC",
"SNT/BTC",
"ETC/BTC",
"MTH/BTC",
"ENG/BTC",
"DNT/BTC",
"BNT/BTC",
"AST/BTC",
"DASH/BTC",
"ICN/BTC",
"OAX/BTC",
"BTG/BTC",
"EVX/BTC",
"REQ/BTC",
"LRC/BTC",
"VIB/BTC",
"HSR/BTC",
"TRX/BTC",
"POWR/BTC",
"ARK/BTC",
"XRP/BTC",
"MOD/BTC",
"ENJ/BTC",
"STORJ/BTC",
"VEN/BTC",
"KMD/BTC",
"RCN/BTC",
"NULS/BTC",
"RDN/BTC",
"XMR/BTC",
"DLT/BTC",
"AMB/BTC",
"BAT/BTC",
"ZEC/BTC",
"BCPT/BTC",
"ARN/BTC",
"GVT/BTC",
"CDT/BTC",
"GXS/BTC",
"POE/BTC",
"QSP/BTC",
"BTS/BTC",
"XZC/BTC",
"LSK/BTC",
"TNT/BTC",
"FUEL/BTC",
"MANA/BTC",
"BCD/BTC",
"DGD/BTC",
"ADX/BTC",
"ADA/BTC",
"PPT/BTC",
"CMT/BTC",
"XLM/BTC",
"CND/BTC",
"LEND/BTC",
"WABI/BTC",
"TNB/BTC",
"WAVES/BTC",
"ICX/BTC",
"GTO/BTC",
"OST/BTC",
"ELF/BTC",
"AION/BTC",
"NEBL/BTC",
"BRD/BTC",
"EDO/BTC",
"WINGS/BTC",
"NAV/BTC",
"LUN/BTC",
"TRIG/BTC",
"APPC/BTC",
"VIBE/BTC",
"RLC/BTC",
"INS/BTC",
"PIVX/BTC",
"IOST/BTC",
"CHAT/BTC",
"STEEM/BTC",
"VIA/BTC",
"BLZ/BTC",
"AE/BTC",
"RPX/BTC",
"NCASH/BTC",
"POA/BTC",
"ZIL/BTC",
"ONT/BTC",
"STORM/BTC",
"XEM/BTC",
"WAN/BTC",
"QLC/BTC",
"SYS/BTC",
"WPR/BTC",
"GRS/BTC",
"CLOAK/BTC",
"GNT/BTC",
"LOOM/BTC",
"BCN/BTC",
"REP/BTC"
]
if args.pairs_file: if args.pairs_file:
with open(args.pairs_file) as file: with open(args.pairs_file) as file:
@ -30,7 +153,6 @@ since_time = None
if args.days: if args.days:
since_time = arrow.utcnow().shift(days=-args.days).timestamp * 1000 since_time = arrow.utcnow().shift(days=-args.days).timestamp * 1000
print(f'About to download pairs: {PAIRS} to {dl_path}') print(f'About to download pairs: {PAIRS} to {dl_path}')
# Init exchange # Init exchange
@ -38,7 +160,6 @@ exchange._API = exchange.init_ccxt({'key': '',
'secret': '', 'secret': '',
'name': args.exchange}) 'name': args.exchange})
for pair in PAIRS: for pair in PAIRS:
for tick_interval in TICKER_INTERVALS: for tick_interval in TICKER_INTERVALS:
print(f'downloading pair {pair}, interval {tick_interval}') print(f'downloading pair {pair}, interval {tick_interval}')

View File

@ -285,7 +285,7 @@ def plot_analyzed_dataframe(args: Namespace) -> None:
buys = go.Scattergl( buys = go.Scattergl(
x=df_buy.date, x=df_buy.date,
y=df_buy.close * 0.995, y=df_buy.close,
mode='markers', mode='markers',
name='buy', name='buy',
marker=dict( marker=dict(
@ -299,7 +299,7 @@ def plot_analyzed_dataframe(args: Namespace) -> None:
sells = go.Scatter( sells = go.Scatter(
x=df_sell.date, x=df_sell.date,
y=df_sell.close * 1.01, y=df_sell.close,
mode='markers+text', mode='markers+text',
name='sell', name='sell',
text=df_sell.profit, text=df_sell.profit,