Commit 85bc857a authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 4a60de18
...@@ -89,9 +89,9 @@ async function run() ...@@ -89,9 +89,9 @@ async function run()
balance=lastBalance balance=lastBalance
arr=[] arr=[]
for (let i = 0; i < size; i++) { for (let i = 0; i < size; i++) {
let closeDate = com[i].closeDate.split('_') let closeDate = com[i].c.split('_')
let profits = com[i].profitLossString.split('_') let profits = com[i].p.split('_')
let side = com[i].sideString.split('_') let side = com[i].s.split('_')
for (let j = 0; j < closeDate.length - 1; j++) for (let j = 0; j < closeDate.length - 1; j++)
add(closeDate[j], parseFloat(profits[j])-0.1,side[j]) add(closeDate[j], parseFloat(profits[j])-0.1,side[j])
...@@ -205,7 +205,7 @@ function add(date, profit,side) { ...@@ -205,7 +205,7 @@ function add(date, profit,side) {
arr[i].profit = arr[i].profit + profit arr[i].profit = arr[i].profit + profit
arr[i].count++ arr[i].count++
if ( side ==='LONG') { if ( side ==='L') {
arr[i].longCount++ arr[i].longCount++
arr[i].longProfit= arr[i].longProfit+profit arr[i].longProfit= arr[i].longProfit+profit
} }
......
...@@ -75,9 +75,9 @@ async function run() ...@@ -75,9 +75,9 @@ async function run()
balance=lastBalance balance=lastBalance
arr=[] arr=[]
for (let i = 0; i < size; i++) { for (let i = 0; i < size; i++) {
let closeDate = com[i].closeDate.split('_') let closeDate = com[i].c.split('_')
let profits = com[i].profitLossString.split('_') let profits = com[i].p.split('_')
let side = com[i].sideString.split('_') let side = com[i].s.split('_')
for (let j = 0; j < closeDate.length - 1; j++) for (let j = 0; j < closeDate.length - 1; j++)
add(closeDate[j], parseFloat(profits[j])-0.1,side[j]) add(closeDate[j], parseFloat(profits[j])-0.1,side[j])
...@@ -180,7 +180,7 @@ function add(date, profit,side) { ...@@ -180,7 +180,7 @@ function add(date, profit,side) {
arr[i].profit = arr[i].profit + profit arr[i].profit = arr[i].profit + profit
arr[i].count++ arr[i].count++
if ( side ==='LONG') { if ( side ==='L') {
arr[i].longCount++ arr[i].longCount++
arr[i].longProfit= arr[i].longProfit+profit arr[i].longProfit= arr[i].longProfit+profit
} }
......
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