maximunBalance

This commit is contained in:
Luis Fernando Molina committed 2019-06-09 16:21:43 +02:00
1 parent 260eb9564b
commit 75bb5813e3
2 files changed
+22 -9

No files matched your search

+14 -2
View File
@@ -338,7 +338,13 @@
record.takeProfit = dailyFile[i][22];
record.stopLossPhase = dailyFile[i][23];
record.takeProfitPhase = dailyFile[i][24];
record.sellAmount = dailyFile[i][26]; // 25 is the message for the executor
record.positionSize = dailyFile[i][26]; // 25 is the message for the executor
record.initialBalanceA = dailyFile[i][27];
record.minimunBalanceA = dailyFile[i][28];
record.maximunBalanceA = dailyFile[i][29];
record.initialBalanceB = dailyFile[i][30];
record.minimunBalanceB = dailyFile[i][31];
record.maximunBalanceB = dailyFile[i][32];
if (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) {
@@ -428,7 +434,13 @@
record.takeProfit = marketFile[i][22];
record.stopLossPhase = marketFile[i][23];
record.takeProfitPhase = marketFile[i][24];
record.sellAmount = marketFile[i][26]; // 25 is the message for the executor
record.positionSize = marketFile[i][26]; // 25 is the message for the executor
record.initialBalanceA = marketFile[i][27];
record.minimunBalanceA = marketFile[i][28];
record.maximunBalanceA = marketFile[i][29];
record.initialBalanceB = marketFile[i][30];
record.minimunBalanceB = marketFile[i][31];
record.maximunBalanceB = marketFile[i][32];
if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) {
+8 -7
View File
@@ -20,7 +20,7 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation
let currentRecord;
let panelTabButton
return thisObject;
@@ -208,9 +208,9 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation
params = {}
params.VALUE = currentRecord.innerRecord.balanceA;
params.INIT_VALUE = 1
params.MIN_VALUE = 0.5
params.MAX_VALUE = 2
params.INIT_VALUE = currentRecord.innerRecord.initialBalanceA
params.MIN_VALUE = currentRecord.innerRecord.minimunBalanceA
params.MAX_VALUE = currentRecord.innerRecord.maximunBalanceA
params.ASSET_LABEL = 'Asset A'
params.ASSET_NAME = DEFAULT_MARKET.assetB + ' '
params.LEFT_OFFSET = 100
@@ -219,9 +219,9 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation
params = {}
params.VALUE = currentRecord.innerRecord.balanceB;
params.MIN_VALUE = 0
params.INIT_VALUE = currentRecord.innerRecord.rate * currentRecord.innerRecord.sellAmount;
params.MAX_VALUE = params.INIT_VALUE * 2;
params.MIN_VALUE = currentRecord.innerRecord.minimunBalanceB
params.INIT_VALUE = currentRecord.innerRecord.initialBalanceB
params.MAX_VALUE = currentRecord.innerRecord.maximunBalanceB
params.ASSET_LABEL = 'Asset B'
params.ASSET_NAME = DEFAULT_MARKET.assetA + ' '
params.LEFT_OFFSET = 220
@@ -249,3 +249,4 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation