Commit 68f8598b authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent 20899222
...@@ -79,11 +79,11 @@ function grabData(data) { ...@@ -79,11 +79,11 @@ function grabData(data) {
let profit = parseFloat(d[7]) let profit = parseFloat(d[7])
let runUp = parseFloat(d[8]) let runUp = parseFloat(d[8])
let drawDown = parseFloat(d[9]) let drawDown = parseFloat(d[9])
let closeTime=d[6] let closeTime = d[6]
if (isNaN(profit)) if (isNaN(profit))
continue continue
arr.push({profit, runUp, drawDown,closeTime}) arr.push({profit, runUp, drawDown, closeTime})
} catch (e) { } catch (e) {
} }
...@@ -156,24 +156,22 @@ async function updateVars(name) { ...@@ -156,24 +156,22 @@ async function updateVars(name) {
let vars = ai.run(data, getVarsFromName(name)) let vars = ai.run(data, getVarsFromName(name))
let varUsage=getVarFromUsage(vars,allData.usage) let varUsage = getVarFromUsage(vars, allData.usage)
console.log(allData.id +' '+'Try Check usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value) console.log(allData.id, allData.usage, allData.value, varUsage)
if (varUsage < allData.value) if (varUsage < allData.value) {
{
// console.log(allData.id +' '+'Try Add usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value) // console.log(allData.id +' '+'Try Add usage:'+allData.usage +' with current var '+varUsage +' and less than '+allData.value)
if (lastData.includes('Buy')) if (lastData.includes('Buy'))
sig = allData.id + 'Sell' sig = allData.id + 'Sell'
else else
sig = allData.id + 'Buy' sig = allData.id + 'Buy'
adder(sig,0.01,data.closeTime) adder(sig, 0.01, data.closeTime)
} }
// console.log(name,vars) // console.log(name,vars)
updateVarsFromName(name, vars) updateVarsFromName(name, vars)
} }
function getVarFromUsage(vars,usage) function getVarFromUsage(vars, usage) {
{
if (usage === 'fft') { if (usage === 'fft') {
...@@ -247,10 +245,6 @@ function getVarFromUsage(vars,usage) ...@@ -247,10 +245,6 @@ function getVarFromUsage(vars,usage)
} }
} }
...@@ -264,7 +258,7 @@ async function closer(sig) { ...@@ -264,7 +258,7 @@ async function closer(sig) {
if (delStatus !== 1) { 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 return
} }
...@@ -281,11 +275,11 @@ async function closer(sig) { ...@@ -281,11 +275,11 @@ async function closer(sig) {
} }
async function adder(sig, qty,date) { async function adder(sig, qty, date) {
let lastToken=sig+'_'+date let lastToken = sig + '_' + date
if (sig.includes('Buy')) { 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) { if (d.id) {
const [add] = await client const [add] = await client
.multi() .multi()
...@@ -293,7 +287,7 @@ let lastToken=sig+'_'+date ...@@ -293,7 +287,7 @@ let lastToken=sig+'_'+date
.exec(); .exec();
} }
} else { } 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) { if (d.id) {
const [add] = await client const [add] = await client
.multi() .multi()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment