From 47e8ea207980909d23e555b4525bb9d2a977206d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 3 Dec 2020 08:46:25 +0100 Subject: [PATCH] Trading Bot --- Projects/ProjectsSchema.json | 7 +++++++ .../TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js | 2 +- TaskServer/ProcessInstance.js | 8 ++------ 3 files changed, 10 insertions(+), 7 deletions(-) rename TaskServer/TradingBot.js => Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js (99%) diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 94b0ae34b..87f008863 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -526,6 +526,13 @@ "functionName": "newSuperalgosBotModulesIndicatorOutput", "fileName": "IndicatorOutput.js", "folderName": "Indicator-Bot" + }, + { + "name": "Single Market Trading Bot", + "propertyName": "singleMarketTradingBot", + "functionName": "newSuperalgosBotModulesSingleMarketTradingBot", + "fileName": "SingleMarketTradingBot.js", + "folderName": "Trading-Bot" } ] }, diff --git a/TaskServer/TradingBot.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js similarity index 99% rename from TaskServer/TradingBot.js rename to Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js index 459557c51..f1ce6a00a 100644 --- a/TaskServer/TradingBot.js +++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/SingleMarketTradingBot.js @@ -1,4 +1,4 @@ -exports.newTradingBot = function newTradingBot(processIndex) { +exports.newSuperalgosBotModulesSingleMarketTradingBot = function (processIndex) { const MODULE_NAME = "Trading Bot"; const FULL_LOG = true; diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index f0ab6efb4..51d44642d 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -12,10 +12,6 @@ function start(processIndex) { try { - /* Process Loops Declarations. */ - - const TRADING_BOT_MODULE = require('./TradingBot'); - let botInstance let botConfig = TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config @@ -120,7 +116,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = TRADING_BOT_MODULE.newTradingBot(processIndex); + botInstance = TS.projects.superalgos.botModules.singleMarketTradingBot.newSuperalgosBotModulesSingleMarketTradingBot(processIndex); botInstance.initialize(processConfig, onInitializeReady); } catch (err) { @@ -133,7 +129,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = TRADING_BOT_MODULE.newLearningBot(processIndex); + botInstance = LEARNING_BOT_MODULE.newLearningBot(processIndex); botInstance.initialize(processConfig, onInitializeReady); } catch (err) {