From 96fd7e2a1d2ffda61087f138b40711f850756025 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 21 May 2020 13:50:57 +0200 Subject: [PATCH] all good --- Conditions.js | 4 ++-- TradingSimulation.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Conditions.js b/Conditions.js index 4471f523a..1d932cf6e 100644 --- a/Conditions.js +++ b/Conditions.js @@ -495,8 +495,8 @@ let record = { conditionsNames: headers, strategyIndex: conditionRecord.strategyIndex, - stopLossPhase: conditionRecord.stopLossPhase, - takeProfitPhase: conditionRecord.takeProfitPhase, + variable_current_position_stopLoss_phase: conditionRecord.variable_current_position_stopLoss_phase, + variable_current_position_takeProfit_phase: conditionRecord.variable_current_position_takeProfit_phase, conditionsValues: conditionRecord.conditions, formulaErrors: conditionRecord.formulaErrors, formulaValues: conditionRecord.formulaValues diff --git a/TradingSimulation.js b/TradingSimulation.js index bc72d9c0d..629e9c8c1 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -533,11 +533,11 @@ let takeProfitPhase = -1; if (i > 0) { - if (record.variable_current_position_stopLoss_phase !== records[i - 1].stopLossPhase) { + if (record.variable_current_position_stopLoss_phase !== records[i - 1].variable_current_position_stopLoss_phase) { stopLossPhase = record.variable_current_position_stopLoss_phase; } - if (record.variable_current_position_takeProfit_phase !== records[i - 1].takeProfitPhase) { + if (record.variable_current_position_takeProfit_phase !== records[i - 1].variable_current_position_takeProfit_phase) { takeProfitPhase = record.variable_current_position_takeProfit_phase; } }