Commit 87fb504a authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 0655c417
...@@ -155,8 +155,8 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -155,8 +155,8 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
let maxRuntime = 0 let maxRuntime = 0
let realProfit = 0 let realProfit = 0
let dateString = '' let dateString = ''
let closeDate='' let closeDate = ''
let drawDownString='' let drawDownString = ''
let runupString = '' let runupString = ''
let profitLossString = '' let profitLossString = ''
let sideString = '' let sideString = ''
...@@ -967,9 +967,9 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -967,9 +967,9 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
sums = sums + parseFloat(tt[j]) sums = sums + parseFloat(tt[j])
// console.log(sum,parseFloat(t[j])) // console.log(sum,parseFloat(t[j]))
if (arrNew.length ===0) if (arrNew.length === 0)
arrNew.push({sum: sums, index: i}) arrNew.push({sum: sums, index: i})
else if (arrNew[arrNew.length-1].sum > sums) else if (arrNew[arrNew.length - 1].sum > sums)
arrNew.push({sum: sums, index: i}) arrNew.push({sum: sums, index: i})
//console.log(sum) //console.log(sum)
...@@ -1029,7 +1029,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -1029,7 +1029,7 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
runupString: runupString, runupString: runupString,
sideString: sideString, sideString: sideString,
profitLossString: profitLossString, profitLossString: profitLossString,
closeDate:closeDate, closeDate: closeDate,
firstMaxAllocatedMoney: firstMaxAllocatedMoney, firstMaxAllocatedMoney: firstMaxAllocatedMoney,
maxAllocatedMoney: maxAllocatedMoney, maxAllocatedMoney: maxAllocatedMoney,
avgAllocatedMoney: maxAllocatedMoney / total, avgAllocatedMoney: maxAllocatedMoney / total,
...@@ -1051,12 +1051,13 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -1051,12 +1051,13 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
} }
if (opt.allDonePer < 240)
return null
if (opt.newAllDonePer < 12) if (dur / 7 < opt.allDone)
return null return null
// if (opt.newAllDonePer < 12)
// return null
// if (opt.allDone <60) // if (opt.allDone <60)
// return null // return null
// //
......
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