From 47713820bb68bcae6f8d473901a23b074bd8cbb3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 29 Jun 2019 10:04:22 +0200 Subject: [PATCH] BUG FIXED: Empty records files generated --- Commons.js | 16 +++++++++------- Multi-Period-Daily/User.Bot.js | 29 ++++++++++++++++------------- Multi-Period-Market/User.Bot.js | 27 +++++++++++++++------------ 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/Commons.js b/Commons.js index 575452cd3..22fd45e09 100644 --- a/Commons.js +++ b/Commons.js @@ -53,22 +53,24 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) { } async function runSimulation( - recordsArray, - conditionsArray, - strategiesArray, - tradesArray, - lastObjectsArray, timePeriod, currentDay, startDate, endDate, interExecutionMemory, - callback) { + callback, + callBackFunction) { try { if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] runSimulation -> Entering function."); } + let recordsArray = []; + let conditionsArray = []; + let strategiesArray = []; + let tradesArray = []; + let lastObjectsArray = []; + let tradingSystem = await strategy.getStrategy(); /* Initial Default Values */ @@ -1600,7 +1602,7 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) { if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] runSimulation -> callback -> recordsArray.length = " + recordsArray.length); } - callback(tradingSystem); + callback(tradingSystem, recordsArray, conditionsArray, strategiesArray, tradesArray, lastObjectsArray); function getElement(pArray, begin, end) { diff --git a/Multi-Period-Daily/User.Bot.js b/Multi-Period-Daily/User.Bot.js index ab7cbff0a..62f56eaa9 100644 --- a/Multi-Period-Daily/User.Bot.js +++ b/Multi-Period-Daily/User.Bot.js @@ -51,14 +51,14 @@ let market = global.MARKET; let dataFile; - let recordsArray = []; - let conditionsArray = []; - let strategiesArray = []; - let tradesArray = []; + let recordsArray + let conditionsArray + let strategiesArray + let tradesArray + let lastObjectsArray let tradingSystem = {}; - let lastObjectsArray = []; - + commons.initializeData(); for (let i = 0; i < dataDependencies.config.length; i++) { @@ -96,20 +96,23 @@ } commons.runSimulation( - recordsArray, - conditionsArray, - strategiesArray, - tradesArray, - lastObjectsArray, timePeriod, currentDay, startDate, endDate, interExecutionMemory, - writeFiles) + writeFiles, + callBackFunction) + + function writeFiles(pTradingSystem, pRecordsArray, pConditionsArray, pStrategiesArray, pTradesArray, pLastObjectsArray) { - function writeFiles(pTradingSystem) { tradingSystem = pTradingSystem + recordsArray = pRecordsArray + conditionsArray = pConditionsArray + strategiesArray = pStrategiesArray + tradesArray = pTradesArray + lastObjectsArray = pLastObjectsArray + writeRecordsFile() } diff --git a/Multi-Period-Market/User.Bot.js b/Multi-Period-Market/User.Bot.js index 5a3f176a3..cd9f46fcd 100644 --- a/Multi-Period-Market/User.Bot.js +++ b/Multi-Period-Market/User.Bot.js @@ -49,11 +49,11 @@ let market = global.MARKET; let dataFile; - let recordsArray = []; - let conditionsArray = []; - let strategiesArray = []; - let tradesArray = []; - let lastObjectsArray = []; + let recordsArray + let conditionsArray + let strategiesArray + let tradesArray + let lastObjectsArray let tradingSystem = {}; let interExecutionMemory = {}; @@ -96,20 +96,23 @@ } commons.runSimulation( - recordsArray, - conditionsArray, - strategiesArray, - tradesArray, - lastObjectsArray, timePeriod, currentDay, startDate, endDate, interExecutionMemory, - writeFiles) + writeFiles, + callBackFunction) + + function writeFiles(pTradingSystem, pRecordsArray, pConditionsArray, pStrategiesArray, pTradesArray, pLastObjectsArray) { - function writeFiles(pTradingSystem) { tradingSystem = pTradingSystem + recordsArray = pRecordsArray + conditionsArray = pConditionsArray + strategiesArray = pStrategiesArray + tradesArray = pTradesArray + lastObjectsArray = pLastObjectsArray + writeRecordsFile() }