diff --git a/Legacy-Code/TradingEngines/plotters/Plotters-Trading-Simulation/Strategies.js b/Legacy-Code/TradingEngines/plotters/Plotters-Trading-Simulation/Strategies.js index 5f49a356a..2e82c2267 100644 --- a/Legacy-Code/TradingEngines/plotters/Plotters-Trading-Simulation/Strategies.js +++ b/Legacy-Code/TradingEngines/plotters/Plotters-Trading-Simulation/Strategies.js @@ -384,6 +384,7 @@ record.beginRate = dailyFile[i][4]; record.endRate = dailyFile[i][5]; record.triggerOnSituation = dailyFile[i][6]; + record.name = dailyFile[i][7]; if ( (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) && @@ -456,6 +457,7 @@ record.beginRate = marketFile[i][4]; record.endRate = marketFile[i][5]; record.triggerOnSituation = marketFile[i][6]; + record.name = marketFile[i][7]; if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) { @@ -581,7 +583,11 @@ /* Situation Name */ let digit = record.begin.toFixed(0).substring(7,8) let positionY = recordPoint3.y - (recordPoint3.y - recordPoint1.y) / 2 + (Number(digit) * 10 - 50) + if (canvas.chartingSpace.viewport.zoomLevel >= ZOOM_OUT_THRESHOLD_FOR_HIDDING_CHARTS_LABELS) { + if (record.name !== "New Strategy") { + printLabel(record.name, recordPoint1.x + 5, positionY - 15, '1', 12); + } if (record.triggerOnSituation !== "New Situation") { printLabel(record.triggerOnSituation, recordPoint1.x + 5, positionY, '1', 12); } diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index f17146049..fe866f88a 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -377,7 +377,8 @@ record.number + "," + record.beginRate + "," + record.endRate + "," + - '"' + record.triggerOnSituation + '"' + "]"; + '"' + record.triggerOnSituation + '"' + "," + + '"' + record.name + '"' + "]"; if (separator === "") { separator = ","; } @@ -813,7 +814,8 @@ record.number + "," + record.beginRate + "," + record.endRate + "," + - '"' + record.triggerOnSituation + '"' + "]"; + '"' + record.triggerOnSituation + '"' + "," + + '"' + record.name + '"' + "]"; if (separator === "") { separator = ","; } diff --git a/TaskServer/TradingSimulation.js b/TaskServer/TradingSimulation.js index 0f0c30c34..2cb22cc25 100644 --- a/TaskServer/TradingSimulation.js +++ b/TaskServer/TradingSimulation.js @@ -139,7 +139,8 @@ number: 0, beginRate: 0, endRate: 0, - triggerOnSituation: '' + triggerOnSituation: '', + name: '' } let currentTrade = { @@ -224,7 +225,8 @@ number: 0, beginRate: 0, endRate: 0, - triggerOnSituation: '' + triggerOnSituation: '', + name: '' } yesterday.currentTrade = { @@ -302,7 +304,8 @@ number: 0, beginRate: 0, endRate: 0, - triggerOnSituation: '' + triggerOnSituation: '', + name: '' } interExecutionMemory.currentTrade = { @@ -382,7 +385,8 @@ number: interExecutionMemory.currentStrategy.number, beginRate: interExecutionMemory.currentStrategy.beginRate, endRate: interExecutionMemory.currentStrategy.endRate, - triggerOnSituation: interExecutionMemory.currentStrategy.triggerOnSituation + triggerOnSituation: interExecutionMemory.currentStrategy.triggerOnSituation, + name: currentStrategy.name } currentTrade = { @@ -465,7 +469,8 @@ number: currentStrategy.number, beginRate: currentStrategy.beginRate, endRate: currentStrategy.endRate, - triggerOnSituation: currentStrategy.triggerOnSituation + triggerOnSituation: currentStrategy.triggerOnSituation, + name: currentStrategy.name } yesterday.currentTrade = { @@ -1371,6 +1376,7 @@ currentStrategy.beginRate = candle.min; currentStrategy.endRate = candle.min; // In case the strategy does not get exited currentStrategy.triggerOnSituation = situation.name + currentStrategy.name = strategy.name if (processingDailyFiles) { if (positionedAtYesterday) { @@ -1380,6 +1386,7 @@ yesterday.currentStrategy.beginRate = currentStrategy.beginRate; yesterday.currentStrategy.endRate = currentStrategy.endRate; yesterday.currentStrategy.triggerOnSituation = currentStrategy.triggerOnSituation; + yesterday.currentStrategy.name = currentStrategy.name; } } @@ -2941,7 +2948,8 @@ number: 0, beginRate: 0, endRate: 0, - triggerOnSituation: '' + triggerOnSituation: '', + name: '' } if (processingDailyFiles) { @@ -2953,7 +2961,8 @@ number: 0, beginRate: 0, endRate: 0, - triggerOnSituation: '' + triggerOnSituation: '', + name: '' } } } @@ -3283,7 +3292,8 @@ number: yesterday.currentStrategy.number, beginRate: yesterday.currentStrategy.beginRate, endRate: yesterday.currentStrategy.endRate, - triggerOnSituation: yesterday.currentStrategy.triggerOnSituation + triggerOnSituation: yesterday.currentStrategy.triggerOnSituation, + name: yesterday.currentStrategy.name } interExecutionMemory.currentTrade = {