w-trade-solve 1.0.4 → 2.0.1

package/docs/readStrategies.mjs.html

@@ -50,6 +50,7 @@ import each from 'lodash-es/each.js'
 import filter from 'lodash-es/filter.js'
 import get from 'lodash-es/get.js'
 import size from 'lodash-es/size.js'
+import cstr from 'wsemi/src/cstr.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsReadJson from 'wsemi/src/fsReadJson.mjs'
 import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
@@ -59,37 +60,47 @@ import sep from 'wsemi/src/sep.mjs'
 import cont from './cont.mjs'
 
 
+//ptnFnHash, genStrategyFileName所產生之雜湊檔名樣式`${mode}_${levelNumTrade}_${hash16}.json`
+let ptnFnHash = /^(long|short)_\d+_[0-9a-f]{16}\.json$/
+
+
 /**
  * 讀取儲存策略資料夾內各策略檔資訊
  *
  * 僅列舉fd第1層之檔案，資料夾不列入，fd非資料夾或無任何檔案時回傳空陣列
- * 各檔以主檔名(剔除'.json')依cont.dlmPkgs切段，依序為tid、levelNumTrade與rEquivalentCumuProfitOrLossFinalNormYear，即genStrategyFileName所產生之檔名，切不出tid者予以略過
- * tid再依cont.dlmSeps切段，首段為mode，其餘為各key所組成之ps
+ * 各檔依opt.fromContent決定解析來源:
+ *   'filename'為舊式檔名反解: 以主檔名(剔除'.json')依cont.dlmPkgs切段，依序為tid、levelNumTrade與rEquivalentCumuProfitOrLossFinalNormYear，切不出tid者予以略過
+ *   'content'為讀取檔內json之tid、tkid、levelNumTrade與summary等欄位(即estimKeys所寫出之策略內容)，非合法json或無tid欄位者予以略過，因需讀檔故較'filename'慢
+ *   'auto'(預設)為逐檔判別: 檔名符合genStrategyFileName雜湊格式(`${mode}_${levelNumTrade}_${hash16}.json`)者走'content'，其餘走'filename'，故新舊格式混存時皆可列舉
+ * tid依cont.dlmSeps切段，首段為mode，其餘為各key所組成之ps
  * tkid為`${tid}:${levelNumTrade}`，與estimKeys內用於判斷同組keys與同交易次數級距之組合方式一致
  *
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-readStrategies.test.mjs Github}
  * @function
  * @param {String} fd 輸入儲存策略資料夾字串
  * @param {Object} [opt={}] 輸入設定物件，預設{}
- * @param {Boolean} [opt.readContent=false] 輸入是否讀取策略檔內容布林值，為true時各元素額外提供data欄位，內容非合法json時data為null，預設false
+ * @param {Boolean} [opt.readContent=false] 輸入是否額外提供策略檔內容布林值，為true時各元素額外提供data欄位，內容非合法json時data為null，預設false
+ * @param {String} [opt.fromContent='auto'] 輸入解析來源字串，可選'filename'(由檔名反解)、'content'(讀檔內json欄位)與'auto'(依檔名格式逐檔判別)，給予其他值時亦採'auto'，預設'auto'
  * @returns {Array} 回傳策略資訊陣列，各元素為{path,name,tkid,tid,levelNumTrade,rEquivalentCumuProfitOrLossFinalNormYear,mode,ps}，opt.readContent為true時額外提供data
  * @example
  *
  * import fs from 'fs'
- * import cont from './src/cont.mjs'
+ * import genStrategyFileName from './src/genStrategyFileName.mjs'
  *
  * let fd = './tmp/data-strategy'
  * fs.mkdirSync(fd, { recursive: true })
  *
- * //以genStrategyFileName之檔名規則儲存策略檔
- * let fn = `long${cont.dlmSeps}ma_1day${cont.dlmPkgs}12${cont.dlmPkgs}31.25%.json`
- * fs.writeFileSync(`${fd}/${fn}`, JSON.stringify({ mode: 'long' }), 'utf8')
+ * //以genStrategyFileName之檔名規則儲存策略檔, 檔名為雜湊格式, 識別資訊由檔內json承載
+ * let summary = { numTrade: 30, rEquivalentCumuProfitOrLossFinalNormYear: '31.25%' }
+ * let fn = genStrategyFileName('btc', '4hr', 'long', ['btc_4hr_ma_1day'], {}, summary)
+ * let data = { tid: 'long ║ ma_1day', tkid: 'long ║ ma_1day:12', levelNumTrade: 12, mode: 'long', summary }
+ * fs.writeFileSync(`${fd}/${fn}`, JSON.stringify(data), 'utf8')
  *
  * console.log(readStrategies(fd))
  * // => [
  * //   {
- * //     path: './tmp/data-strategy/long ║ ma_1day ⊙ 12 ⊙ 31.25%.json',
- * //     name: 'long ║ ma_1day ⊙ 12 ⊙ 31.25%.json',
+ * //     path: './tmp/data-strategy/long_12_a7578526a1fc57d8.json',
+ * //     name: 'long_12_a7578526a1fc57d8.json',
  * //     tkid: 'long ║ ma_1day:12',
  * //     tid: 'long ║ ma_1day',
  * //     levelNumTrade: '12',
@@ -105,6 +116,12 @@ let readStrategies = (fd, opt = {}) => {
     //readContent
     let readContent = get(opt, 'readContent', false)
 
+    //fromContent
+    let fromContent = get(opt, 'fromContent', '')
+    if (fromContent !== 'filename' && fromContent !== 'content') {
+        fromContent = 'auto'
+    }
+
     //check
     if (!fsIsFolder(fd)) {
         console.log(`invalid fd[${fd}]`)
@@ -126,44 +143,111 @@ let readStrategies = (fd, opt = {}) => {
     let ss = []
     each(vfps, (v) => {
 
-        //qs
-        let name = replace(v.name, '.json', '')
-        let qs = sep(name, cont.dlmPkgs)
-
-        //tid
-        let tid = get(qs, 0, '')
-
-        //check
-        if (!isestr(tid)) {
-            return true //跳出換下一個
+        //useContent, 'auto'依檔名是否符合雜湊格式逐檔判別
+        let useContent = fromContent === 'content'
+        if (fromContent === 'auto') {
+            useContent = ptnFnHash.test(v.name)
         }
 
-        //levelNumTrade, rEquivalentCumuProfitOrLossFinalNormYear, ps, mode
-        let levelNumTrade = get(qs, 1, '')
-        let rEquivalentCumuProfitOrLossFinalNormYear = get(qs, 2, '')
-        let ps = sep(tid, cont.dlmSeps)
-        let mode = get(ps, 0, '')
-        ps = drop(ps)
-
-        //tkid
-        let tkid = `${tid}:${levelNumTrade}`
-
         //s
-        let s = {
-            path: v.path,
-            name: v.name,
-            tkid,
-            tid,
-            levelNumTrade,
-            rEquivalentCumuProfitOrLossFinalNormYear,
-            mode,
-            ps,
+        let s = null
+
+        if (useContent) {
+
+            //data, 由檔內json取各欄位
+            let d = fsReadJson(v.path) //回傳{success}或{error}, 讀取或解析失敗時為null
+            let data = get(d, 'success', null)
+
+            //check
+            if (data === null) {
+                return true //跳出換下一個
+            }
+
+            //tid
+            let tid = get(data, 'tid', '')
+
+            //check
+            if (!isestr(tid)) {
+                return true //跳出換下一個
+            }
+
+            //levelNumTrade, 為與檔名反解之回傳格式一致, 轉為字串
+            let levelNumTrade = cstr(get(data, 'levelNumTrade', ''))
+
+            //rEquivalentCumuProfitOrLossFinalNormYear
+            let rEquivalentCumuProfitOrLossFinalNormYear = get(data, 'summary.rEquivalentCumuProfitOrLossFinalNormYear', '')
+
+            //ps, mode
+            let ps = sep(tid, cont.dlmSeps)
+            let mode = get(ps, 0, '')
+            ps = drop(ps)
+
+            //tkid, 舊內容無tkid欄位時由tid與levelNumTrade組出
+            let tkid = get(data, 'tkid', '')
+            if (!isestr(tkid)) {
+                tkid = `${tid}:${levelNumTrade}`
+            }
+
+            //s
+            s = {
+                path: v.path,
+                name: v.name,
+                tkid,
+                tid,
+                levelNumTrade,
+                rEquivalentCumuProfitOrLossFinalNormYear,
+                mode,
+                ps,
+            }
+
+            //readContent
+            if (readContent) {
+                s.data = data
+            }
+
         }
+        else {
+
+            //qs
+            let name = replace(v.name, '.json', '')
+            let qs = sep(name, cont.dlmPkgs)
+
+            //tid
+            let tid = get(qs, 0, '')
+
+            //check
+            if (!isestr(tid)) {
+                return true //跳出換下一個
+            }
+
+            //levelNumTrade, rEquivalentCumuProfitOrLossFinalNormYear, ps, mode
+            let levelNumTrade = get(qs, 1, '')
+            let rEquivalentCumuProfitOrLossFinalNormYear = get(qs, 2, '')
+            let ps = sep(tid, cont.dlmSeps)
+            let mode = get(ps, 0, '')
+            ps = drop(ps)
+
+            //tkid
+            let tkid = `${tid}:${levelNumTrade}`
+
+            //s
+            s = {
+                path: v.path,
+                name: v.name,
+                tkid,
+                tid,
+                levelNumTrade,
+                rEquivalentCumuProfitOrLossFinalNormYear,
+                mode,
+                ps,
+            }
+
+            //readContent
+            if (readContent) {
+                let d = fsReadJson(v.path) //回傳{success}或{error}, 讀取或解析失敗時data為null
+                s.data = get(d, 'success', null)
+            }
 
-        //readContent
-        if (readContent) {
-            let d = fsReadJson(v.path) //回傳{success}或{error}, 讀取或解析失敗時data為null
-            s.data = get(d, 'success', null)
         }
 
         //push
@@ -190,7 +274,7 @@ export default readStrategies
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Sat Aug 08 2026 00:39:09 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 10 2026 21:53:44 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.mjs

@@ -95,9 +95,10 @@ async function test() {
     console.log(wts.calcLevelNumTrade(3), wts.calcLevelNumTrade(30), wts.calcLevelNumTrade(300))
     // => 1 12 102
 
-    //genStrategyFileName, 策略儲存檔名, 為`${tid} ⊙ ${級距} ⊙ ${等效年化盈虧}.json`
+    //genStrategyFileName, 策略儲存檔名, 為`${mode}_${級距}_${雜湊16碼}.json`, 雜湊由coin、interval、tid與級距算出
+    //  檔名為tkid之純函數且長度固定, 同tkid恆對應同一檔名, 故存檔端可直查覆寫而不需列舉全庫
     console.log(wts.genStrategyFileName('btc', '4hr', 'long', keys, {}, { numTrade: 30, rEquivalentCumuProfitOrLossFinalNormYear: '31.25%' }))
-    // => 'long ║ ma_1day ⊙ 12 ⊙ 31.25%.json'
+    // => 'long_12_a7578526a1fc57d8.json'
 
     //calcFitness, 求解所用之目標函數值, 越小越佳, 由勝率(權重 2)與等效年化盈虧(權重 1)組成
     console.log(wts.calcFitness({ uIni: 1000 }, { numTrade: 30, uEquityFinal: 1200, rWin: '60%', rEquivalentCumuProfitOrLossFinalNormYear: '25%' }))

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "w-trade-solve",
-  "version": "1.0.4",
+  "version": "2.0.1",
   "main": "dist/w-trade-solve.umd.js",
   "dependencies": {
-    "w-data-tdprovide": "^1.0.5",
-    "w-optimization": "^1.0.23",
-    "w-trade-backtest": "^1.0.7",
-    "wsemi": "^1.8.68"
+    "w-data-tdprovide": "^1.0.6",
+    "w-optimization": "^1.0.24",
+    "w-trade-backtest": "^1.0.8",
+    "wsemi": "^1.8.70"
   },
   "devDependencies": {
     "w-package-tools": "^1.1.12"

package/src/cont.mjs

@@ -2,7 +2,7 @@
  * 共用常數
  *
  * dlmSeps為tid與sid內各段(mode與各key或各cond)之分隔字串
- * dlmPkgs為策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串
+ * dlmPkgs為舊版策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串，自genStrategyFileName改採雜湊檔名後僅供readStrategies解析舊格式檔名使用
  *
  * @name cont
  * @const

package/src/estimKeys.mjs

@@ -7,10 +7,10 @@ import size from 'lodash-es/size.js'
 import cint from 'wsemi/src/cint.mjs'
 import dig from 'wsemi/src/dig.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
-import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsReadJson from 'wsemi/src/fsReadJson.mjs'
 import fsWriteJson from 'wsemi/src/fsWriteJson.mjs'
-import haskey from 'wsemi/src/haskey.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import isnum from 'wsemi/src/isnum.mjs'
@@ -23,7 +23,6 @@ import omlPSO from 'w-optimization/src/omlPSO.mjs'
 import omlACO from 'w-optimization/src/omlACO.mjs'
 import dataProvide from 'w-data-tdprovide'
 import runStrategy from 'w-trade-backtest/src/runStrategy.mjs'
-import readStrategies from './readStrategies.mjs'
 import genTid from './genTid.mjs'
 import genSid from './genSid.mjs'
 import p2r from './p2r.mjs'
@@ -38,7 +37,8 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  * 設計變數為[止損比例, 止盈比例, ...各key之門檻]，止損與止盈由opt.thsSl與opt.thsTp給予之百分比清單離散取值
  * 各key門檻取值範圍為[-thLim,thLim]切為thLim*20段，並各自平移+vdir與-vdir(vdir=thLim*5)為兩組，使解值恆大於0代表'>'條件、恆小於0代表'<'條件，還原時再扣除平移值，故單一設計變數即同時涵蓋大於與小於兩種條件
  * 以w-optimization之最佳化函數求解，由opt.methodOml指定演算法，各次計算皆以w-trade-backtest之runStrategy回測並經calcFitness計算適應值
- * 各次計算結果若同時滿足交易次數、勝率與最終等效年化盈虧三門檻，則以genStrategyFileName產生檔名存入fdData；同tid且同交易次數級距(tkid)已有策略時，僅於最終等效年化盈虧更佳時抽換，並刪除較差者
+ * 各次計算結果若同時滿足交易次數、勝率與最終等效年化盈虧三門檻，則以genStrategyFileName產生檔名存入fdData；檔名為tkid(tid+交易次數級距)之純函數，故直接組出檔名查詢既有策略(O(1)，不列舉全庫)，同tkid已有策略時僅於最終等效年化盈虧更佳時原地覆寫，故同tkid恆僅一檔；覆寫前驗證舊檔內tkid、name與interval與本次一致，不一致代表雜湊碰撞，直接throw以避免無聲覆寫
+ * 策略檔內容除策略本體(tid、sid、name、symbol、interval、keyOhlc、mode、conds、settings)與summary、fitness外，另落地tkid、levelNumTrade、keys與solve區塊(timeStart、timeEnd、methodOml、thNumTrade、thRWin、thREquivalentCumuProfitOrLossFinalNormYear、thsTp、thsSl、timeSolved)，使識別與求解條件欄位自足，不依賴檔名
  * opt除下列各欄位外，其餘欄位皆原樣傳遞至所選之最佳化函數，兩者欄位名稱無重疊，故可一併給予求解設定
  * 各演算法共通之設定為NContiguous(最佳解連續未更新次數上限，預設100)、NRepeat、NCore、ModeOutLimit、UseRepeat、UseImmigration、LocalSearchMethod與funGetBetter、funGenerationBefore、funGenerationAfter三接口；族群數與迴圈數之欄位名稱各演算法不同，RGA與DE為Np與Ng、PSO為Np與Nl、HS為Ns與Ni、ACO為Na與Nl；另各演算法有其專屬超參數，如PSO之psoC1Start、RGA之rgaCrossover、DE之deF、HS之hsHMCR與ACO之acoAlphaStart等
  * 預設之求解量甚大(單一key約需1萬7千次回測)，僅需快速試算時可調小族群數與NContiguous
@@ -46,7 +46,7 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  *
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-estimKeys.test.mjs Github}
  * @function
- * @param {Function} ott 輸入時區時間函數，傳入時間字串回傳dayjs時間物件，可用src/ott.mjs
+ * @param {Function} ott 輸入時區時間函數，傳入時間字串回傳dayjs時間物件，未傳入時回傳當下時間(供solve.timeSolved記錄)，可用src/ott.mjs
  * @param {String} name 輸入幣種名稱字串，例如'btc'，用於組出K線序列key(`${name}_price_${interval}`)與縮寫tid
  * @param {String} symbol 輸入交易對名稱字串，例如'BTCUSDT'，僅儲存至策略內供辨識
  * @param {String} interval 輸入K線週期字串，例如'4hr'
@@ -129,8 +129,8 @@ let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart,
     }
 
     let methodOml = get(opt, 'methodOml', '')
-    if (!isestr(methodOml)) {
-        methodOml = 'PSO'
+    if (methodOml !== 'RGA' && methodOml !== 'DE' && methodOml !== 'HS' && methodOml !== 'PSO' && methodOml !== 'ACO') {
+        methodOml = 'PSO' //非五者之一時採PSO, 使solve.methodOml記錄實際採用之演算法
     }
     let thsTp = get(opt, 'thsTp', null)
     if (!isearr(thsTp)) {
@@ -366,15 +366,37 @@ let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart,
         //fitness
         let fitness = calcFitness(strategy.settings, r.summary)
 
-        //res
+        //levelNumTrade
+        let levelNumTrade = calcLevelNumTrade(numTrade)
+
+        //tkid
+        let tkid = `${tid}:${levelNumTrade}`
+
+        //res, 除策略本體與summary、fitness外, 落地tkid、levelNumTrade、keys與solve使欄位自足, 識別與求解條件不依賴檔名
         let res = {
 
             ...strategy,
 
+            tkid,
+            levelNumTrade,
+            keys,
+
             summary: r.summary,
 
             fitness,
 
+            solve: {
+                timeStart,
+                timeEnd,
+                methodOml,
+                thNumTrade,
+                thRWin,
+                thREquivalentCumuProfitOrLossFinalNormYear,
+                thsTp,
+                thsSl,
+                timeSolved: ott().format('YYYY-MM-DDTHH:mm:ss'),
+            },
+
         }
         //  console.log(ifun, res)
         let resBrief = {
@@ -425,21 +447,11 @@ let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart,
                 console.log(ifun, '可用參數組', resBrief)
             }
 
-            //kpTid
-            let kpTkid = {}
-            if (true) {
-                let ss = readStrategies(fdData, { readContent: false })
-                each(ss, (s) => {
-                    kpTkid[s.tkid] = s
-                })
-            }
-            // console.log('kpTkid', kpTkid)
-
-            //levelNumTrade
-            let levelNumTrade = calcLevelNumTrade(numTrade)
+            //fnStrategy, 檔名為tkid之純函數, 故可直接組出檔名查詢既有策略, 不需列舉全庫
+            let fnStrategy = genStrategyFileName(name, interval, mode, keys, strategy.settings, r.summary)
 
-            //tkid
-            let tkid = `${tid}:${levelNumTrade}`
+            //fpStrategy
+            let fpStrategy = path.resolve(fdData, fnStrategy)
 
             //b
             let b = false
@@ -447,23 +459,41 @@ let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart,
             //rEquivalentCumuProfitOrLossFinalNormYearNew
             let rEquivalentCumuProfitOrLossFinalNormYearNew = rEquivalentCumuProfitOrLossFinalNormYear
 
-            //檢查是否已有tid策略
-            if (haskey(kpTkid, tkid)) {
+            //檢查是否已有同tkid策略
+            if (fsIsFile(fpStrategy)) {
 
-                //rEquivalentCumuProfitOrLossFinalNormYearOld
-                let rEquivalentCumuProfitOrLossFinalNormYearOld = p2r(kpTkid[tkid].rEquivalentCumuProfitOrLossFinalNormYear)
+                //dataOld
+                let dOld = fsReadJson(fpStrategy) //回傳{success}或{error}, 讀取或解析失敗時為null
+                let dataOld = get(dOld, 'success', null)
 
-                //check
-                if (rEquivalentCumuProfitOrLossFinalNormYearNew > rEquivalentCumuProfitOrLossFinalNormYearOld) {
+                if (dataOld === null) {
 
-                    //出現更好的等效盈虧比例, 須抽換
+                    //舊檔非合法json, 直接覆寫
                     b = true
 
-                    //先刪除較差tid策略
-                    if (useShowLog) {
-                        console.log(`刪除較差策略...`, `${rEquivalentCumuProfitOrLossFinalNormYearNew} > ${rEquivalentCumuProfitOrLossFinalNormYearOld}`, kpTkid[tkid].path)
+                }
+                else {
+
+                    //覆寫前驗證舊檔身分與本次一致, 不一致代表雜湊碰撞, 直接throw以避免無聲覆寫
+                    let tkidOld = get(dataOld, 'tkid', '')
+                    let nameOld = get(dataOld, 'name', '')
+                    let intervalOld = get(dataOld, 'interval', '')
+                    if ((isestr(tkidOld) && tkidOld !== tkid) || (isestr(nameOld) && nameOld !== name) || (isestr(intervalOld) && intervalOld !== interval)) {
+                        throw new Error(`hash collision: fnStrategy[${fnStrategy}], tkidOld[${tkidOld}] vs tkid[${tkid}], nameOld[${nameOld}] vs name[${name}], intervalOld[${intervalOld}] vs interval[${interval}]`)
+                    }
+
+                    //rEquivalentCumuProfitOrLossFinalNormYearOld
+                    let rEquivalentCumuProfitOrLossFinalNormYearOld = p2r(get(dataOld, 'summary.rEquivalentCumuProfitOrLossFinalNormYear', ''))
+
+                    //check, 出現更好的等效盈虧比例, 原地覆寫
+                    if (rEquivalentCumuProfitOrLossFinalNormYearNew > rEquivalentCumuProfitOrLossFinalNormYearOld) {
+
+                        if (useShowLog) {
+                            console.log(`覆寫較差策略...`, `${rEquivalentCumuProfitOrLossFinalNormYearNew} > ${rEquivalentCumuProfitOrLossFinalNormYearOld}`, fpStrategy)
+                        }
+                        b = true
+
                     }
-                    fsDeleteFile(kpTkid[tkid].path)
 
                 }
 
@@ -478,12 +508,6 @@ let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart,
             //save
             if (b) {
 
-                //fnStrategy
-                let fnStrategy = genStrategyFileName(name, interval, mode, keys, strategy.settings, r.summary)
-
-                //fpStrategy
-                let fpStrategy = path.resolve(fdData, fnStrategy)
-
                 //fsWriteJson
                 fsWriteJson(fpStrategy, res, { useFormat: true })
 

package/src/genStrategyFileName.mjs

@@ -1,5 +1,5 @@
+import crypto from 'crypto'
 import cint from 'wsemi/src/cint.mjs'
-import cont from './cont.mjs'
 import genTid from './genTid.mjs'
 import calcLevelNumTrade from './calcLevelNumTrade.mjs'
 
@@ -7,9 +7,12 @@ import calcLevelNumTrade from './calcLevelNumTrade.mjs'
 /**
  * 產生策略儲存檔名
  *
- * 檔名為`${tid}${cont.dlmPkgs}${levelNumTrade}${cont.dlmPkgs}${rEquivalentCumuProfitOrLossFinalNormYear}.json`
+ * 檔名為`${mode}_${levelNumTrade}_${hash}.json`，hash為md5(`${coin}:${interval}:${tid}:${levelNumTrade}`)取前16碼(64bits)
  * tid由genTid以coin、interval、mode與keys產生，levelNumTrade由calcLevelNumTrade以summary.numTrade產生
- * 因tid與levelNumTrade皆入檔名，故可由檔名反解出同組keys與同交易次數級距之既有策略，供readStrategies列舉比較
+ * 檔名為(coin,interval,tid,levelNumTrade)之純函數且與求解結果(等效年化盈虧)無關，故同tkid恆對應同一檔名，
+ * 存檔端可直接組出檔名以fsIsFile查詢既有策略(O(1))，不需列舉全庫，且更新為原地覆寫，結構上不會出現同tkid多檔
+ * 因genTid會剔除`${coin}_`與`${interval}_`樣式，不同幣種或週期之同組keys會得到相同tid，故hash輸入需含coin與interval以避免跨幣種/跨週期碰撞
+ * 採定長雜湊係因NTFS單一檔名段上限為255字元(UTF-16計，LongPathsEnabled無法放寬)，keys個數多時舊式`${tid} ⊙ ...`檔名會超限
  * settings目前未參與檔名組成
  *
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-genStrategyFileName.test.mjs Github}
@@ -19,7 +22,7 @@ import calcLevelNumTrade from './calcLevelNumTrade.mjs'
  * @param {String} mode 輸入交易方向字串，可選'long'或'short'
  * @param {Array} keys 輸入指標key字串陣列
  * @param {Object} settings 輸入策略設定物件
- * @param {Object} summary 輸入回測統計摘要物件，需含numTrade(交易次數)與rEquivalentCumuProfitOrLossFinalNormYear(最終等效年化盈虧百分比字串)欄位
+ * @param {Object} summary 輸入回測統計摘要物件，需含numTrade(交易次數)欄位
  * @returns {String} 回傳策略儲存檔名字串
  * @example
  *
@@ -31,7 +34,8 @@ import calcLevelNumTrade from './calcLevelNumTrade.mjs'
  *
  * let fn = genStrategyFileName('btc', '4hr', 'long', keys, settings, summary)
  * console.log(fn)
- * // => 'long ║ p_ma_1day ⊙ 12 ⊙ 31.25%.json'
+ * // => 'long_12_9fce6961e8f56493.json'
+ * //tid為'long ║ p_ma_1day', 級距為12, hash為md5('btc:4hr:long ║ p_ma_1day:12')前16碼
  *
  */
 let genStrategyFileName = (coin, interval, mode, keys, settings, summary) => {
@@ -46,11 +50,11 @@ let genStrategyFileName = (coin, interval, mode, keys, settings, summary) => {
     //levelNumTrade
     let levelNumTrade = calcLevelNumTrade(numTrade)
 
-    //rEquivalentCumuProfitOrLossFinalNormYear
-    let rEquivalentCumuProfitOrLossFinalNormYear = summary.rEquivalentCumuProfitOrLossFinalNormYear
+    //hash, 含coin與interval避免跨幣種/跨週期之同名tid碰撞
+    let hash = crypto.createHash('md5').update(`${coin}:${interval}:${tid}:${levelNumTrade}`, 'utf8').digest('hex').slice(0, 16)
 
     //fnStrategy
-    let fnStrategy = `${tid}${cont.dlmPkgs}${levelNumTrade}${cont.dlmPkgs}${rEquivalentCumuProfitOrLossFinalNormYear}.json`
+    let fnStrategy = `${mode}_${levelNumTrade}_${hash}.json`
 
     return fnStrategy
 }