Commit de271439 authored by Ahmad Nemati's avatar Ahmad Nemati

git pu

parent 7ae7620d
...@@ -46,7 +46,6 @@ async function init() { ...@@ -46,7 +46,6 @@ async function init() {
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] let lp = t[4]
console.log(pair,lp)
let f=found(pair, lp) let f=found(pair, lp)
f.period=p f.period=p
arr.push(f) arr.push(f)
...@@ -107,10 +106,10 @@ function found(pair, lp) { ...@@ -107,10 +106,10 @@ function found(pair, lp) {
timeframe=newTimeframe timeframe=newTimeframe
let pvt = parseFloat(d[14]) let pvt = parseFloat(d[14])
let factor = parseFloat(d[15]) let factor = parseFloat(d[15])
let period = d[103] let period = d[106]
period = period.split(pair) period = period.split(pair)
period = parseFloat(period[period.length - 1]) period = parseFloat(period[period.length - 1])
let name = d[103] let name = d[106]
return {name, timeframe, pvt, factor, period} return {name, timeframe, pvt, factor, period}
......
// let t='2800,2022.05.24 16:57:00.223,Buy,ETHUSDT,1958.87,1953.76,2022.05.24 17:02:00.063,-0.26,0.10,-0.35'
// t=t.split(',')
// for (let i=0;i<t.length;i++)
// console.log(i,t[i])
let t='last.json-220519074932_O1_BNC_BTCUSDT_Lp5319_8BTC7425192022.csv' let t='Num.,OpClOrds,MaxTotOpOrdNo,MaxEffOpLot,prfpDmddp,MddInPc,PrfInPc,PrfVal,InvprfpDmddp,InvMddInPc,InvPrfInPc,InvPrfVal,AnyDirPrf,PPST1_stMnBarAge,PPST1_PvtPtPeriod,PPST1_AtrFactor,PPST1_AtrPeriod,PPST2_stMnBarAge,PPST2_PvtPtPeriod,PPST2_AtrFactor,PPST2_AtrPeriod,nEntSignalCodeNum,3crm_nStopLoss_AtrPeriod,3crm_dStopLoss_AtrRiskAdjustmentCoef,3crm_nStopLoss_SwingLookbackBarNo,3crm_bUseTrailingStopLoss,3crm_enumTrailSlRef,3crm_dTrailSlAtrMultiplier,3crm_bUseTpPr,3crm_dTpSlRewardToRiskRatio,3crm_dRrToStartTrailSl,m_nToUseSym0MinSpreadPip,nInitTpPip_Sym1_Tgt1,nInitSlPip_Sym1_Tgt1,stMnRefHopAge,nAllTmMktTrEntNum,nAftLkbkTmMktTrEntNum,dToClAllSsAndRestartImd_ReqEqIncPc,SimCp1_dToClAllSsAndRestartImd_ReqEqIncPc,nByReqEgIncPcClAllSsNum,PrfPips_BestTpSl,Tp_BestTpSl,Sl_BestTpSl,InvPrfPips_BestTpSl,Tp_InvBestTpSl,Sl_InvBestTpSl, dTkSimStEquityUsd,bUpDirEntEnabled,bDnDirEntEnabled,dFixedOrdLot,dRiskPercentForLot,nMaxAnyDirOrdNo,nMaxOneDirOrdNo,nTkSimOrdExecHaltAgeMsecNo,bUseOrdExecHaltAgeForOrdClosing,bInverseEntSig,bClOppDirOrds,TotOpClLot,TotOpB_ClLot,TotOpS_ClLot,ProcTickNo,RealSsNo,PrfRealSsNo,LssRealSsNo,PotSsCnt,OpB_ClNo,OpS_ClNo,hOrds,MaxOpBuyyLots,MaxOpBuyyLots_Fr,MaxOpBuyyLots_To,MaxOpSellLots,MaxOpSellLots_Fr,MaxOpSellLots_To,MaxTotAccsEq,MaxTotAccsEq_MinusStEq,MaxTotAccsEq_Fr,MaxTotAccsEq_To,MinTotAccsEq,MinTotAccsEq_MinusStEq,MinTotAccsEq_Fr,MinTotAccsEq_To,MaxTotOpOrdNo_Fr,MaxTotOpOrdNo_To,MaxEffOpLot_Fr,MaxEffOpLot_To,MddInVal,StEq,Mdd_EqUto,Mdd_EqUto_mSt,Mdd_EqDto,Mdd_EqDto_mSt,MddTm_Fr,MddTm_To,InvMddInVal,StEq,InvMdd_EqUto,InvMdd_EqUto_mSt,InvMdd_EqDto,InvMdd_EqDto_mSt,InvMddTm_Fr,InvMddTm_To,dtTrLookBackStTime_Str,dtTrStTime_Str,dtTrEnTime_Str,SimRgAgeStr,SufxStr'
t=t.split('_')
let pair = t[3].replace('USDT', '').replace('USD', '') t=t.split(',')
console.log(pair) for (let i=0;i<t.length;i++)
let pairs=pair console.log(i,t[i])
let p=t[t.length-1].split('.')
p=p[0].split(pairs)[0] // let t='last.json-220519074932_O1_BNC_BTCUSDT_Lp5319_8BTC7425192022.csv'
console.log(p) // t=t.split('_')
// let pair = t[3].replace('USDT', '').replace('USD', '')
// console.log(pair)
// let pairs=pair
// let p=t[t.length-1].split('.')
// p=p[0].split(pairs)[0]
// console.log(p)
// let t='last.json-220217122835_O1_BNC_ETHUSDT_Lp3191_1ETH1.csv' // let t='last.json-220217122835_O1_BNC_ETHUSDT_Lp3191_1ETH1.csv'
......
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