Commit db063366 authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 2bb17e1c
...@@ -156,6 +156,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -156,6 +156,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
let realProfit = 0 let realProfit = 0
let dateString = '' let dateString = ''
let closeDate='' let closeDate=''
let drawDownString=''
let runupString = '' let runupString = ''
let profitLossString = '' let profitLossString = ''
let sideString = '' let sideString = ''
...@@ -775,6 +776,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -775,6 +776,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
profitLossString = profitLossString + data[i].profit + '_' profitLossString = profitLossString + data[i].profit + '_'
closeDate = closeDate + data[i].closeDate.split(' ')[0] + '_' closeDate = closeDate + data[i].closeDate.split(' ')[0] + '_'
drawDownString = drawDownString + data[i].drawDown.split(' ')[0] + '_'
if (data[i].profit <= 0.1) { if (data[i].profit <= 0.1) {
lossDone++ lossDone++
...@@ -1027,6 +1029,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -1027,6 +1029,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
runupString: runupString, runupString: runupString,
sideString: sideString, sideString: sideString,
profitLossString: profitLossString, profitLossString: profitLossString,
drawDownString:drawDownString,
closeDate:closeDate, closeDate:closeDate,
firstMaxAllocatedMoney: firstMaxAllocatedMoney, firstMaxAllocatedMoney: firstMaxAllocatedMoney,
maxAllocatedMoney: maxAllocatedMoney, maxAllocatedMoney: maxAllocatedMoney,
......
...@@ -8,6 +8,9 @@ let arr = [] ...@@ -8,6 +8,9 @@ let arr = []
let balance =1000 let balance =1000
init() init()
//profitLossString
//drawDownString
async function init() { async function init() {
let com = await fs.readFileSync('t.json', 'utf8'); let com = await fs.readFileSync('t.json', 'utf8');
com = JSON.parse(com) com = JSON.parse(com)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment