From 2be28d3af4ca62280a02893af88fe6d2c209a5a5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 6 Mar 2019 12:53:03 +0100 Subject: [PATCH] Only 1 hr --- Multi-Period-Market/User.Bot.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Multi-Period-Market/User.Bot.js b/Multi-Period-Market/User.Bot.js index 242da3510..2d8e83676 100644 --- a/Multi-Period-Market/User.Bot.js +++ b/Multi-Period-Market/User.Bot.js @@ -117,6 +117,11 @@ const outputPeriod = global.marketFilesPeriods[n][0]; const timePeriod = global.marketFilesPeriods[n][1]; + if (timePeriod !== '01-hs') { + controlLoop(); + return; + } + let marketFile; let percentageBandwidthMap = new Map(); @@ -187,7 +192,8 @@ begin: marketFile[i][0], end: marketFile[i][1], value: marketFile[i][2], - movingAverage: marketFile[i][3] + movingAverage: marketFile[i][3], + bandwidth: marketFile[i][4] }; percentageBandwidthMap.set(percentageBandwidth.begin, percentageBandwidth); @@ -792,7 +798,9 @@ percentageBandwidth2.movingAverage > percentageBandwidth1.movingAverage && percentageBandwidth1.movingAverage > percentageBandwidth.movingAverage && percentageBandwidth2.bandwidth < percentageBandwidth1.bandwidth && - percentageBandwidth1.bandwidth < percentageBandwidth.bandwidth + percentageBandwidth1.bandwidth < percentageBandwidth.bandwidth && + candles[i - 2].min < candles[i - 1].min && + candles[i - 1].min < candle.min ) { strategyPhase = 1; strategy = 1;