Merge pull request #670 from gcarq/flakify-scripts

Scripts: fix syntax errors and flake8ify
This commit is contained in:
Janne Sinivirta 2018-05-14 08:42:11 +03:00 committed by GitHub
commit 6cc8017943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions

View File

@ -26,12 +26,7 @@ from freqtrade.analyze import Analyze
from freqtrade import exchange from freqtrade import exchange
import freqtrade.optimize as optimize import freqtrade.optimize as optimize
<<<<<<< HEAD
logger = logging.getLogger('freqtrade')
=======
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
>>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238
def plot_analyzed_dataframe(args: Namespace) -> None: def plot_analyzed_dataframe(args: Namespace) -> None:

View File

@ -24,8 +24,7 @@ import plotly.graph_objs as go
from freqtrade.arguments import Arguments from freqtrade.arguments import Arguments
from freqtrade.configuration import Configuration from freqtrade.configuration import Configuration
from freqtrade.analyze import Analyze from freqtrade.analyze import Analyze
from freqtradeimport constants from freqtrade import constants
import freqtrade.optimize as optimize import freqtrade.optimize as optimize
import freqtrade.misc as misc import freqtrade.misc as misc
@ -33,11 +32,12 @@ import freqtrade.misc as misc
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# data:: [ pair, profit-%, enter, exit, time, duration] # data:: [ pair, profit-%, enter, exit, time, duration]
# data:: ["ETH/BTC", 0.0023975, "1515598200", "1515602100", "2018-01-10 07:30:00+00:00", 65] # data:: ["ETH/BTC", 0.0023975, "1515598200", "1515602100", "2018-01-10 07:30:00+00:00", 65]
def make_profit_array( def make_profit_array(data: List, px: int, min_date: int,
data: List, px: int, min_date: int, interval: int,
interval: int, filter_pairs: Optional[List] = None) -> np.ndarray: filter_pairs: Optional[List] = None) -> np.ndarray:
pg = np.zeros(px) pg = np.zeros(px)
filter_pairs = filter_pairs or [] filter_pairs = filter_pairs or []
# Go through the trades # Go through the trades