w-trade-solve 1.0.4 → 2.0.1

package/docs/calcFitness.mjs.html

@@ -192,7 +192,7 @@ export default calcFitness
 <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/docs/calcLevelNumTrade.mjs.html

@@ -151,7 +151,7 @@ export default calcLevelNumTrade
 <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/docs/cont.mjs.html

@@ -49,7 +49,7 @@
  * 共用常數
  *
  * dlmSeps為tid與sid內各段(mode與各key或各cond)之分隔字串
- * dlmPkgs為策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串
+ * dlmPkgs為舊版策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串，自genStrategyFileName改採雜湊檔名後僅供readStrategies解析舊格式檔名使用
  *
  * @name cont
  * @const
@@ -81,7 +81,7 @@ export default r
 <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/docs/estimComps.mjs.html

@@ -182,7 +182,7 @@ export default estimComps
 <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/docs/estimFinder.mjs.html

@@ -189,7 +189,7 @@ export default estimFinder
 <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/docs/estimKeys.mjs.html

@@ -54,10 +54,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'
@@ -70,7 +70,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'
@@ -85,7 +84,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
@@ -93,7 +93,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'
@@ -176,8 +176,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)) {
@@ -413,15 +413,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 = {
@@ -472,21 +494,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
@@ -494,23 +506,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)
 
                 }
 
@@ -525,12 +555,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 })
 
@@ -593,7 +617,7 @@ export default estimKeys
 <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/docs/estimPicks.mjs.html

@@ -192,7 +192,7 @@ export default estimPicks
 <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/docs/genSid.mjs.html

@@ -112,7 +112,7 @@ export default genSid
 <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/docs/genStrategyFileName.mjs.html

@@ -45,8 +45,8 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import cint from 'wsemi/src/cint.mjs'
-import cont from './cont.mjs'
+            <pre class="prettyprint source linenums"><code>import crypto from 'crypto'
+import cint from 'wsemi/src/cint.mjs'
 import genTid from './genTid.mjs'
 import calcLevelNumTrade from './calcLevelNumTrade.mjs'
 
@@ -54,9 +54,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}
@@ -66,7 +69,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
  *
@@ -78,7 +81,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) => {
@@ -93,11 +97,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
 }
@@ -118,7 +122,7 @@ export default genStrategyFileName
 <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/docs/genTid.mjs.html

@@ -100,7 +100,7 @@ export default genTid
 <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/docs/global.html

@@ -136,7 +136,7 @@
     <dt class="tag-description">Description:</dt>
     <dd class="tag-description"><ul class="dummy"><li><p>共用常數</p>
 <p>dlmSeps為tid與sid內各段(mode與各key或各cond)之分隔字串
-dlmPkgs為策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串</p></li></ul></dd>
+dlmPkgs為舊版策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串，自genStrategyFileName改採雜湊檔名後僅供readStrategies解析舊格式檔名使用</p></li></ul></dd>
     
 
     
@@ -184,7 +184,7 @@ dlmPkgs為策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLos
 <div class="description usertext">
     <p>共用常數</p>
 <p>dlmSeps為tid與sid內各段(mode與各key或各cond)之分隔字串
-dlmPkgs為策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串</p>
+dlmPkgs為舊版策略檔名內各段(tid、levelNumTrade、rEquivalentCumuProfitOrLossFinalNormYear)之分隔字串，自genStrategyFileName改採雜湊檔名後僅供readStrategies解析舊格式檔名使用</p>
 </div>
 
 
@@ -1842,7 +1842,8 @@ await estimFinder(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', '
 <p>設計變數為[止損比例, 止盈比例, ...各key之門檻]，止損與止盈由opt.thsSl與opt.thsTp給予之百分比清單離散取值
 各key門檻取值範圍為[-thLim,thLim]切為thLim<em>20段，並各自平移+vdir與-vdir(vdir=thLim</em>5)為兩組，使解值恆大於0代表'&gt;'條件、恆小於0代表'&lt;'條件，還原時再扣除平移值，故單一設計變數即同時涵蓋大於與小於兩種條件
 以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
@@ -1987,7 +1988,7 @@ console.log(mQuick.stopExecutions) //核心分析次數, 較預設設定大幅
                 </td>
             
 
-            <td class="description last"><p>輸入時區時間函數，傳入時間字串回傳dayjs時間物件，可用src/ott.mjs</p></td>
+            <td class="description last"><p>輸入時區時間函數，傳入時間字串回傳dayjs時間物件，未傳入時回傳當下時間(供solve.timeSolved記錄)，可用src/ott.mjs</p></td>
         </tr>
 
     
@@ -3748,9 +3749,12 @@ console.log(sid)
     
     <dt class="tag-description">Description:</dt>
     <dd class="tag-description"><ul class="dummy"><li><p>產生策略儲存檔名</p>
-<p>檔名為<code>${tid}${cont.dlmPkgs}${levelNumTrade}${cont.dlmPkgs}${rEquivalentCumuProfitOrLossFinalNormYear}.json</code>
+<p>檔名為<code>${mode}_${levelNumTrade}_${hash}.json</code>，hash為md5(<code>${coin}:${interval}:${tid}:${levelNumTrade}</code>)取前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會剔除<code>${coin}_</code>與<code>${interval}_</code>樣式，不同幣種或週期之同組keys會得到相同tid，故hash輸入需含coin與interval以避免跨幣種/跨週期碰撞
+採定長雜湊係因NTFS單一檔名段上限為255字元(UTF-16計，LongPathsEnabled無法放寬)，keys個數多時舊式<code>${tid} ⊙ ...</code>檔名會超限
 settings目前未參與檔名組成</p>
 <p>Unit Test: <a href="https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-genStrategyFileName.test.mjs">Github</a></p></li></ul></dd>
     
@@ -3758,7 +3762,7 @@ settings目前未參與檔名組成</p>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="genStrategyFileName.mjs.html">genStrategyFileName.mjs</a>, <a href="genStrategyFileName.mjs.html#line37">line 37</a>
+        <a href="genStrategyFileName.mjs.html">genStrategyFileName.mjs</a>, <a href="genStrategyFileName.mjs.html#line41">line 41</a>
     </li></ul></dd>
     
 
@@ -3813,7 +3817,8 @@ let summary = { numTrade: 30, rEquivalentCumuProfitOrLossFinalNormYear: '31.25%'
 
 let fn = genStrategyFileName('btc', '4hr', 'long', keys, settings, summary)
 console.log(fn)
-// => 'long ║ p_ma_1day ⊙ 12 ⊙ 31.25%.json'</code></pre>
+// => 'long_12_9fce6961e8f56493.json'
+//tid為'long ║ p_ma_1day', 級距為12, hash為md5('btc:4hr:long ║ p_ma_1day:12')前16碼</code></pre>
 
 
 
@@ -3980,7 +3985,7 @@ console.log(fn)
 
             
 
-            <td class="description last"><p>輸入回測統計摘要物件，需含numTrade(交易次數)與rEquivalentCumuProfitOrLossFinalNormYear(最終等效年化盈虧百分比字串)欄位</p></td>
+            <td class="description last"><p>輸入回測統計摘要物件，需含numTrade(交易次數)欄位</p></td>
         </tr>
 
     
@@ -4880,8 +4885,11 @@ console.log(p2r(''))
     <dt class="tag-description">Description:</dt>
     <dd class="tag-description"><ul class="dummy"><li><p>讀取儲存策略資料夾內各策略檔資訊</p>
 <p>僅列舉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雜湊格式(<code>${mode}_${levelNumTrade}_${hash16}.json</code>)者走'content'，其餘走'filename'，故新舊格式混存時皆可列舉
+tid依cont.dlmSeps切段，首段為mode，其餘為各key所組成之ps
 tkid為<code>${tid}:${levelNumTrade}</code>，與estimKeys內用於判斷同組keys與同交易次數級距之組合方式一致</p>
 <p>Unit Test: <a href="https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-readStrategies.test.mjs">Github</a></p></li></ul></dd>
     
@@ -4889,7 +4897,7 @@ tkid為<code>${tid}:${levelNumTrade}</code>，與estimKeys內用於判斷同組k
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="readStrategies.mjs.html">readStrategies.mjs</a>, <a href="readStrategies.mjs.html#line56">line 56</a>
+        <a href="readStrategies.mjs.html">readStrategies.mjs</a>, <a href="readStrategies.mjs.html#line67">line 67</a>
     </li></ul></dd>
     
 
@@ -4937,20 +4945,22 @@ tkid為<code>${tid}:${levelNumTrade}</code>，與estimKeys內用於判斷同組k
     <h5 class="h5-examples">Example</h5>
     
     <pre class="prettyprint"><code>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',
@@ -5124,7 +5134,47 @@ console.log(readStrategies(fd))
                 </td>
             
 
-            <td class="description last"><p>輸入是否讀取策略檔內容布林值，為true時各元素額外提供data欄位，內容非合法json時data為null，預設false</p></td>
+            <td class="description last"><p>輸入是否額外提供策略檔內容布林值，為true時各元素額外提供data欄位，內容非合法json時data為null，預設false</p></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>fromContent</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>'auto'</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入解析來源字串，可選'filename'(由檔名反解)、'content'(讀檔內json欄位)與'auto'(依檔名格式逐檔判別)，給予其他值時亦採'auto'，預設'auto'</p></td>
         </tr>
 
     
@@ -5199,7 +5249,7 @@ console.log(readStrategies(fd))
 <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/docs/index.html

@@ -71,7 +71,7 @@
 <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/docs/ott.mjs.html

@@ -124,7 +124,7 @@ export { ott, nowTpeStr, nowTpeStrp }
 <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/docs/p2r.mjs.html

@@ -98,7 +98,7 @@ export default p2r
 <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>