From 8effa522b13222e32b2acba48755c2c095c3bc69 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 2 Dec 2020 15:44:42 +0100 Subject: [PATCH] Indicator Output --- Projects/ProjectsSchema.json | 13 +++++++++++++ .../Bot-Modules/Indicator-Bot}/IndicatorOutput.js | 2 +- .../Bot-Modules/Indicator-Bot/MultiPeriodDaily.js | 4 +--- .../Bot-Modules/Indicator-Bot/MultiPeriodMarket.js | 4 +--- TaskServer/Commons.js | 1 - 5 files changed, 16 insertions(+), 8 deletions(-) rename {TaskServer => Projects/Superalgos/TS/Bot-Modules/Indicator-Bot}/IndicatorOutput.js (99%) diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 8d63b4eb8..94b0ae34b 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -405,6 +405,12 @@ "propertyName": "sessionFunctions", "functionName": "newSuperalgosFunctionLibrariesSessionFunctions", "fileName": "SessionFunctions.js" + }, + { + "name": "Single Market Functions", + "propertyName": "singleMarketFunctions", + "functionName": "newSuperalgosFunctionLibrariesSingleMarketFunctions", + "fileName": "SingleMarketFunctions.js" } ], "utilities": [ @@ -513,6 +519,13 @@ "functionName": "newSuperalgosBotModulesMultiPeriodDaily", "fileName": "MultiPeriodDaily.js", "folderName": "Indicator-Bot" + }, + { + "name": "Indicator Output", + "propertyName": "indicatorOutput", + "functionName": "newSuperalgosBotModulesIndicatorOutput", + "fileName": "IndicatorOutput.js", + "folderName": "Indicator-Bot" } ] }, diff --git a/TaskServer/IndicatorOutput.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/IndicatorOutput.js similarity index 99% rename from TaskServer/IndicatorOutput.js rename to Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/IndicatorOutput.js index 8b655e17f..a9bb6340f 100644 --- a/TaskServer/IndicatorOutput.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/IndicatorOutput.js @@ -1,4 +1,4 @@ -exports.newIndicatorOutput = function (processIndex) { +exports.newSuperalgosBotModulesIndicatorOutput = function (processIndex) { const MODULE_NAME = "Indicator Bot"; let thisObject = { diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js index 3ca39df2d..a7a4e52f8 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js @@ -29,9 +29,7 @@ dataDependenciesModule = pDataDependencies; processConfig = pProcessConfig; - let INDICATOR_OUTPUT_MODULE = require("./IndicatorOutput") - - indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex) + indicatorOutputModule = TS.projects.superalgos.botModules.indicatorOutput.newSuperalgosBotModulesIndicatorOutput(processIndex) indicatorOutputModule.initialize(callBackFunction) } diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js index 654ada9e7..8b6f4b971 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodMarket.js @@ -25,9 +25,7 @@ dataDependenciesModule = pDataDependencies; processConfig = pProcessConfig; - let INDICATOR_OUTPUT_MODULE = require("./IndicatorOutput") - - indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex) + indicatorOutputModule = TS.projects.superalgos.botModules.indicatorOutput.newSuperalgosBotModulesIndicatorOutput(processIndex) indicatorOutputModule.initialize(callBackFunction) } diff --git a/TaskServer/Commons.js b/TaskServer/Commons.js index 4cb66aa96..26032f387 100644 --- a/TaskServer/Commons.js +++ b/TaskServer/Commons.js @@ -12,7 +12,6 @@ writeFile: writeFile }; - let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex); return thisObject;