Commit 5970e787 authored by Ahmad Nemati's avatar Ahmad Nemati

git pull

parent 4e7ee58e
const fs = require('fs') const fs = require('fs')
let moment = require('moment-timezone') let moment = require('moment-timezone')
let _ = require('lodash') let _ = require('lodash')
const uuid=require('uniqid') const uuid = require('uniqid')
let pairs='' let pairs = ''
let res
let res2
let res3
let res4
init() init()
...@@ -12,59 +15,66 @@ async function init() { ...@@ -12,59 +15,66 @@ async function init() {
// res = await fs.readFileSync('run.csv', 'utf8'); // res = await fs.readFileSync('run.csv', 'utf8');
// res = res.split('\n') // res = res.split('\n')
res2 = await fs.readFileSync('run2.csv', 'utf8');
res2 = res2.split('\n')
res3 = await fs.readFileSync('run3.csv', 'utf8');
res3 = res3.split('\n')
res4 = await fs.readFileSync('run4.csv', 'utf8');
res4 = res4.split('\n')
let arr = [] let arr = []
// console.log(found('ETH', 'Lp2')) // console.log(found('ETH', 'Lp2'))
let com = await fs.readFileSync('com.json', 'utf8'); let com = await fs.readFileSync('com.json', 'utf8');
com = JSON.parse(com) com = JSON.parse(com)
for (let i=0;i<com.length;i++) for (let i = 0; i < com.length; i++) {
{ com[i].platform = com[i].platform.toLowerCase()
com[i].platform=com[i].platform.toLowerCase()
let t = com[i].platform let t = com[i].platform
t = t.split('_') t = t.split('_')
let pair = t[3].replace('usdt', '').replace('usd', '') let pair = t[3].replace('usdt', '').replace('usd', '')
let lp = t[4].replace('lp','Lp') let lp = t[4].replace('lp', 'Lp')
com[i].lp=lp com[i].lp = lp
let p=t[t.length-1].split('.') let p = t[t.length - 1].split('.')
p=p[0].split(pair)[0] p = p[0].split(pair)[0]
let uniq=pair+lp+p+capital(com[i].type.split(' ')[5])+parseFloat(com[i].type.split(' ')[6])*-10 let uniq = pair + lp + p + capital(com[i].type.split(' ')[5]) + parseFloat(com[i].type.split(' ')[6]) * -10
com[i].uniq=uniq+'_'+com[i].avgRunup+'_'+com[i].avgDrawdown+'_'+com[i].type.split(' ')[5]+'_'+(parseFloat(com[i].type.split(' ')[6])*-1) com[i].uniq = uniq + '_' + com[i].avgRunup + '_' + com[i].avgDrawdown + '_' + com[i].type.split(' ')[5] + '_' + (parseFloat(com[i].type.split(' ')[6]) * -1)
} }
com=_.uniqBy(com, 'lp'); com = _.uniqBy(com, 'lp');
let newCom=[] let newCom = []
for (let i=0;i<com.length;i++) for (let i = 0; i < com.length; i++) {
{
newCom.push(com[i]) newCom.push(com[i])
} }
com=newCom com = newCom
createComResfileADV(JSON.stringify(com, null, 2)) createComResfileADV(JSON.stringify(com, null, 2))
// for (let i = 0; i < com.length; i++) { for (let i = 0; i < com.length; i++) {
// let t = com[i].platform let t = com[i].platform
// t = t.split('_') t = t.split('_')
// let indicator = parseInt(t[t.length - 1])
//
// let pair = t[3].replace('usdt', '').replace('usd', '') let pair = t[3].replace('usdt', '').replace('usd', '')
// pairs=pair pairs = pair
// let p=t[t.length-1].split('.') let p = t[t.length - 1].split('.')
// p=p[0].split(pairs)[0] p = p[0].split(pairs)[0]
// let lp = t[4].replace('lp','Lp') let lp = t[4].replace('lp', 'Lp')
// let f=found(pair, lp) let f = found(pair, lp)
// f.period=p f.period = p
// f.uniq=com[i].uniq f.uniq = com[i].uniq
// arr.push(f) console.log(com[i].platform, f.timeframe)
// } arr.push(f)
// arr=_.uniqBy(arr, 'name'); }
// arr = _.uniqBy(arr, 'name');
// let header='RowNum,PPST1_stMnBarAge,PPST1_PvtPtPeriod,PPST1_AtrFactor,PPST1_AtrPeriod,szOmIdName\n' // let header='RowNum,PPST1_stMnBarAge,PPST1_PvtPtPeriod,PPST1_AtrFactor,PPST1_AtrPeriod,szOmIdName\n'
// for (let i=0;i<arr.length;i++) // for (let i=0;i<arr.length;i++)
// { // {
...@@ -75,21 +85,21 @@ async function init() { ...@@ -75,21 +85,21 @@ async function init() {
// header= header+'\n' // header= header+'\n'
// //
// } // }
//
// createRunResfileADV(header) // createRunResfileADV(header)
} }
function isUpper(str) { function isUpper(str) {
return !/[a-z]/.test(str) && /[A-Z]/.test(str); return !/[a-z]/.test(str) && /[A-Z]/.test(str);
} }
function capital(t) function capital(t) {
{ let f = ''
let f='' for (let j = 0; j < t.length; j++)
for (let j=0;j<t.length;j++)
if (isUpper(t[j])) if (isUpper(t[j]))
f=f+t[j] f = f + t[j]
return f return f
} }
...@@ -97,7 +107,7 @@ function capital(t) ...@@ -97,7 +107,7 @@ function capital(t)
function createRunResfileADV(data) { function createRunResfileADV(data) {
// console.log(data) // console.log(data)
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
fs.writeFile(pairs+'_TOP.csv', data, 'utf8', function (err) { fs.writeFile(pairs + '_TOP.csv', data, 'utf8', function (err) {
if (err) reject(err); if (err) reject(err);
else resolve(data); else resolve(data);
}); });
...@@ -107,14 +117,21 @@ function createRunResfileADV(data) { ...@@ -107,14 +117,21 @@ function createRunResfileADV(data) {
function createComResfileADV(data) { function createComResfileADV(data) {
// console.log(data) // console.log(data)
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
fs.writeFile(pairs+'newCom.json', data, 'utf8', function (err) { fs.writeFile(pairs + 'newCom.json', data, 'utf8', function (err) {
if (err) reject(err); if (err) reject(err);
else resolve(data); else resolve(data);
}); });
}); });
} }
function found(pair, lp) { function found(indicator,pair, lp) {
let res=[]
if (indicator ===2)
res=res2
else if (indicator ===3)
res=res3
else if (indicator ===4)
res =res4
for (let i = 0; i < res.length; i++) { for (let i = 0; i < res.length; i++) {
if (!res[i].includes(lp + '_')) if (!res[i].includes(lp + '_'))
continue continue
...@@ -122,22 +139,23 @@ function found(pair, lp) { ...@@ -122,22 +139,23 @@ function found(pair, lp) {
let d = res[i].split(',') let d = res[i].split(',')
let timeframe = d[13] let timeframe = d[13]
timeframe=timeframe.split(' ') // timeframe=timeframe.split(' ')
let newTimeframe='0d ' // let newTimeframe='0d '
for (let z=1;z<timeframe.length;z++) // for (let z=1;z<timeframe.length;z++)
{ // {
newTimeframe=newTimeframe+timeframe[z] // newTimeframe=newTimeframe+timeframe[z]
if (z !== timeframe.length-1) // if (z !== timeframe.length-1)
newTimeframe=newTimeframe+' ' // newTimeframe=newTimeframe+' '
} // }
timeframe=newTimeframe // timeframe=newTimeframe
let nStochPeriod=parseFloat(d[15]) // let nStochPeriod=parseFloat(d[15])
let nStochSmoothingPeriod=parseFloat(d[16]) // let nStochSmoothingPeriod=parseFloat(d[16])
let dOttPercent=parseFloat(d[18]) // let dOttPercent=parseFloat(d[18])
//
let name = d[92] // let name = d[92]
return {name, timeframe, nStochPeriod, nStochSmoothingPeriod, dOttPercent} // return {name, timeframe, nStochPeriod, nStochSmoothingPeriod, dOttPercent}
return timeframe
} }
} }
......
let t='220601111131_O1_ETHUSDT_Lp92_ethLp45101RZDD5_6.332963350785343_-2.4975497382198952_RunupZeroDrawDown_0.5_0.096_ETH' let t='last.json-220519074704_o1_bnc_btcusdt_lp4690_3btc7425192022.csv'
t=t.split('_') let s=t.split('_')
let pair=t[t.length-1] console.log(parseInt(s[s.length-1]))
console.log(pair) \ No newline at end of file
\ No newline at end of file
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