Commit 932948f6 authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 145bd187
...@@ -239,8 +239,8 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -239,8 +239,8 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
} }
if (dur < durs) // if (dur < durs)
return null // return null
let newP = dur / data.length let newP = dur / data.length
// console.log(data.length) // console.log(data.length)
...@@ -261,10 +261,10 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -261,10 +261,10 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if (allDonePer < -50) // if (allDonePer < -50)
return null // return null
if (maxDays > maxTradeDays) // if (maxDays > maxTradeDays)
return null // return null
if (runBefore === false) { if (runBefore === false) {
if (usage === 'fft') { if (usage === 'fft') {
...@@ -1052,11 +1052,11 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss ...@@ -1052,11 +1052,11 @@ function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss
} }
let ff=dur/7 let ff=dur/7
if (ff > opt.allDone) // if (ff > opt.allDone)
return null // return null
//
if (opt.newAllDonePer < 10) // if (opt.newAllDonePer < 10)
return null // 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