Commit 11748627 authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent d19de83e
...@@ -148,8 +148,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -148,8 +148,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
let lossShortDone = 0 let lossShortDone = 0
let lossShortDonePer = 0 let lossShortDonePer = 0
let lossDonePer = 0 let lossDonePer = 0
let lossPlusDone = 0 let profitDone = 0
let lossPlusDonePer = 0 let profitDonePer = 0
let listDays = [] let listDays = []
let maxReserve = 0 let maxReserve = 0
let maxMeta = 0 let maxMeta = 0
...@@ -788,8 +788,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -788,8 +788,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
} }
if (data[i].profit > 0.1) { if (data[i].profit > 0.1) {
lossPlusDone++ profitDone++
lossPlusDonePer = lossPlusDonePer + (data[i].profit + -0.1) profitDonePer = profitDonePer + (data[i].profit + -0.1)
} }
// unixMid = data[i].unixClose // unixMid = data[i].unixClose
// step++ // step++
...@@ -955,12 +955,13 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -955,12 +955,13 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
targetDonePer: targetDonePer, targetDonePer: targetDonePer,
lossDone: lossDone, lossDone: lossDone,
lossDonePer: lossDonePer, lossDonePer: lossDonePer,
lossPlusDone: lossPlusDone,
lossPlusDonePer: lossPlusDonePer,
lossLongDone: lossLongDone, lossLongDone: lossLongDone,
lossLongDonePer: lossLongDonePer, lossLongDonePer: lossLongDonePer,
lossShortDone: lossShortDone, lossShortDone: lossShortDone,
lossShortDonePer: lossShortDonePer, lossShortDonePer: lossShortDonePer,
profitDone: profitDone,
profitDonePer: profitDonePer,
avgLevel: maxLevel / total, avgLevel: maxLevel / total,
maxLevel: maxLevel, maxLevel: maxLevel,
......
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