From 5221d68b423a9f272f42b1fe6b9e303380281930 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 2 Dec 2020 09:02:34 +0100 Subject: [PATCH] Renaming ok --- Projects/ProjectsSchema.json | 38 +++++++++++++++++++ TaskServer/DataDependencies.js | 4 +- TaskServer/DataSet.js | 2 +- TaskServer/FileStorage.js | 17 ++++----- TaskServer/IndicatorBot.js | 6 +-- TaskServer/MultiPeriodDaily.js | 4 +- TaskServer/ProcessExecutionEvents.js | 2 +- TaskServer/ProcessOutput.js | 2 +- .../ReinforcementLearning/LearningBot.js | 21 +--------- TaskServer/SensorBot.js | 4 +- TaskServer/StatusDependencies.js | 4 +- TaskServer/StatusReport.js | 6 +-- TaskServer/TradingBot.js | 6 +-- 13 files changed, 66 insertions(+), 50 deletions(-) diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index b2cbf7811..f476e6d2c 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -427,6 +427,44 @@ "fileName": "MiscellaneousFunctions.js" } ], + "processModules": [ + { + "name": "Status Report", + "propertyName": "statusReport", + "functionName": "newSuperalgosProcessModulesStatusReport", + "fileName": "StatusReport.js" + }, + { + "name": "Status Dependencies", + "propertyName": "statusDependencies", + "functionName": "newSuperalgosProcessModulesStatusDependencies", + "fileName": "StatusDependencies.js" + }, + { + "name": "Data Dependencies", + "propertyName": "dataDependencies", + "functionName": "newSuperalgosProcessModulesDataDependencies", + "fileName": "DataDependencies.js" + }, + { + "name": "Dataset", + "propertyName": "dataset", + "functionName": "newSuperalgosProcessModulesDataset", + "fileName": "Dataset.js" + }, + { + "name": "Process Execution Events", + "propertyName": "processExecutionEvents", + "functionName": "newSuperalgosProcessModulesProcessExecutionEvents", + "fileName": "ProcessExecutionEvents.js" + }, + { + "name": "Process Output", + "propertyName": "processOutput", + "functionName": "newSuperalgosProcessModulesProcessOutput", + "fileName": "ProcessOutput.js" + } + ], "botClasses": [] }, "CL": {} diff --git a/TaskServer/DataDependencies.js b/TaskServer/DataDependencies.js index 9c8e44cd0..f0385efe6 100644 --- a/TaskServer/DataDependencies.js +++ b/TaskServer/DataDependencies.js @@ -1,4 +1,4 @@ -exports.newDataDependencies = function (processIndex, DATA_SET) { +exports.newSuperalgosProcessModulesDataDependencies = function (processIndex, DATA_SET) { const MODULE_NAME = "Data Dependencies"; @@ -73,7 +73,7 @@ let newNodeArray = [] for (let i = 0; i < thisObject.nodeArray.length; i++) { - let dataSetModule = DATA_SET.newDataSet(processIndex); + let dataSetModule = DATA_SET.newSuperalgosProcessModulesDataset(processIndex); dataSetModule.initialize(thisObject.nodeArray[i], onInitilized); function onInitilized(err, wasInitialized) { diff --git a/TaskServer/DataSet.js b/TaskServer/DataSet.js index dc56f9c96..1a5c0bbca 100644 --- a/TaskServer/DataSet.js +++ b/TaskServer/DataSet.js @@ -1,4 +1,4 @@ -exports.newDataSet = function (processIndex) { +exports.newSuperalgosProcessModulesDataset = function (processIndex) { const MODULE_NAME = "Dataset"; diff --git a/TaskServer/FileStorage.js b/TaskServer/FileStorage.js index 9d03730a2..26ab8fb1e 100644 --- a/TaskServer/FileStorage.js +++ b/TaskServer/FileStorage.js @@ -8,6 +8,14 @@ exports.newFileStorage = function newFileStorage(processIndex, host, port) { const FAST_RETRY_TIME_IN_MILISECONDS = 500 const SLOW_RETRY_TIME_IN_MILISECONDS = 2000 + let thisObject = { + asyncGetTextFile: asyncGetTextFile, + asyncCreateTextFile: asyncCreateTextFile, + getTextFile: getTextFile, + createTextFile: createTextFile, + deleteTextFile: deleteTextFile + } + let logger if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE === undefined) { // Dummy logger logger = {} @@ -18,15 +26,6 @@ exports.newFileStorage = function newFileStorage(processIndex, host, port) { } else { logger = TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE } - - let thisObject = { - asyncGetTextFile: asyncGetTextFile, - asyncCreateTextFile: asyncCreateTextFile, - getTextFile: getTextFile, - createTextFile: createTextFile, - deleteTextFile: deleteTextFile - } - return thisObject async function asyncGetTextFile(filePath, noRetry, canUsePrevious) { diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index 27034a397..e0c4fe2f6 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -131,7 +131,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newSuperalgosProcessModulesProcessExecutionEvents(processIndex) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -232,7 +232,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newSuperalgosProcessModulesStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { @@ -280,7 +280,7 @@ function initializeDataDependencies() { try { - dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, DATA_SET); + dataDependencies = DATA_DEPENDENCIES.newSuperalgosProcessModulesDataDependencies(processIndex, DATA_SET); dataDependencies.initialize(onInizialized); function onInizialized(err) { diff --git a/TaskServer/MultiPeriodDaily.js b/TaskServer/MultiPeriodDaily.js index 7ad73d7e8..96bffa423 100644 --- a/TaskServer/MultiPeriodDaily.js +++ b/TaskServer/MultiPeriodDaily.js @@ -24,9 +24,7 @@ return thisObject; function initialize(pProcessConfig, pStatusDependencies, pDataDependencies, callBackFunction) { - - - + statusDependencies = pStatusDependencies; dataDependenciesModule = pDataDependencies; processConfig = pProcessConfig; diff --git a/TaskServer/ProcessExecutionEvents.js b/TaskServer/ProcessExecutionEvents.js index 298622358..04b5a7e79 100644 --- a/TaskServer/ProcessExecutionEvents.js +++ b/TaskServer/ProcessExecutionEvents.js @@ -1,4 +1,4 @@ -exports.newProcessExecutionEvents = function (processIndex) { +exports.newSuperalgosProcessModulesProcessExecutionEvents = function (processIndex) { /* Here we manage the process execution events. This allow us to emit events when the process starts and finishes. Also to wait for a dependent event diff --git a/TaskServer/ProcessOutput.js b/TaskServer/ProcessOutput.js index 0e817de1f..83ee899ac 100644 --- a/TaskServer/ProcessOutput.js +++ b/TaskServer/ProcessOutput.js @@ -1,4 +1,4 @@ -exports.newProcessOutput = function (processIndex) { +exports.newSuperalgosProcessModulesProcessOutput = function (processIndex) { /* Here we emit the events that signals that a Dataset was updated. diff --git a/TaskServer/ReinforcementLearning/LearningBot.js b/TaskServer/ReinforcementLearning/LearningBot.js index 179984674..c79bc07c2 100644 --- a/TaskServer/ReinforcementLearning/LearningBot.js +++ b/TaskServer/ReinforcementLearning/LearningBot.js @@ -1,25 +1,6 @@ exports.newLearningBot = function (processIndex, parentLogger) { - const MODULE_NAME = "Learning Bot"; - const FULL_LOG = true; - - const TRADING_PROCESS_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + '/LowFrequencyTrading/MachineLearningProcess.js'); - const FILE_STORAGE = require('./FileStorage.js'); - const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession'); - - let fileStorage = FILE_STORAGE.newFileStorage(processIndex, parentLogger); - let session = SESSION.newLearningSession(processIndex, parentLogger) - - const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); - - let nextLoopTimeoutHandle; - - let thisObject = { - initialize: initialize, - run: run - }; - - let processConfig; + return thisObject; diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js index 0b8d7949f..1cfdee5d7 100644 --- a/TaskServer/SensorBot.js +++ b/TaskServer/SensorBot.js @@ -133,7 +133,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newSuperalgosProcessModulesProcessExecutionEvents(processIndex) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -235,7 +235,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newSuperalgosProcessModulesStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { diff --git a/TaskServer/StatusDependencies.js b/TaskServer/StatusDependencies.js index f47a3e59f..bbf16bc02 100644 --- a/TaskServer/StatusDependencies.js +++ b/TaskServer/StatusDependencies.js @@ -1,4 +1,4 @@ -exports.newStatusDependencies = function (processIndex, STATUS_REPORT, PROCESS_OUTPUT) { +exports.newSuperalgosProcessModulesStatusDependencies = function (processIndex, STATUS_REPORT, PROCESS_OUTPUT) { const MODULE_NAME = "Status Dependencies"; @@ -46,7 +46,7 @@ for (let i = 0; i < dependenciesToProcess.length; i++) { - let statusReportModule = STATUS_REPORT.newStatusReport(processIndex, PROCESS_OUTPUT); + let statusReportModule = STATUS_REPORT.newSuperalgosProcessModulesStatusReport(processIndex, PROCESS_OUTPUT); TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE.write(MODULE_NAME, "[INFO] initialize -> onInitilized -> Initializing Status Report # " + (i + 1)); let statusDependency = dependenciesToProcess[i] diff --git a/TaskServer/StatusReport.js b/TaskServer/StatusReport.js index 535cacc9d..1d8b008a8 100644 --- a/TaskServer/StatusReport.js +++ b/TaskServer/StatusReport.js @@ -1,4 +1,4 @@ -exports.newStatusReport = function (processIndex, PROCESS_OUTPUT) { +exports.newSuperalgosProcessModulesStatusReport = function (processIndex, PROCESS_OUTPUT) { /* @@ -365,7 +365,7 @@ /* All good, lets emit the event that means data has been updated. */ - let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex) + let processOutput = PROCESS_OUTPUT.newSuperalgosProcessModulesProcessOutput(processIndex) processOutput.raiseEvents(thisObject.file.lastFile, thisObject.file.timeFrames, callBackFunction); return } @@ -392,7 +392,7 @@ } /* All good, lets emit the event that means data has been updated. */ - let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex) + let processOutput = PROCESS_OUTPUT.newSuperalgosProcessModulesProcessOutput(processIndex) processOutput.asyncRaiseEvents(thisObject.file.lastFile, thisObject.file.timeFrames) } } diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index e5cfb374c..5589eacad 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -118,7 +118,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newSuperalgosProcessModulesProcessExecutionEvents(processIndex) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -219,7 +219,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newSuperalgosProcessModulesStatusDependencies(processIndex, STATUS_REPORT, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { @@ -267,7 +267,7 @@ function initializeDataDependencies() { try { - dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, DATA_SET); + dataDependencies = DATA_DEPENDENCIES.newSuperalgosProcessModulesDataDependencies(processIndex, DATA_SET); dataDependencies.initialize(onInizialized); function onInizialized(err) {