git pull

merge.js

@@ -16,7 +16,7 @@ async function init() {
     let files3 = await fs.readdirSync('E:\\fail\\btc3')
     files=formatByLp(files)
     files2=formatByLp(files2)
-    files3=formatByLp(files3)
+    files3=formatByLp(files3,true)
     files=_.shuffle(files)
     let newFiles=[]
     for (let i=0;i<files.length;i++)
@@ -77,14 +77,17 @@ async function init() {
 
 
 }
-function formatByLp(files)
+function formatByLp(files,btc3)
 {
     let arr=[]
     for (let i=0;i<files.length;i++)
     {
         let name  = files[i].split('_')
         let uniq = name[4] + '_' + name[5]
+
         uniq = uniq.replace('.csv', '')
+        if (btc3)
+            uniq = files[i].replace('.csv', '')
 
         arr.push({fileName:files[i],lp:uniq})
     }