git pu

ai.js

@@ -158,6 +158,12 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
     let maxDays = 0
     let startDays = 0
     let allTotal = 0
+    let targetDone=0
+    let targetDonePer=0
+    let lossDone=0
+    let allDone=0
+    let allDonePer=0
+    let lossDonePer=0
     let listDays = []
     let maxReserve = 0
     let maxMeta = 0
@@ -644,6 +650,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
 
         if (runBefore === false)
             continue
+        allDone++
         if (step === 0) {
             dateString = dateString + data[i].openDate.split(' ')[0] + '_'
             runupString = runupString + data[i].runUp + '_'
@@ -756,6 +763,7 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
         }
         if (d.done === true) {
             runBefore = false
+
             let endDays = getNewMinDiff(startDays, data[i].closeDate)
             detailLevel.push({step: step, dur: endDays})
             durDetail.push({
@@ -801,12 +809,21 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
             curDrawDown = 0
             lastMoney = 0
             allTotal++
+            targetDone++
+            allDonePer=allDonePer+config.target
+            targetDonePer=targetDonePer+config.target
             if (!d.riskFree)
                 total++
 
         } else {
+
+
+            lossDone++
+            lossDonePer=lossDonePer+data[i].profit
+            allDonePer=allDonePer+data[i].profit
             //  unixMid = data[i].unixClose
-            step++
+          //  step++
+            step=0
             profit = profit + d.profit
             lastMoney = d.lastMoney
             lastCom = lastCom + d.com
@@ -942,6 +959,12 @@ function run(data, config, risk, pfTrade, riskFreeLevel, detail, loss, durs, max
         type: type,
         total: total,
         allTotal: allTotal,
+        allDone:allDone,
+        allDonePer:allDonePer,
+        targetDone:targetDone,
+        targetDonePer:targetDonePer,
+        lossDone:lossDone,
+        lossDonePer:lossDonePer,
         avgLevel: maxLevel / total,
         maxLevel: maxLevel,
         dur: dur,