fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ready to Import Run Simulation

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-11-20 09:47:48 +01:00
1 parent 3da386abce
commit 0fb685a34f
4 files changed
+29 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Commons.js
+18 -17
View File
@@ -24,21 +24,21 @@
function validateDataDependencies(dataDependencies, callBackFunction) {
for (let i = 0; i < dataDependencies.length; i++) {
let dataDependencyNode = dataDependencies[i].referenceParent
let dataDependencyNode = dataDependencies[i]
/* Basic validations to see if we have everything we need. */
if (dataDependencyNode.parentNode.code.singularVariableName === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Single Variable Name defined. Product Definition = " + JSON.stringify(dataDependencyNode.parentNode));
if (dataDependencyNode.referenceParent.parentNode.code.singularVariableName === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Single Variable Name defined. Product Definition = " + JSON.stringify(dataDependencyNode.referenceParent.parentNode));
callBackFunction(global.DEFAULT_FAIL_RESPONSE);
return
}
if (dataDependencyNode.parentNode.code.pluralVariableName === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Plural Variable Name defined. Product Definition = " + JSON.stringify(dataDependencyNode.parentNode));
if (dataDependencyNode.referenceParent.parentNode.code.pluralVariableName === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Plural Variable Name defined. Product Definition = " + JSON.stringify(dataDependencyNode.referenceParent.parentNode));
callBackFunction(global.DEFAULT_FAIL_RESPONSE);
return
}
if (dataDependencyNode.parentNode.record === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Record Definition. Product Definition = " + JSON.stringify(dataDependencyNode.parentNode));
if (dataDependencyNode.referenceParent.parentNode.record === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Record Definition. Product Definition = " + JSON.stringify(dataDependencyNode.referenceParent.parentNode));
callBackFunction(global.DEFAULT_FAIL_RESPONSE);
return
}
@@ -71,9 +71,7 @@
return
}
if (outputDatasetNode.referenceParent.parentNode.dataBuilding === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Product Definition without a Data Building Procedure. Product Definition = " + JSON.stringify(outputDatasetNode.referenceParent.parentNode));
callBackFunction(global.DEFAULT_FAIL_RESPONSE);
return
logger.write(MODULE_NAME, "[WARN] start -> Product Definition without a Data Building Procedure. Product Definition = " + JSON.stringify(outputDatasetNode.referenceParent.parentNode));
}
if (outputDatasetNode.referenceParent.code.codeName === undefined) {
logger.write(MODULE_NAME, "[ERROR] start -> Dataset witn no codeName defined. Product Dataset = " + JSON.stringify(outputDatasetNode.referenceParent));
@@ -128,25 +126,28 @@
*/
for (let i = 0; i < dataDependencies.length; i++) {
let dataFile = dataFiles[i]
let dataFile
let jsonData // Datafile converted into Json objects
let inputData // Includes calculated properties
let singularVariableName // name of the variable for this product
let recordDefinition
let dataDependencyNode = dataDependencies[i].referenceParent
let dataDependencyNode = dataDependencies[i]
dataFile = dataFiles.get(dataDependencyNode.id)
recordDefinition = dataDependencyNode.parentNode.record
singularVariableName = dataDependencyNode.parentNode.code.singularVariableName
if (dataFile === undefined) { continue } // When a datafile is not found it might be because we are processing market or daily and at the dependency array there are both types mixed up.
recordDefinition = dataDependencyNode.referenceParent.parentNode.record
singularVariableName = dataDependencyNode.referenceParent.parentNode.code.singularVariableName
/* Transform the raw data into JSON objects */
jsonData = jsonifyDataFile(dataFile, recordDefinition)
/* Add the calculated properties */
if (dataDependencyNode.parentNode.calculations !== undefined) {
inputData = calculationsProcedure(jsonData, recordDefinition, dataDependencyNode.parentNode.calculations, singularVariableName, timePeriod)
if (dataDependencyNode.referenceParent.parentNode.calculations !== undefined) {
inputData = calculationsProcedure(jsonData, recordDefinition, dataDependencyNode.referenceParent.parentNode.calculations, singularVariableName, timePeriod)
} else {
inputData = jsonData
}
products[dataDependencyNode.parentNode.code.pluralVariableName] = inputData
products[dataDependencyNode.referenceParent.parentNode.code.pluralVariableName] = inputData
/* The main dependency is defined as the first dependency processed. */
if (mainDependency.records === undefined) {
MultiPeriod.js
+5 -5
View File
@@ -17,7 +17,7 @@
let statusDependencies;
let dataDependencies;
let datasets = [];
let dataFiles = [];
let dataFiles = new Map();
let multiPeriodDataFiles = new Map();
let botInstance;
@@ -287,7 +287,7 @@
const outputPeriodLabel = global.marketFilesPeriods[n][1];
let dependencyIndex = 0;
dataFiles = [];
dataFiles = new Map();
if (bot.VALUES_TO_USE.timePeriod === outputPeriodLabel) {
currentTimePeriod = global.marketFilesPeriods[n][0];
@@ -339,7 +339,7 @@
}
let dataFile = JSON.parse(text);
dataFiles.push(dataFile);
dataFiles.set(dependency.id, dataFile);
dependencyControlLoop();
@@ -596,7 +596,7 @@
}
let dependencyIndex = 0;
dataFiles = [];
dataFiles = new Map();
dependencyLoopBody();
function dependencyLoopBody() {
@@ -748,7 +748,7 @@
let dataFile = previousFile.concat(currentFile);
dataFiles.push(dataFile);
dataFiles.set(dependency.id, dataFile);
dependencyControlLoop();
MultiPeriodDaily.js
+3 -3
View File
@@ -17,7 +17,7 @@
let statusDependencies;
let dataDependencies;
let datasets = [];
let dataFiles = [];
let dataFiles = new Map;
let botInstance;
@@ -386,7 +386,7 @@
}
let dependencyIndex = 0;
dataFiles = [];
dataFiles = new Map();
dependencyLoopBody();
@@ -533,7 +533,7 @@
let dataFile = previousFile.concat(currentFile);
dataFiles.push(dataFile);
dataFiles.set(dependency.id, dataFile);
dependencyControlLoop();
}
MultiPeriodMarket.js
+3 -3
View File
@@ -15,7 +15,7 @@
let statusDependencies;
let dataDependencies;
let datasets = [];
let dataFiles = [];
let dataFiles = new Map();
let botInstance;
@@ -151,7 +151,7 @@
const outputPeriodLabel = global.marketFilesPeriods[n][1];
let dependencyIndex = 0;
dataFiles = [];
dataFiles = new Map;
dependencyLoopBody();
@@ -198,7 +198,7 @@
}
let dataFile = JSON.parse(text);
dataFiles.push(dataFile);
dataFiles.set(dependency.id, dataFile);
dependencyControlLoop();