Commit 098c651d authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent ba8401d0
...@@ -175,6 +175,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -175,6 +175,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
let realProfit = 0 let realProfit = 0
let dateString = '' let dateString = ''
let runupString = '' let runupString = ''
let profitLossString=''
let sideString = '' let sideString = ''
// console.log(data) // console.log(data)
...@@ -819,7 +820,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -819,7 +820,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
} else { } else {
profitLossString = profitLossString + data[i].profit + '_'
lossDone++ lossDone++
lossDonePer=lossDonePer+data[i].profit-0.1 lossDonePer=lossDonePer+data[i].profit-0.1
allDonePer=allDonePer+data[i].profit-0.1 allDonePer=allDonePer+data[i].profit-0.1
...@@ -992,9 +993,9 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -992,9 +993,9 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
dateString: dateString, dateString: dateString,
runupString: runupString, runupString: runupString,
sideString: sideString, sideString: sideString,
profitLossString:profitLossString,
firstMaxAllocatedMoney: firstMaxAllocatedMoney, firstMaxAllocatedMoney: firstMaxAllocatedMoney,
maxAllocatedMoney: maxAllocatedMoney, maxAllocatedMoney: maxAllocatedMoney,
avgAllocatedMoney: maxAllocatedMoney / total, avgAllocatedMoney: maxAllocatedMoney / total,
drawDown: drawDown, drawDown: drawDown,
CompoundPerMonthDrawDown: compoundPerMonth / drawDown, CompoundPerMonthDrawDown: compoundPerMonth / drawDown,
......
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