git pu

change.js

@@ -79,11 +79,11 @@ function grabData(data) {
             let profit = parseFloat(d[7])
             let runUp = parseFloat(d[8])
             let drawDown = parseFloat(d[9])
-            let closeTime=d[6]
+            let closeTime = d[6]
 
             if (isNaN(profit))
                 continue
-            arr.push({profit, runUp, drawDown,closeTime})
+            arr.push({profit, runUp, drawDown, closeTime})
         } catch (e) {
 
         }
@@ -156,99 +156,93 @@ async function updateVars(name) {
 
     let vars = ai.run(data, getVarsFromName(name))
 
-    let varUsage=getVarFromUsage(vars,allData.usage)
-    console.log(allData.id +' '+'Try Check usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value)
-    if (varUsage < allData.value)
-    {
-      //  console.log(allData.id +' '+'Try Add usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value)
+    let varUsage = getVarFromUsage(vars, allData.usage)
+    console.log(allData.id, allData.usage, allData.value, varUsage)
+    if (varUsage < allData.value) {
+        //  console.log(allData.id +' '+'Try Add usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value)
         if (lastData.includes('Buy'))
             sig = allData.id + 'Sell'
         else
             sig = allData.id + 'Buy'
-        adder(sig,0.01,data.closeTime)
+        adder(sig, 0.01, data.closeTime)
     }
     // console.log(name,vars)
     updateVarsFromName(name, vars)
 
 }
 
-function  getVarFromUsage(vars,usage)
-{
-
-
-        if (usage === 'fft') {
-           return vars.countDrop
-        } else if (usage === 'ddPlusRunCount') {
-            return vars.drawDownPlusRunUpCount
-        } else if (usage === 'ProfitZeroProfit') {
-           return vars.allLossProfit
-        } else if (usage === 'RunupDrawDownZeroRunupDrawDown') {
-           return vars.drawDownPlusRunUpPercent
-        } else if (usage === 'ProfitZeroDrawDown') {
-            return vars.ProfitZeroDrawDownPercent
-        } else if (usage === 'fftRunup') {
-           return vars.countDropRunup
-        } else if (usage === 'ProfitZeroDrawDownProfit') {
-           return vars.diffDrawdownProfitAll
-        } else if (usage === 'ProfitZeroProfitRunup') {
-           return vars.canCreateRunupPercent
-        } else if (usage === 'ProfitZeroRunupProfit') {
-           return vars.VarProfitZeroRunupProfit
-        } else if (usage === 'ProfitZeroRunupDrawDown') {
-           return vars.VarProfitZeroRunupDrawDown
-        } else if (usage === 'RunUpDrawDownZeroProfit') {
-           return  vars.RunUpDrawDownAllLossProfit
-        } else if (usage === 'RunUpDrawDownZeroDrawDownProfit') {
-           return vars.RunupDrawDownDiffDrawdownProfitAll
-        } else if (usage === 'RunUpDrawDownZeroDrawdown') {
-           return vars.runUpDrawDownZeroDrawDownPercent
-        } else if (usage === 'RunUpDrawDownZeroRunupProfit') {
-            return vars.VarDrawDownZeroProfit
-        } else if (usage === 'RunupZeroRunupDrawDown') {
-            return vars.VarRunupZeroRunupDrawDown
-        } else if (usage === 'RunupZeroProfit') {
-           return vars.VarRunupZeroProfit
-        } else if (usage === 'RunupZeroProfitDrawDown') {
-          return  vars.VarRunupZeroProfitDrawDown
-        } else if (usage === 'RunupZeroDrawDown') {
-           return vars.VarRunupZeroDrawDown
-        } else if (usage === 'RunupZeroProfitRunup') {
-           return vars.VarRunupZeroProfitRunup
-        } else if (usage === 'DrawDownZeroDrawDown') {
-          return vars.VarDrawDownZeroDrawDown
-        } else if (usage === 'DrawDownnZeroProfit') {
-           return vars.VarDrawDownnZeroProfit
-        } else if (usage === 'DrawDownZeroProfitDrawDown') {
-           return  vars.VarDrawDownZeroProfitDrawDown
-        } else if (usage === 'DrawDownZeroProfitRunup') {
-           return vars.VarDrawDownZeroProfitRunup
-        } else if (usage === 'DrawDownZeroRunupDrawDown') {
-           return  vars.VarDrawDownZeroRunupDrawDown
-        } else if (usage === 'ProfitDrawDownZeroDrawDown') {
-           return vars.VarProfitDrawDownZeroDrawDown
-        } else if (usage === 'ProfitDrawDownZeroProfit') {
-           return  vars.VarProfitDrawDownZeroProfit
-        } else if (usage === 'ProfitDrawDownZeroProfitDrawDown') {
-           return  vars.VarProfitDrawDownZeroProfitDrawDown
-        } else if (usage === 'ProfitDrawDownZeroProfitRunup') {
-           return  vars.VarProfitDrawDownZeroProfitRunup
-        } else if (usage === 'ProfitDrawDownZeroRunupDrawDown') {
-           return  vars.VarProfitDrawDownZeroRunupDrawDown
-        } else if (usage === 'ProfitRunupZeroDrawDown') {
-           return  vars.VarProfitRunupZeroDrawDown
-        } else if (usage === 'ProfitRunupZeroProfit') {
-           return vars.VarProfitRunupZeroProfit
-        } else if (usage === 'ProfitRunupZeroProfitDrawDown') {
-           return  vars.VarProfitRunupZeroProfitDrawDown
-        } else if (usage === 'ProfitRunupZeroProfitRunup') {
-           return  vars.VarProfitRunupZeroProfitRunup
-        } else if (usage === 'ProfitRunupZeroRunupDrawDown') {
-           return  vars.VarProfitRunupZeroRunupDrawDown
-        }
-
-
-
-
+function getVarFromUsage(vars, usage) {
+
+
+    if (usage === 'fft') {
+        return vars.countDrop
+    } else if (usage === 'ddPlusRunCount') {
+        return vars.drawDownPlusRunUpCount
+    } else if (usage === 'ProfitZeroProfit') {
+        return vars.allLossProfit
+    } else if (usage === 'RunupDrawDownZeroRunupDrawDown') {
+        return vars.drawDownPlusRunUpPercent
+    } else if (usage === 'ProfitZeroDrawDown') {
+        return vars.ProfitZeroDrawDownPercent
+    } else if (usage === 'fftRunup') {
+        return vars.countDropRunup
+    } else if (usage === 'ProfitZeroDrawDownProfit') {
+        return vars.diffDrawdownProfitAll
+    } else if (usage === 'ProfitZeroProfitRunup') {
+        return vars.canCreateRunupPercent
+    } else if (usage === 'ProfitZeroRunupProfit') {
+        return vars.VarProfitZeroRunupProfit
+    } else if (usage === 'ProfitZeroRunupDrawDown') {
+        return vars.VarProfitZeroRunupDrawDown
+    } else if (usage === 'RunUpDrawDownZeroProfit') {
+        return vars.RunUpDrawDownAllLossProfit
+    } else if (usage === 'RunUpDrawDownZeroDrawDownProfit') {
+        return vars.RunupDrawDownDiffDrawdownProfitAll
+    } else if (usage === 'RunUpDrawDownZeroDrawdown') {
+        return vars.runUpDrawDownZeroDrawDownPercent
+    } else if (usage === 'RunUpDrawDownZeroRunupProfit') {
+        return vars.VarDrawDownZeroProfit
+    } else if (usage === 'RunupZeroRunupDrawDown') {
+        return vars.VarRunupZeroRunupDrawDown
+    } else if (usage === 'RunupZeroProfit') {
+        return vars.VarRunupZeroProfit
+    } else if (usage === 'RunupZeroProfitDrawDown') {
+        return vars.VarRunupZeroProfitDrawDown
+    } else if (usage === 'RunupZeroDrawDown') {
+        return vars.VarRunupZeroDrawDown
+    } else if (usage === 'RunupZeroProfitRunup') {
+        return vars.VarRunupZeroProfitRunup
+    } else if (usage === 'DrawDownZeroDrawDown') {
+        return vars.VarDrawDownZeroDrawDown
+    } else if (usage === 'DrawDownnZeroProfit') {
+        return vars.VarDrawDownnZeroProfit
+    } else if (usage === 'DrawDownZeroProfitDrawDown') {
+        return vars.VarDrawDownZeroProfitDrawDown
+    } else if (usage === 'DrawDownZeroProfitRunup') {
+        return vars.VarDrawDownZeroProfitRunup
+    } else if (usage === 'DrawDownZeroRunupDrawDown') {
+        return vars.VarDrawDownZeroRunupDrawDown
+    } else if (usage === 'ProfitDrawDownZeroDrawDown') {
+        return vars.VarProfitDrawDownZeroDrawDown
+    } else if (usage === 'ProfitDrawDownZeroProfit') {
+        return vars.VarProfitDrawDownZeroProfit
+    } else if (usage === 'ProfitDrawDownZeroProfitDrawDown') {
+        return vars.VarProfitDrawDownZeroProfitDrawDown
+    } else if (usage === 'ProfitDrawDownZeroProfitRunup') {
+        return vars.VarProfitDrawDownZeroProfitRunup
+    } else if (usage === 'ProfitDrawDownZeroRunupDrawDown') {
+        return vars.VarProfitDrawDownZeroRunupDrawDown
+    } else if (usage === 'ProfitRunupZeroDrawDown') {
+        return vars.VarProfitRunupZeroDrawDown
+    } else if (usage === 'ProfitRunupZeroProfit') {
+        return vars.VarProfitRunupZeroProfit
+    } else if (usage === 'ProfitRunupZeroProfitDrawDown') {
+        return vars.VarProfitRunupZeroProfitDrawDown
+    } else if (usage === 'ProfitRunupZeroProfitRunup') {
+        return vars.VarProfitRunupZeroProfitRunup
+    } else if (usage === 'ProfitRunupZeroRunupDrawDown') {
+        return vars.VarProfitRunupZeroRunupDrawDown
+    }
 
 
 }
@@ -264,7 +258,7 @@ async function closer(sig) {
 
 
     if (delStatus !== 1) {
-        console.log('Cant Find '+sig +' in db So dont try reduce')
+        console.log('Cant Find ' + sig + ' in db So dont try reduce')
         return
     }
 
@@ -281,11 +275,11 @@ async function closer(sig) {
 }
 
 
-async function adder(sig, qty,date) {
-let lastToken=sig+'_'+date
+async function adder(sig, qty, date) {
+    let lastToken = sig + '_' + date
 
     if (sig.includes('Buy')) {
-        let d = await exchange.createMarketOrder('ETHUSDT', 'Buy', qty, 0,{order_link_id:lastToken})
+        let d = await exchange.createMarketOrder('ETHUSDT', 'Buy', qty, 0, {order_link_id: lastToken})
         if (d.id) {
             const [add] = await client
                 .multi()
@@ -293,7 +287,7 @@ let lastToken=sig+'_'+date
                 .exec();
         }
     } else {
-        let d = exchange.createMarketOrder('ETHUSDT', 'Sell', qty, 0,{order_link_id:lastToken})
+        let d = exchange.createMarketOrder('ETHUSDT', 'Sell', qty, 0, {order_link_id: lastToken})
         if (d.id) {
             const [add] = await client
                 .multi()