git pull

torobche.js

@@ -17,8 +17,9 @@ async function init() {
     for (let i = 0; i < 100; i++) {
         let closeDate = com[i].closeDate.split('_')
         let profits = com[i].profitLossString.split('_')
+        let side = com[i].sideString.split('_')
         for (let j = 0; j < closeDate.length - 1; j++)
-            add(closeDate[j], parseFloat(profits[j])-0.1)
+            add(closeDate[j], parseFloat(profits[j])-0.1,side[j])
 
     }
 
@@ -48,18 +49,26 @@ let arrNew=[]
     arrNew = _.orderBy(arrNew, ['sum'])
     console.log(arr)
     console.log('Balance ->',balance)
-    console.log('Max reserve ->',arrNew[0].sum,'date ->',arrNew[0].date)
+    console.log('Worth ->',arrNew[0])
 
 }
 
 
-function add(date, profit) {
+function add(date, profit,side) {
     for (let i = 0; i < arr.length; i++)
         if (arr[i].date === date) {
             arr[i].profit = arr[i].profit + profit
+
+            if ( side ==='LONG')
+                arr[i].longCount++
+            else
+                arr[i].shortCount++
             return
         }
 
-    arr.push({date: date, profit: profit})
+    if ( side ==='LONG')
+    arr.push({date: date, profit: profit,count:1,longCount:1,shortCount:0})
+    else
+        arr.push({date: date, profit: profit,count:1,longCount:1,shortCount:1})
 
 }