From fe706dead24fa97621c769d51b30f582688baad5 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 25 Dec 2019 21:58:00 +0000 Subject: [PATCH] - aligned macd_fdd - fixed params git-svn-id: http://moon:8086/svn/projects/Stock@332 fda53097-d464-4ada-af97-ba876c37ca34 --- robot.py | 2 +- stock.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/robot.py b/robot.py index 5ef9e0d..afb02cc 100644 --- a/robot.py +++ b/robot.py @@ -137,7 +137,7 @@ figNum = 1 if len(show_symbols) > 0: for symbol in show_symbols: if symbol in symbols: - title = Stock(symbol, symbols[symbol]) + title = Stock(params, symbol, symbols[symbol]) title.fetch() title.statistics() ind = title.analyze(buy_callback, range_days=params['show_range_days']) diff --git a/stock.py b/stock.py index f03dc3c..3d30cd8 100644 --- a/stock.py +++ b/stock.py @@ -100,10 +100,11 @@ class Stock(object): spl = UnivariateSpline(x=x_r, y=y_r, k=5) spl.set_smoothing_factor(0.25) spl_d = spl.derivative() - spl_dd = spl_d.derivative() + spl_dd = spl.derivative().derivative() yf = spl(x_r) yf_d = spl_d(x_r) - yf_dd = spl_dd(x_r) + x_r2 = np.linspace(-1, N-1, N) + yf_dd = spl_dd(x_r2) self.data['macd_f'] = np.transpose(yf) self.data['macd_fd'] = np.transpose(yf_d)