Commit af84817e authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent d3fafc4d
...@@ -327,6 +327,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -327,6 +327,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
//console.log(VarRunupZeroProfit) //console.log(VarRunupZeroProfit)
// console.log(VarRunupZeroProfitRunup,RunupZeroProfitRunup)
if (data[i].runUp < avgRunup) { if (data[i].runUp < avgRunup) {
VarRunupZeroRunupDrawDown = VarRunupZeroRunupDrawDown + (data[i].runUp + data[i].drawDown) VarRunupZeroRunupDrawDown = VarRunupZeroRunupDrawDown + (data[i].runUp + data[i].drawDown)
VarRunupZeroProfit = VarRunupZeroProfit + data[i].profit VarRunupZeroProfit = VarRunupZeroProfit + data[i].profit
...@@ -741,6 +742,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -741,6 +742,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
} }
if (opt.total === 0) if (opt.total === 0)
return null return null
...@@ -751,10 +753,11 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -751,10 +753,11 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
} }
return opt return opt
// console.log(data)
} }
function getperp(target, maxAllocatedMoney) { function getperp(target, maxAllocatedMoney) {
......
...@@ -140,7 +140,7 @@ function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail, ...@@ -140,7 +140,7 @@ function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail,
let cz = [] let cz = []
for (let i = 0; i < config.length; i++) { for (let i = 0; i < config.length; i++) {
let d = ai.run(arr, config[i], config[i].risk, config[i].pfTrade, config[i].riskFreeLevel,detail,config[i].loss,config[i].dur,config[i].maxTradeDays,config[i].targetPercentage,candles,config[i].fft,config[i].ProfitZeroProfit,config[i].fftRunup,config[i].ProfitZeroProfitRunup,config[i].ProfitZeroDrawDownProfit,config[i].ProfitZeroDrawDown,config[i].ddPlusRunCount,config[i].RunupDrawDownZeroRunupDrawDown,config[i].ProfitZeroRunupProfit,config[i].ProfitZeroRunupDrawDown,config[i].RunUpDrawDownZeroProfit,config[i].RunUpDrawDownZeroDrawDownProfit,config[i].RunUpDrawDownZeroDrawdown,config[i].RunUpDrawDownZeroRunupProfit,config[i].usage) let d = ai.run(arr, config[i], config[i].risk, config[i].pfTrade, config[i].riskFreeLevel,detail,config[i].loss,config[i].dur,config[i].maxTradeDays,config[i].targetPercentage,candles,config[i].fft,config[i].ProfitZeroProfit,config[i].fftRunup,config[i].ProfitZeroProfitRunup,config[i].ProfitZeroDrawDownProfit,config[i].ProfitZeroDrawDown,config[i].ddPlusRunCount,config[i].RunupDrawDownZeroRunupDrawDown,config[i].ProfitZeroRunupProfit,config[i].ProfitZeroRunupDrawDown,config[i].RunUpDrawDownZeroProfit,config[i].RunUpDrawDownZeroDrawDownProfit,config[i].RunUpDrawDownZeroDrawdown,config[i].RunUpDrawDownZeroRunupProfit,config[i].RunupZeroRunupDrawDown,config[i].RunupZeroProfit,config[i].RunupZeroProfitDrawDown,config[i].RunupZeroDrawDown,config[i].RunupZeroProfitRunup,config[i].usage)
if (d !== null) if (d !== null)
cz.push(d) cz.push(d)
} }
......
let fs = require('fs') let fs = require('fs')
let list=[ let list=[
'RunUpDrawDownZeroDrawDownProfit', 'RunupZeroProfitRunup'
'ProfitZeroRunupProfit'
] ]
......
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