git pull

ai.js

@@ -14,7 +14,7 @@ let startt = 30
 
 
 //
-function run(data, config, risk,forceZero, pfTrade, riskFreeLevel, detail, loss, durs, maxTradeDays, targetPercentage, candlesData, fft, ProfitZeroProfit, fftRunup, ProfitZeroProfitRunup, ProfitZeroDrawDownProfit, ProfitZeroDrawDown, ddPlusRunCount, RunupDrawDownZeroRunupDrawDown, ProfitZeroRunupProfit, ProfitZeroRunupDrawDown, RunUpDrawDownZeroProfit, RunUpDrawDownZeroDrawDownProfit, RunUpDrawDownZeroDrawdown, RunUpDrawDownZeroRunupProfit, RunupZeroRunupDrawDown, RunupZeroProfit, RunupZeroProfitDrawDown, RunupZeroDrawDown, RunupZeroProfitRunup, DrawDownZeroDrawDown, DrawDownnZeroProfit, DrawDownZeroProfitDrawDown, DrawDownZeroProfitRunup, DrawDownZeroRunupDrawDown, ProfitDrawDownZeroDrawDown, ProfitDrawDownZeroProfit, ProfitDrawDownZeroProfitDrawDown, ProfitDrawDownZeroProfitRunup, ProfitDrawDownZeroRunupDrawDown
+function run(data, config, risk, forceZero, pfTrade, riskFreeLevel, detail, loss, durs, maxTradeDays, targetPercentage, candlesData, fft, ProfitZeroProfit, fftRunup, ProfitZeroProfitRunup, ProfitZeroDrawDownProfit, ProfitZeroDrawDown, ddPlusRunCount, RunupDrawDownZeroRunupDrawDown, ProfitZeroRunupProfit, ProfitZeroRunupDrawDown, RunUpDrawDownZeroProfit, RunUpDrawDownZeroDrawDownProfit, RunUpDrawDownZeroDrawdown, RunUpDrawDownZeroRunupProfit, RunupZeroRunupDrawDown, RunupZeroProfit, RunupZeroProfitDrawDown, RunupZeroDrawDown, RunupZeroProfitRunup, DrawDownZeroDrawDown, DrawDownnZeroProfit, DrawDownZeroProfitDrawDown, DrawDownZeroProfitRunup, DrawDownZeroRunupDrawDown, ProfitDrawDownZeroDrawDown, ProfitDrawDownZeroProfit, ProfitDrawDownZeroProfitDrawDown, ProfitDrawDownZeroProfitRunup, ProfitDrawDownZeroRunupDrawDown
     , ProfitRunupZeroDrawDown, ProfitRunupZeroProfit, ProfitRunupZeroProfitDrawDown, ProfitRunupZeroProfitRunup, ProfitRunupZeroRunupDrawDown, usage) {
 
     // let data2 = []
@@ -575,9 +575,6 @@ function run(data, config, risk,forceZero, pfTrade, riskFreeLevel, detail, loss,
             baseCompund = baseCompund + percentage2(baseCompund, data[i].profit - 0.1)
 
 
-
-
-
         if (data[i].profit > 0.1) {
             tempMeta = 0
             tempDrawDown = 0
@@ -947,32 +944,35 @@ function run(data, config, risk,forceZero, pfTrade, riskFreeLevel, detail, loss,
     sum = sum - Math.abs(maxAllocatedMoney)
     let newCompund = sum / dur
 
-    let newBasePerComp=allDonePer/allDoneCount
+    let newBasePerComp = allDonePer / allDoneCount
 
-    let lastSumCompound=100
-    for (let z=0;z<allDoneCount;z++)
-    {
-        lastSumCompound=lastSumCompound+percentage2(lastSumCompound,newBasePerComp)
+    let lastSumCompound = 100
+    for (let z = 0; z < allDoneCount; z++) {
+        lastSumCompound = lastSumCompound + percentage2(lastSumCompound, newBasePerComp)
     }
 
     let compoundPerMonth = (newCompund * 30 * 100) / Math.abs(maxAllocatedMoney)
 
-let arrNew=[]
-    let tt=profitLossString
+    let arrNew = []
+    let tt = profitLossString
     tt = tt.split('_')
-    for (let i = 0; i < tt.length-1; i++) {
-        let sums=0
-        for (let j = i + 1; j < tt.length-1; j++) {
+    for (let i = 0; i < tt.length - 1; i++) {
+        let sums = 0
+        for (let j = i + 1; j < tt.length - 1; j++) {
 
             sums = sums + parseFloat(tt[j])
             //  console.log(sum,parseFloat(t[j]))
-            arrNew.push({sum:sums,index:i})
+            arrNew.push({sum: sums, index: i})
             //console.log(sum)
 
         }
 
     }
-    arrNew=_.orderBy(arrNew,['sum'])
+    arrNew = _.orderBy(arrNew, ['sum'])
+
+
+    if (typeof arrNew[0] === "undefined")
+        return null
 
     let drawDown = Math.abs(((maxReserve * 100) / maxAllocatedMoney))
     let opt = {
@@ -981,7 +981,7 @@ let arrNew=[]
         total: total,
         allTotal: allTotal,
         allDonePer: allDonePer,
-        newAllDonePer:(allDonePer/Math.abs(arrNew[0].sum)),
+        newAllDonePer: (allDonePer / Math.abs(arrNew[0].sum)),
         allDone: allDone,
         countOfTrade: data.length,
         pftrade: newP,
@@ -1036,11 +1036,8 @@ let arrNew=[]
         minus: minus,
         risk: risk,
         levels: newLevelText,
-        avgRunup:avgRunup,
-        avgDrawdown:avgDrawdown
-
-
-
+        avgRunup: avgRunup,
+        avgDrawdown: avgDrawdown
 
 
     }

run.js

@@ -75,7 +75,7 @@ async function run() {
     let arr1000Compound = []
 
     let arrReserv = _.orderBy(arr2, ['percentage'], ['asc']);
-    let arrCompound = _.orderBy(arr2, ['allDonePer'], ['desc']);
+    let arrCompound = _.orderBy(arr2, ['newAllDonePer'], ['desc']);
     let arrResrv200 = []
     let arr1000Maxtime=[]
     let arrReservCompound = []