git pu

uniq2.js

@@ -27,7 +27,7 @@ async function run() {
         for (let j = 0; j < config.length; j++) {
             total.push(config[j].total)
             let dateString = config[j].dateString.split('_')
-         //   let runUpString = config[j].runupString.split('_')
+            let runUpString = config[j].runupString.split('_')
 
             let arrDate = []
             for (let z = 0; z < dateString.length - 1; z++)
@@ -40,14 +40,16 @@ async function run() {
                     countOfLong++
                 else
                     countOfshort++
-            // for (let z = 0; z < runUpString.length - 1; z++)
-            //     arrRunup.push(runUpString[z])
+            for (let z = 0; z < runUpString.length - 1; z++)
+                arrRunup.push(parseFloat(runUpString[z]))
+
+            arrRunup=_.orderBy(arrRunup)
 
             add(config[j].total, arrDate, config[j].type.split('targetPercentage:false')[1])
 
             addShortLong(config[j].total, countOfshort, countOfLong)
             addPoftrade(config[j].total, config[j].pftrade)
-          //  addRunup(config[j].total, arrRunup)
+            addRunup(config[j].total, arrRunup[0],arrRunup[arrRunup.length-1])
         }
 
 
@@ -64,11 +66,11 @@ async function run() {
         }
     }
 
-    // for (let i = 0; i < adder.length; i++) {
-    //     for (let z = i + 1; z < adder.length; z++) {
-    //         addRunup(adder[i].total, adder[z].runUp)
-    //     }
-    // }
+    for (let i = 0; i < adder.length; i++) {
+        for (let z = i + 1; z < adder.length; z++) {
+            addRunup(adder[i].total, adder[z].minRunup,adder[z].maxRunup)
+        }
+    }
 
     for (let i = 0; i < adder.length; i++) {
         let countOfShort = adder[i].short
@@ -179,7 +181,7 @@ function add(total, dates, type) {
     if (found)
         return
 
-    adder.push({total: total, dates: dates, countDay: dates.length, type: [type], pfTrade: [], runUp: [],short:0,long:0})
+    adder.push({total: total, dates: dates, countDay: dates.length, type: [type], pfTrade: [], runUp: [],short:0,long:0,minRunup:0,maxRunup:0})
 
 }
 
@@ -202,15 +204,16 @@ function addPoftrade(total, pfTrade) {
         }
 }
 
-function addRunup(total, runUp) {
+function addRunup(total, minRunup,maxRunup) {
 
     for (let i = 0; i < adder.length; i++)
         if (adder[i].total === total) {
-            for (let z = 0; z < runUp.length; z++) {
-                adder[i].runUp.push(runUp[z])
-            }
+            if (adder[i].minRunup > minRunup)
+                adder[i].minRunup=minRunup
+
+            if ( maxRunup>adder[i].maxRunup)
+                adder[i].maxRunup=maxRunup
 
-            console.log(adder[i].runUp.length)
         }