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

Move extract_trades_of_period to btanlaysis

Browse Source
This commit is contained in:
Matthias
2019-06-16 11:12:19 +02:00
parent 1c53aa5687
commit 1cd8415723
3 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/plot_dataframe.py
View File

@@ -35,9 +35,10 @@ import pandas as pd
from freqtrade.arguments import Arguments, TimeRange
from freqtrade.data import history
from freqtrade.data.btanalysis import load_trades
from freqtrade.plot.plotting import generate_graph, generate_plot_file
from freqtrade.exchange import Exchange
from freqtrade.optimize import setup_configuration
from freqtrade.plot.plotting import (extract_trades_of_period, generate_graph,
generate_plot_file)
from freqtrade.resolvers import StrategyResolver
from freqtrade.state import RunMode
@@ -119,17 +120,6 @@ def generate_dataframe(strategy, tickers, pair) -> pd.DataFrame:
return dataframe
def extract_trades_of_period(dataframe, trades) -> pd.DataFrame:
"""
Compare trades and backtested pair DataFrames to get trades performed on backtested period
:return: the DataFrame of a trades of period
"""
# TODO: Document and move to btanalysis (?)
trades = trades.loc[(trades['open_time'] >= dataframe.iloc[0]['date']) &
(trades['close_time'] <= dataframe.iloc[-1]['date'])]
return trades
def analyse_and_plot_pairs(args: Namespace):
"""
From arguments provided in cli: