Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Fixed Momentum Strategy #1209

Merged
merged 1 commit into from
Jan 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions extensions/strategies/momentum/strategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ module.exports = function container(get, set, clear) {

calculate: function (s) {
if (s.in_preroll) { return }
get('lib.momentum')(s, 'mom0', s.options.momentum_size)
get('lib.momentum')(s, 'mom1', s.options.momentum_size)
get('lib.momentum')(s, 'mom0', 'close', s.options.momentum_size)
get('lib.momentum')(s, 'mom1', 'mom0', 1)
},

onPeriod: function (s, cb) {
Expand All @@ -33,7 +33,6 @@ module.exports = function container(get, set, clear) {

onReport: function (s) {
let cols = [], color

if (s.period.mom0 != null) {
color = s.period.mom0 < 0 ? 'red' : s.period.mom0 > 0 ? 'green' : 'grey'
cols.push(z(5, n(s.period.mom0).format('000'), ' ')[color])
Expand Down
6 changes: 3 additions & 3 deletions lib/momentum.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = function container(get, set, clear) {
return function momentum(s, key, length) {
if (s.period == null || s.lookback == null || s.lookback.length < length) {
return function momentum(s, key, source_key, length) {
if (s.lookback == null || s.lookback.length < length || s.period == null || s.period[source_key] == null) {
s.period[key] = 0
} else {
s.period[key] = s.period.close - s.lookback[length - 1].close
s.period[key] = s.period[source_key] - s.lookback[length - 1][source_key]
}
}
}