From d2a88e2b5435296085ccc2a9bbe393a66ca90bdb Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 16 Mar 2019 14:02:48 +0100 Subject: [PATCH] Multi Period Market Framework, ready! --- MultiPeriodMarket.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MultiPeriodMarket.js b/MultiPeriodMarket.js index e3840bfb4..b360236be 100644 --- a/MultiPeriodMarket.js +++ b/MultiPeriodMarket.js @@ -138,8 +138,7 @@ let fileName = market.assetA + '_' + market.assetB + ".json"; - let filePathRoot = dependency.devTeam + "/" + dependency.bot + "." + dependency.botVersion.major + "." + dependency.botVersion.minor + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + global.EXCHANGE_NAME + "/" + dependency.dataSetVersion; - let filePath = filePathRoot + "/Output/" + dependency.product + "/" + "Multi-Period-Market" + "/" + timePeriod; + let filePath = dependency.product + "/" + "Multi-Period-Market" + "/" + timePeriod; storage.getTextFile(filePath, fileName, onFileReceived, true); @@ -153,16 +152,16 @@ if (err.result !== global.DEFAULT_OK_RESPONSE.result) { logger.write(MODULE_NAME, "[ERROR] start -> processTimePeriods -> periodsLoopBody -> dependencyLoopBody -> getFile -> onFileReceived -> err = " + err.message); + logger.write(MODULE_NAME, "[ERROR] start -> processTimePeriods -> periodsLoopBody -> dependencyLoopBody -> getFile -> onFileReceived -> filePath = " + filePath); + logger.write(MODULE_NAME, "[ERROR] start -> processTimePeriods -> periodsLoopBody -> dependencyLoopBody -> getFile -> onFileReceived -> fileName = " + fileName); callBackFunction(err); return; - } let marketFile = JSON.parse(text); marketFiles.push(marketFile); - fileCount++; - callTheBot(); + dependencyControlLoop(); } catch (err) { @@ -217,7 +216,7 @@ const outputPeriod = global.marketFilesPeriods[n][0]; const timePeriod = global.marketFilesPeriods[n][1]; - usertBot.initialize(marketFiles, outputPeriod, timePeriod, callBackFunction); + usertBot.start(marketFiles, outputPeriod, timePeriod, callBackFunction); function onBotFinished(err) {