git pu

ai.js

@@ -163,6 +163,10 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
     let lossDone=0
     let allDone=0
     let allDonePer=0
+    let allLongDone=0
+    let allLongDonePer=0
+    let allShortDone=0
+    let allShortDonePer=0
     let lossDonePer=0
     let lossPlusDone=0
     let lossPlusDonePer=0
@@ -656,6 +660,14 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
         if (runBefore === false)
             continue
         allDone++
+
+        if (data[i].side === 'LONG') {
+            allLongDone++
+
+        }
+        else {
+            allShortDone++
+        }
         if (step === 0) {
             dateString = dateString + data[i].openDate.split(' ')[0] + '_'
             runupString = runupString + data[i].runUp + '_'
@@ -817,6 +829,12 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
             targetDone++
             allDonePer=allDonePer+config.target
             targetDonePer=targetDonePer+config.target
+
+
+            if (data[i].side === 'LONG')
+                allLongDonePer=allLongDonePer+config.target
+            else
+                allShortDonePer=allShortDonePer+config.target
             if (!d.riskFree)
                 total++
 
@@ -826,6 +844,10 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
             lossDone++
             lossDonePer=lossDonePer+data[i].profit-0.1
             allDonePer=allDonePer+data[i].profit-0.1
+            if (data[i].side === 'LONG')
+                allLongDonePer=allLongDonePer+data[i].profit-0.1
+            else
+                allShortDonePer=allShortDonePer+data[i].profit-0.1
             if (data[i].profit>0.1)
             {
                 lossPlusDone++
@@ -981,6 +1003,10 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
         allTotal: allTotal,
         allDone:allDone,
         allDonePer:allDonePer,
+        allLongDone:allLongDone,
+        allLongDonePer:allLongDonePer,
+        allShortDone:allShortDone,
+        allShortDonePer:allShortDonePer,
         targetDone:targetDone,
         targetDonePer:targetDonePer,
         lossDone:lossDone,

test_json.js

@@ -8,6 +8,6 @@ let t='-1.42_-1.4_-2.51_-2.09_-2.61_-1.98_-1.18_-0.91_-0.78_-0.45_-1.87_-2.22_-2
 let f=t.split('_')
 let arr=[]
 for (let i=0;i<f.length;i++)
-    if (parseFloat(f[i])>0)
+    if (parseFloat(f[i])>0.1)
         arr.push(f[i])
 console.log(arr)
\ No newline at end of file