Commit d19de83e authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent 3b6dd61d
...@@ -939,8 +939,14 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -939,8 +939,14 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
type: type, type: type,
total: total, total: total,
allTotal: allTotal, allTotal: allTotal,
allDone: allDone,
allDonePer: allDonePer, allDonePer: allDonePer,
allDone: allDone,
countOfTrade: data.length,
pftrade: newP,
maxReseve: baseDrawDown,
maxMeta: baseMeta,
dur: dur,
allLongDone: allLongDone, allLongDone: allLongDone,
allLongDonePer: allLongDonePer, allLongDonePer: allLongDonePer,
allShortDone: allShortDone, allShortDone: allShortDone,
...@@ -957,7 +963,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -957,7 +963,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
lossShortDonePer: lossShortDonePer, lossShortDonePer: lossShortDonePer,
avgLevel: maxLevel / total, avgLevel: maxLevel / total,
maxLevel: maxLevel, maxLevel: maxLevel,
dur: dur,
maxDays: maxDays, maxDays: maxDays,
avgDays: s, avgDays: s,
maxRuntime: (maxRuntime) / 60, maxRuntime: (maxRuntime) / 60,
...@@ -977,8 +983,6 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -977,8 +983,6 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
drawDown: drawDown, drawDown: drawDown,
CompoundPerMonthDrawDown: compoundPerMonth / drawDown, CompoundPerMonthDrawDown: compoundPerMonth / drawDown,
profitPerMonthDrawDown: Math.abs(profitPerMonth) / drawDown, profitPerMonthDrawDown: Math.abs(profitPerMonth) / drawDown,
maxReseve: baseDrawDown,
maxMeta: baseMeta,
avgReserve: maxReserve / total, avgReserve: maxReserve / total,
percentage: percentage, percentage: percentage,
avgProfitPerDay: newT, avgProfitPerDay: newT,
...@@ -988,7 +992,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -988,7 +992,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
minus: minus, minus: minus,
risk: risk, risk: risk,
levels: newLevelText, levels: newLevelText,
pftrade: newP,
countOfTrade: data.length countOfTrade: data.length
......
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