Commit 57bf5edc authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent 89603120
...@@ -13,7 +13,7 @@ async function parse(directory, name, configs, risk, pfTrade, side, riskFreeLeve ...@@ -13,7 +13,7 @@ async function parse(directory, name, configs, risk, pfTrade, side, riskFreeLeve
// console.log(name) // console.log(name)
fs.createReadStream('work/'+directory + '/' + name) fs.createReadStream('work/'+directory + '/' + name)
.pipe(csv.parse({headers: true})) .pipe(csv.parse({headers: true}))
.on('error', error => reject(error)) .on('error', error => resolve(initData([], configs, name, risk, pfTrade, side, riskFreeLevel,detail,onlyShortLong,loss,dur,maxTradeDays,targetPercentage,candles,fft,ProfitZeroProfit,fftRunup,ProfitZeroProfitRunup,ProfitZeroDrawDownProfit,usage)))
.on('data', row => arr.push(row)) .on('data', row => arr.push(row))
.on('end', rowCount => resolve(initData(arr, configs, name, risk, pfTrade, side, riskFreeLevel,detail,onlyShortLong,loss,dur,maxTradeDays,targetPercentage,candles,fft,ProfitZeroProfit,fftRunup,ProfitZeroProfitRunup,ProfitZeroDrawDownProfit,usage))); .on('end', rowCount => resolve(initData(arr, configs, name, risk, pfTrade, side, riskFreeLevel,detail,onlyShortLong,loss,dur,maxTradeDays,targetPercentage,candles,fft,ProfitZeroProfit,fftRunup,ProfitZeroProfitRunup,ProfitZeroDrawDownProfit,usage)));
}); });
...@@ -21,10 +21,12 @@ async function parse(directory, name, configs, risk, pfTrade, side, riskFreeLeve ...@@ -21,10 +21,12 @@ async function parse(directory, name, configs, risk, pfTrade, side, riskFreeLeve
function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail,onlyShortLong,loss,dur,maxTradeDays,targetPercentage,candles,fft,ProfitZeroProfit,fftRunup,ProfitZeroProfitRunup,ProfitZeroDrawDownProfit,usage) { function initData(data, config, name, risk, pfTrade, side, riskFreeLevel,detail,onlyShortLong,loss,dur,maxTradeDays,targetPercentage,candles,fft,ProfitZeroProfit,fftRunup,ProfitZeroProfitRunup,ProfitZeroDrawDownProfit,usage) {
if (data.length ===0)
return []
data = JSON.stringify(data) data = JSON.stringify(data)
data = _.replace(data, new RegExp('Trade #', 'g'), 'id') data = _.replace(data, new RegExp('Trade #', 'g'), 'id')
data = _.replace(data, new RegExp('Profit %', 'g'), 'profit') data = _.replace(data, new RegExp('Profit %', 'g'), 'profit')
data = _.replace(data, new RegExp('Run-up %', 'g'), 'runUp') data = _.replace(data, new RegExp('Run-up %', 'g'), 'runUp')
......
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