Commit 3973cf6c authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent fd888b4b
...@@ -878,7 +878,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -878,7 +878,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
let totalPlus = totalFinal + allLoss let totalPlus = totalFinal + allLoss
let oldTotalFinal = totalFinal let oldTotalFinal = totalFinal
totalFinal = totalPlus totalFinal = totalPlus
let newT = totalFinal / dur let newT = allDonePer / dur
let percentage = maxReserve + totalFinal let percentage = maxReserve + totalFinal
percentage = maxAllocatedMoney / percentage percentage = maxAllocatedMoney / percentage
let minus = 0 let minus = 0
...@@ -887,7 +887,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -887,7 +887,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
percentage = null percentage = null
} }
let profitPerMonth = (newT * 30 * 100) / maxAllocatedMoney let profitPerMonth = (allDonePer/dur)*30
// let percentage2 = maxReserve + newT // let percentage2 = maxReserve + newT
......
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