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

Episode

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-05-21 10:42:02 +02:00
1 parent c250615574
commit b14b69b53e
4 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Project.njsproj
+1 -1
View File
@@ -37,7 +37,7 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="TradingSimulation.js" />
<Compile Include="TradingSimulationPartialResultsPanel.js" />
<Compile Include="TradingSimulationEpisodePanel.js" />
</ItemGroup>
<ItemGroup>
<Content Include="this.plotter.config.json" />
Strategies.js
+4 -4
View File
@@ -383,7 +383,7 @@
record.number = dailyFile[i][3];
record.beginRate = dailyFile[i][4];
record.endRate = dailyFile[i][5];
record.triggerOnSituation = dailyFile[i][6];
record.situationName = dailyFile[i][6];
record.name = dailyFile[i][7];
if (
@@ -456,7 +456,7 @@
record.number = marketFile[i][3];
record.beginRate = marketFile[i][4];
record.endRate = marketFile[i][5];
record.triggerOnSituation = marketFile[i][6];
record.situationName = marketFile[i][6];
record.name = marketFile[i][7];
if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) {
@@ -588,8 +588,8 @@
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);
if (record.situationName !== "New Situation") {
printLabel(record.situationName, recordPoint1.x + 5, positionY, '1', 12);
}
}
Trades.js
+3 -3
View File
@@ -370,7 +370,7 @@
record.beginRate = dailyFile[i][4];
record.endRate = dailyFile[i][5];
record.exitType = dailyFile[i][6];
record.takePositionSituation = dailyFile[i][7];
record.situationName = dailyFile[i][7];
if (
(record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -436,7 +436,7 @@
record.beginRate = marketFile[i][4];
record.endRate = marketFile[i][5];
record.exitType = marketFile[i][6];
record.takePositionSituation = marketFile[i][7];
record.situationName = marketFile[i][7];
if (
(record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) &&
@@ -518,7 +518,7 @@
recordPoint2 = thisObject.fitFunction(recordPoint2);
recordPoint3 = thisObject.fitFunction(recordPoint3);
let line0 = record.takePositionSituation
let line0 = record.situationName
let line1 = '';
let line2 = '';
TradingSimulationPartialResultsPanel.js → TradingSimulationEpisodePanel.js
+3 -3
View File
@@ -1,5 +1,5 @@

function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimulationPartialResultsPanel() {
function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimulationEpisodePanel() {
let thisObject = {
fitFunction: undefined,
@@ -17,7 +17,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul
container.initialize();
thisObject.container = container;
container.frame.containerName = "Simulation Partial Results Panel";
container.frame.containerName = "Simulation Episode Panel";
let record;
let lastRecord;
@@ -126,7 +126,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul
y = y + increment;
y = y + increment;
printLabel('Partial Results', X_AXIS, frameTitleHeight + frameBodyHeight * y, '1.00', 14, undefined, true, thisObject.container, thisObject.fitFunction);
printLabel('Episode', X_AXIS, frameTitleHeight + frameBodyHeight * y, '1.00', 14, undefined, true, thisObject.container, thisObject.fitFunction);
y = y + increment;
printLabel('Profit / Loss', X_AXIS, frameTitleHeight + frameBodyHeight * y, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction);