adelorenzo
/
stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix jupyter notebook example - 

generate_candlestick_graph() needs a filtered pairlist, not a list
containing all pairs
This commit is contained in:
Matthias 2020-02-29 15:53:54 +01:00
parent 0528af1700
commit 848054d140
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/strategy_analysis_example.md
View File

@ -121,7 +121,6 @@ from freqtrade.data.btanalysis import analyze_trade_parallelism
# Analyze the above # Analyze the above
parallel_trades = analyze_trade_parallelism(trades, '5m') parallel_trades = analyze_trade_parallelism(trades, '5m')
parallel_trades.plot() parallel_trades.plot()
``` ```
@ -134,11 +133,14 @@ Freqtrade offers interactive plotting capabilities based on plotly.
from freqtrade.plot.plotting import generate_candlestick_graph from freqtrade.plot.plotting import generate_candlestick_graph
# Limit graph period to keep plotly quick and reactive # Limit graph period to keep plotly quick and reactive
# Filter trades to one pair
trades_red = trades.loc[trades['pair'] == pair]
data_red = data['2019-06-01':'2019-06-10'] data_red = data['2019-06-01':'2019-06-10']
# Generate candlestick graph # Generate candlestick graph
graph = generate_candlestick_graph(pair=pair, graph = generate_candlestick_graph(pair=pair,
data=data_red, data=data_red,
trades=trades, trades=trades_red,
indicators1=['sma20', 'ema50', 'ema55'], indicators1=['sma20', 'ema50', 'ema55'],
indicators2=['rsi', 'macd', 'macdsignal', 'macdhist'] indicators2=['rsi', 'macd', 'macdsignal', 'macdhist']
) )

6
freqtrade/templates/strategy_analysis_example.ipynb
View File

@ -190,7 +190,6 @@
"# Analyze the above\n", "# Analyze the above\n",
"parallel_trades = analyze_trade_parallelism(trades, '5m')\n", "parallel_trades = analyze_trade_parallelism(trades, '5m')\n",
"\n", "\n",
"\n",
"parallel_trades.plot()" "parallel_trades.plot()"
] ]
}, },
@ -212,11 +211,14 @@
"from freqtrade.plot.plotting import generate_candlestick_graph\n", "from freqtrade.plot.plotting import generate_candlestick_graph\n",
"# Limit graph period to keep plotly quick and reactive\n", "# Limit graph period to keep plotly quick and reactive\n",
"\n", "\n",
"# Filter trades to one pair\n",
"trades_red = trades.loc[trades['pair'] == pair]\n",
"\n",
"data_red = data['2019-06-01':'2019-06-10']\n", "data_red = data['2019-06-01':'2019-06-10']\n",
"# Generate candlestick graph\n", "# Generate candlestick graph\n",
"graph = generate_candlestick_graph(pair=pair,\n", "graph = generate_candlestick_graph(pair=pair,\n",
" data=data_red,\n", " data=data_red,\n",
" trades=trades,\n", " trades=trades_red,\n",
" indicators1=['sma20', 'ema50', 'ema55'],\n", " indicators1=['sma20', 'ema50', 'ema55'],\n",
" indicators2=['rsi', 'macd', 'macdsignal', 'macdhist']\n", " indicators2=['rsi', 'macd', 'macdsignal', 'macdhist']\n",
" )\n", " )\n",