From 55d1dfba7871fbc5a1c7890680add1c3a1b65c3d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 16 Mar 2019 14:03:17 +0100 Subject: [PATCH] Bot working under Multi Period Market Framework --- Commons.js | 83 --------------------------------- Multi-Period-Market/User.Bot.js | 27 ++++++----- this.bot.config.json | 47 ++++++++++++++++++- 3 files changed, 62 insertions(+), 95 deletions(-) diff --git a/Commons.js b/Commons.js index 53bfce367..ca4dccd82 100644 --- a/Commons.js +++ b/Commons.js @@ -8,7 +8,6 @@ const GMT_SECONDS = ':00.000 GMT+0000'; let thisObject = { - initializeStorage: initializeStorage, runSimulation: runSimulation }; @@ -16,88 +15,6 @@ return thisObject; - function initializeStorage(chrisStorage, jasonStorage, oliviaStorage, gaussStorage, callBackFunction) { - - try { - - if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] initializeStorage -> Entering function."); } - - initializetomStorage(); - - function initializetomStorage() { - - jasonStorage.initialize(bot.devTeam, onBruceInizialized); - - function onBruceInizialized(err) { - - if (err.result === global.DEFAULT_OK_RESPONSE.result) { - - initializeChrisStorage(); - - } else { - logger.write(MODULE_NAME, "[ERROR] initializeStorage -> initializetomStorage -> onBruceInizialized -> err = " + err.message); - callBackFunction(err); - } - } - } - - function initializeChrisStorage() { - - chrisStorage.initialize(bot.devTeam, onChrisInizialized); - - function onChrisInizialized(err) { - - if (err.result === global.DEFAULT_OK_RESPONSE.result) { - - initializeGaussStorage(); - - } else { - logger.write(MODULE_NAME, "[ERROR] initializeStorage -> initializeChrisStorage -> onChrisInizialized -> err = " + err.message); - callBackFunction(err); - } - } - } - - function initializeGaussStorage() { - - gaussStorage.initialize("AAVikings", onGaussInizialized); - - function onGaussInizialized(err) { - - if (err.result === global.DEFAULT_OK_RESPONSE.result) { - - initializeOliviaStorage(); - - } else { - logger.write(MODULE_NAME, "[ERROR] initializeStorage -> initializeGaussStorage -> onChrisInizialized -> err = " + err.message); - callBackFunction(err); - } - } - } - - function initializeOliviaStorage() { - - oliviaStorage.initialize(bot.devTeam, onOliviaInizialized); - - function onOliviaInizialized(err) { - - if (err.result === global.DEFAULT_OK_RESPONSE.result) { - - callBackFunction(global.DEFAULT_OK_RESPONSE); - - } else { - logger.write(MODULE_NAME, "[ERROR] initializeStorage -> initializeChrisStorage -> onChrisInizialized -> err = " + err.message); - callBackFunction(err); - } - } - } - - } - catch (err) { - logger.write(MODULE_NAME, "[ERROR] initializeStorage -> err = " + err.message); - callBackFunction(global.DEFAULT_FAIL_RESPONSE); - } - } function runSimulation( candles, diff --git a/Multi-Period-Market/User.Bot.js b/Multi-Period-Market/User.Bot.js index be4af9bf3..2195b7445 100644 --- a/Multi-Period-Market/User.Bot.js +++ b/Multi-Period-Market/User.Bot.js @@ -18,6 +18,7 @@ }; let utilities = UTILITIES.newCloudUtilities(bot, logger); + let jasonStorage = BLOB_STORAGE.newBlobStorage(bot, logger); let dataDependencies; @@ -34,8 +35,19 @@ dataDependencies = pDataDependencies; - callBackFunction(global.DEFAULT_OK_RESPONSE); + jasonStorage.initialize(bot.devTeam, onStorageInizialized); + function onStorageInizialized(err) { + + if (err.result === global.DEFAULT_OK_RESPONSE.result) { + + callBackFunction(global.DEFAULT_OK_RESPONSE); + + } else { + logger.write(MODULE_NAME, "[ERROR] initializeStorage -> onStorageInizialized -> err = " + err.message); + callBackFunction(err); + } + } } catch (err) { logger.write(MODULE_NAME, "[ERROR] initialize -> err = " + err.message); callBackFunction(global.DEFAULT_FAIL_RESPONSE); @@ -48,6 +60,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> Entering function."); } + let market = global.MARKET; let marketFile; let LRCMap = new Map(); @@ -61,43 +74,35 @@ let conditionsArray = []; let simulationLogic = {}; - let fileCounter = 0; + for (let i = 0; i < dataDependencies.config.length; i++) { - for (let i = 0; i < dataDependencies.length; i++) { - - let dependency = dataDependencies[i]; + let dependency = dataDependencies.config[i]; marketFile = marketFiles[i]; switch (i) { case 0: { buildLRC(); - fileCounter++; break; } case 1: { buildPercentageBandwidthMap(); - fileCounter++; break; } case 2: { buildBollingerBandsMap(); - fileCounter++; break; } case 3: { buildBollingerChannelsArray(); - fileCounter++; break; } case 4: { buildBollingerSubChannelsArray(); - fileCounter++; break; } case 5: { buildCandles(); - fileCounter++; break; } } diff --git a/this.bot.config.json b/this.bot.config.json index 25d2198a3..2d09eeb9f 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -61,6 +61,50 @@ "dataSetVersion": "dataSet.V1", "dataSet": "Multi-Period-Market" }, + { + "devTeam": "AAMasters", + "bot": "AAChris", + "botVersion": { + "major": 1, + "minor": 0 + }, + "product": "Percentage-Bandwidth", + "dataSetVersion": "dataSet.V1", + "dataSet": "Multi-Period-Market" + }, + { + "devTeam": "AAMasters", + "bot": "AAChris", + "botVersion": { + "major": 1, + "minor": 0 + }, + "product": "Bollinger-Bands", + "dataSetVersion": "dataSet.V1", + "dataSet": "Multi-Period-Market" + }, + { + "devTeam": "AAMasters", + "bot": "AAPaula", + "botVersion": { + "major": 1, + "minor": 0 + }, + "product": "Bollinger-Channels", + "dataSetVersion": "dataSet.V1", + "dataSet": "Multi-Period-Market" + }, + { + "devTeam": "AAMasters", + "bot": "AAPaula", + "botVersion": { + "major": 1, + "minor": 0 + }, + "product": "Bollinger-Sub-Channels", + "dataSetVersion": "dataSet.V1", + "dataSet": "Multi-Period-Market" + }, { "devTeam": "AAMasters", "bot": "AAOlivia", @@ -72,7 +116,8 @@ "dataSetVersion": "dataSet.V1", "dataSet": "Multi-Period-Market" } - ] + ], + "framework": "Multi-Period-Market" }, { "name": "Multi-Period-Daily",