Commit 4cc8fe4e authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent 50f06793
......@@ -179,7 +179,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
runBefore = true
let obj
if (step === 0) {
unixStart = data[i].unixOpen
// unixStart = data[i].unixOpen
startDays = data[i].openDate
money = config.base
} else {
......@@ -243,8 +243,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
obj = d
obj.signal = data[i]
obj.signal.openTimeStamp = data[i].unixOpen
obj.signal.closeTimeStamp = data[i].unixClose
// obj.signal.openTimeStamp = data[i].unixOpen
// obj.signal.closeTimeStamp = data[i].unixClose
if (d.meta < 0)
......@@ -328,7 +328,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
total++
} else {
unixMid = data[i].unixClose
// unixMid = data[i].unixClose
step++
profit = profit + d.profit
lastMoney = d.lastMoney
......
......@@ -85,8 +85,8 @@ function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail,
obj.openPrice = parseFloat(data[i].Open_price)
obj.closePrice = parseFloat(data[i].Close_price)
obj.openDate = moment(data[i].Open_Time, 'YYYY.MM.DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss')
obj.unixOpen = parseFloat(data[i].openunix)
obj.unixClose = parseFloat(data[i].closeunix)
// obj.unixOpen = parseFloat(data[i].openunix)
// obj.unixClose = parseFloat(data[i].closeunix)
obj.closeDate = moment(data[i].Close_Time, 'YYYY.MM.DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss')
......
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