Commit 5aa3069a authored by Ahmad Nemati's avatar Ahmad Nemati

init

parent 5883da7b
......@@ -38,6 +38,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
let lastMoney = 0
let levels = []
let detailLevel = []
let durDetail=[]
let dur
try {
......@@ -153,6 +154,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
if (d.done === true) {
let endDays = getNewMinDiff(startDays, data[i].closeDate)
detailLevel.push({step: step, dur: endDays})
durDetail.push({dur:endDays,days:startDays+'-'+endDays})
// console.log(typeof endDays)
//console.log(endDays)
if (endDays > maxDays)
......@@ -248,6 +250,15 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
}
durDetail = _.orderBy(durDetail, ['dur'], ['desc']);
let durDetailText=''
for (let i=0;i<durDetail.length;i++)
{
if (i>10)
break
durDetailText=durDetailText+durDetail[i].dur+':'+durDetail[i].days
}
// console.log(newLevelText)
// for (let i=0;i<newLevel)
......@@ -320,6 +331,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
percentage: percentage,
avgProfitPerDay: newT,
allocatedReserve: (maxAllocatedMoney) / Math.abs(maxReserve),
durDetailText:durDetailText,
minus: minus,
risk: risk,
levels: newLevelText,
......
let _=require('lodash')
let durDetail=[{dur:10},{dur:23},{dur:2},{dur:12}]
console.log(percentage(200,2))
function percentage(base, per) {
base = parseFloat(base)
per = parseFloat(per)
let percentager = per / 100
let temp = base * percentager
return base + temp
}
\ No newline at end of file
durDetail = _.orderBy(durDetail, ['dur'], ['desc']);
console.log(durDetail)
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