Commit 6a561bff authored by Ahmad Nemati's avatar Ahmad Nemati

init

parent 3b5e335c
...@@ -73,7 +73,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -73,7 +73,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
return null return null
let obj let obj
if (step === 0) { if (step === 0) {
unixStart = moment.tz(data[i].openDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix() unixStart = data[i].unixOpen
startDays = data[i].openDate startDays = data[i].openDate
money = config.base money = config.base
} else { } else {
...@@ -137,8 +137,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -137,8 +137,8 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
obj = d obj = d
obj.signal = data[i] obj.signal = data[i]
obj.signal.openTimeStamp = moment.tz(data[i].openDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix() obj.signal.openTimeStamp = data[i].unixOpen
obj.signal.closeTimeStamp = moment.tz(data[i].closeDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix() obj.signal.closeTimeStamp = data[i].unixClose
if (d.meta < 0) if (d.meta < 0)
...@@ -186,7 +186,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max ...@@ -186,7 +186,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
maxDays = endDays maxDays = endDays
let runnigTime = 0 let runnigTime = 0
runnigTime = calculateRunnigTime(data[i].side, moment.tz(data[i].openDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix(), moment.tz(data[i].closeDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix(), d.targetPrice) runnigTime = calculateRunnigTime(data[i].side, data[i].unixOpen, data[i].unixClose, d.targetPrice)
if (step !== 0) if (step !== 0)
runnigTime = runnigTime + (unixMid - unixStart) runnigTime = runnigTime + (unixMid - unixStart)
...@@ -216,7 +216,7 @@ runnigTime=runnigTime/3600 ...@@ -216,7 +216,7 @@ runnigTime=runnigTime/3600
total++ total++
} else { } else {
unixMid = moment.tz(data[i].closeDate, 'YYYY.MM.DD HH:mm:ss', 'GMT').unix() unixMid = data[i].unixClose
step++ step++
profit = profit + d.profit profit = profit + d.profit
lastMoney = d.lastMoney lastMoney = d.lastMoney
......
...@@ -85,6 +85,8 @@ function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail, ...@@ -85,6 +85,8 @@ function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail,
obj.openPrice = parseFloat(data[i].Open_price) obj.openPrice = parseFloat(data[i].Open_price)
obj.closePrice = parseFloat(data[i].Close_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.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.closeDate = moment(data[i].Close_Time, 'YYYY.MM.DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') 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