w-trade-solve 1.0.2 → 1.0.3

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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/cont.mjs.html

@@ -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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/estimComps.mjs.html

@@ -65,7 +65,9 @@ import estimPicks from './estimPicks.mjs'
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-estimComps.test.mjs Github}
  * @function
  * @param {Function} ott 輸入時區時間函數，傳入時間字串回傳dayjs時間物件，可用src/ott.mjs
- * @param {Object} st 輸入設定物件，需可由opt.keySettings取得name、symbol與interval欄位
+ * @param {String} name 輸入幣種名稱字串，例如'btc'
+ * @param {String} symbol 輸入交易對名稱字串，例如'BTCUSDT'
+ * @param {String} interval 輸入K線週期字串，例如'4hr'
  * @param {String} fdOhlc 輸入儲存K線(ohlc)序列資料夾字串
  * @param {String} fdParam 輸入儲存指標參數序列資料夾字串
  * @param {String} timeStart 輸入回測起始時間字串，格式'YYYY-MM-DDTHH:mm:ss'
@@ -79,18 +81,21 @@ import estimPicks from './estimPicks.mjs'
  *
  * import ott from './src/ott.mjs'
  *
- * let st = {
- *     btc4hr: { name: 'btc', symbol: 'BTCUSDT', interval: '4hr' },
- * }
- *
  * //comps='2,1,0', 挑2種一般類、1種指數類與0種成交量類
- * await estimComps(ott, st, './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', '2,1,0', './data/strategy', {
- *     keySettings: 'btc4hr',
- * })
+ * await estimComps(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', '2,1,0', './data/strategy', {})
  *
  */
-let estimComps = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, comps, fdData, opt = {}) => {
+let estimComps = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, comps, fdData, opt = {}) => {
 
+    if (!isestr(name)) {
+        throw new Error(`invalid name[${name}]`)
+    }
+    if (!isestr(symbol)) {
+        throw new Error(`invalid symbol[${symbol}]`)
+    }
+    if (!isestr(interval)) {
+        throw new Error(`invalid interval[${interval}]`)
+    }
     if (!isestr(fdOhlc)) {
         throw new Error(`invalid fdOhlc[${fdOhlc}]`)
     }
@@ -157,7 +162,7 @@ let estimComps = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, comp
     }
 
     //estimPicks
-    await estimPicks(ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt)
+    await estimPicks(ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt)
 
 }
 
@@ -177,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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/estimFinder.mjs.html

@@ -56,12 +56,14 @@ import estimComps from './estimComps.mjs'
  *
  * 供批次探索用之進入點，未指定時mode由'long'與'short'隨機取一，comps由18種預設組成隨機取一，故重複呼叫即可隨機探索各種策略
  * 未指定時timeStart預設為'2022-07-01T00:00:00'，timeEnd則依mode給予不同值: 做多為'2025-04-08T00:00:00'(須涵蓋暴跌數據)，做空為'2025-10-06T00:00:00'(須涵蓋暴漲數據)，藉此提高率定難度
- * fdOhlc、fdParam與fdData無效時throw
+ * name、symbol、interval、fdOhlc、fdParam與fdData無效時throw
  *
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-estimFinder.test.mjs Github}
  * @function
  * @param {Function} ott 輸入時區時間函數，傳入時間字串回傳dayjs時間物件，可用src/ott.mjs
- * @param {Object} st 輸入設定物件，需可由opt.keySettings取得name、symbol與interval欄位
+ * @param {String} name 輸入幣種名稱字串，例如'btc'
+ * @param {String} symbol 輸入交易對名稱字串，例如'BTCUSDT'
+ * @param {String} interval 輸入K線週期字串，例如'4hr'
  * @param {String} fdOhlc 輸入儲存K線(ohlc)序列資料夾字串
  * @param {String} fdParam 輸入儲存指標參數序列資料夾字串
  * @param {String} fdData 輸入儲存策略資料夾字串，不存在時自動建立
@@ -75,18 +77,21 @@ import estimComps from './estimComps.mjs'
  *
  * import ott from './src/ott.mjs'
  *
- * let st = {
- *     btc4hr: { name: 'btc', symbol: 'BTCUSDT', interval: '4hr' },
- * }
- *
  * //mode與comps皆隨機, 適合以迴圈重複呼叫批次探索
- * await estimFinder(ott, st, './data/ohlc', './data/param', './data/strategy', {
- *     keySettings: 'btc4hr',
- * })
+ * await estimFinder(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', './data/strategy', {})
  *
  */
-let estimFinder = async (ott, st, fdOhlc, fdParam, fdData, opt = {}) => {
+let estimFinder = async (ott, name, symbol, interval, fdOhlc, fdParam, fdData, opt = {}) => {
 
+    if (!isestr(name)) {
+        throw new Error(`invalid name[${name}]`)
+    }
+    if (!isestr(symbol)) {
+        throw new Error(`invalid symbol[${symbol}]`)
+    }
+    if (!isestr(interval)) {
+        throw new Error(`invalid interval[${interval}]`)
+    }
     if (!isestr(fdOhlc)) {
         throw new Error(`invalid fdOhlc[${fdOhlc}]`)
     }
@@ -164,7 +169,7 @@ let estimFinder = async (ott, st, fdOhlc, fdParam, fdData, opt = {}) => {
     }
 
     //estimComps
-    await estimComps(ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, comps, fdData, opt)
+    await estimComps(ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, comps, fdData, opt)
 
 }
 
@@ -184,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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/estimKeys.mjs.html

@@ -63,7 +63,11 @@ import isestr from 'wsemi/src/isestr.mjs'
 import isnum from 'wsemi/src/isnum.mjs'
 import rang from 'wsemi/src/rang.mjs'
 import wround from 'wsemi/src/round.mjs'
+import omlRGA from 'w-optimization/src/omlRGA.mjs'
+import omlDE from 'w-optimization/src/omlDE.mjs'
+import omlHS from 'w-optimization/src/omlHS.mjs'
 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'
@@ -80,16 +84,19 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  *
  * 設計變數為[止損比例, 止盈比例, ...各key之門檻]，止損與止盈由opt.thsSl與opt.thsTp給予之百分比清單離散取值
  * 各key門檻取值範圍為[-thLim,thLim]切為thLim*20段，並各自平移+vdir與-vdir(vdir=thLim*5)為兩組，使解值恆大於0代表'>'條件、恆小於0代表'<'條件，還原時再扣除平移值，故單一設計變數即同時涵蓋大於與小於兩種條件
- * 以omlPSO粒子群最佳化求解，各次計算皆以w-trade-backtest之runStrategy回測並經calcFitness計算適應值
+ * 以w-optimization之最佳化函數求解，由opt.methodOml指定演算法，各次計算皆以w-trade-backtest之runStrategy回測並經calcFitness計算適應值
  * 各次計算結果若同時滿足交易次數、勝率與最終等效年化盈虧三門檻，則以genStrategyFileName產生檔名存入fdData；同tid且同交易次數級距(tkid)已有策略時，僅於最終等效年化盈虧更佳時抽換，並刪除較差者
- * opt除下列各欄位外，其餘欄位皆原樣傳遞至omlPSO，兩者欄位名稱無重疊，故可一併給予omlPSO之求解設定，包含Nl(最大總迴圈數，預設10000)、Np(粒子數，預設40)、NContiguous(最佳解連續未更新次數上限，預設100)、NRepeat、NCore、ModeOutLimit、UseRepeat、UseImmigration、LocalSearchMethod、funGetBetter、funEndLoop、funGenerationBefore、funGenerationAfter與psoBeta、psoGamma、psoInertiaMin、psoC1Start、psoC1End、psoC1Dynamic、psoC2Start、psoC2End、psoC2Dynamic
- * omlPSO預設之求解量甚大(單一key約需1萬7千次回測)，僅需快速試算時可調小Np與NContiguous
- * fdOhlc、fdParam、timeStart、timeEnd、keys、fdData無效或mode非'long'或'short'時throw
+ * 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
+ * name、symbol、interval、fdOhlc、fdParam、timeStart、timeEnd、keys、fdData無效或mode非'long'或'short'時throw
  *
  * 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 {Object} st 輸入設定物件，需可由opt.keySettings取得name、symbol與interval欄位
+ * @param {String} name 輸入幣種名稱字串，例如'btc'，用於組出K線序列key(`${name}_price_${interval}`)與縮寫tid
+ * @param {String} symbol 輸入交易對名稱字串，例如'BTCUSDT'，僅儲存至策略內供辨識
+ * @param {String} interval 輸入K線週期字串，例如'4hr'
  * @param {String} fdOhlc 輸入儲存K線(ohlc)序列資料夾字串
  * @param {String} fdParam 輸入儲存指標參數序列資料夾字串
  * @param {String} timeStart 輸入回測起始時間字串，格式'YYYY-MM-DDTHH:mm:ss'
@@ -97,33 +104,23 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  * @param {String} mode 輸入交易方向字串，可選'long'或'short'
  * @param {Array} keys 輸入待率定門檻之指標key字串陣列
  * @param {String} fdData 輸入儲存策略資料夾字串，不存在時自動建立
- * @param {Object} [opt={}] 輸入設定物件，預設{}，全部欄位皆傳遞至omlPSO，故可另給Nl、Np、NContiguous等omlPSO之設定
- * @param {String} opt.keySettings 輸入取用st內設定之鍵字串，例如'btc4hr'代表取用st.btc4hr.name、st.btc4hr.symbol與st.btc4hr.interval
+ * @param {Object} [opt={}] 輸入設定物件，預設{}，除下列欄位外皆傳遞至所選之最佳化函數，故可另給NContiguous等求解設定
+ * @param {String} [opt.methodOml='PSO'] 輸入最佳化演算法字串，可選'RGA'(實數型基因演算法)、'DE'(差分進化法)、'HS'(和聲搜尋法)、'PSO'(粒子群最佳化)與'ACO'(蟻群最佳化)，給予其他值時亦採'PSO'，預設'PSO'
  * @param {Array} [opt.thsTp=[1,2,3,4,5,6,7,8,9,10]] 輸入止盈門檻百分比數值陣列，預設[1,2,3,4,5,6,7,8,9,10]
  * @param {Array} [opt.thsSl=[1,2,3,4,5,6,7,8,9,10]] 輸入止損門檻百分比數值陣列，預設[1,2,3,4,5,6,7,8,9,10]
  * @param {Number} [opt.thNumTrade=1] 輸入策略須儲存之最少交易次數數值，預設1
  * @param {Number} [opt.thRWin=0.5] 輸入策略須儲存之最低勝率比例數值，預設0.5
  * @param {Number} [opt.thREquivalentCumuProfitOrLossFinalNormYear=0.15] 輸入策略須儲存之最低最終等效年化盈虧比例數值，預設0.15
  * @param {Boolean} [opt.useShowLog=false] 輸入是否顯示求解過程log布林值，預設false
- * @returns {Promise} 回傳Promise，resolve為omlPSO之求解結果物件，含bestSolution(最佳解，內有ps設計變數陣列與fitness適應值)、stopMode(觸發停止之機制字串)、stopIteration(停止時之迴圈數)與stopExecutions(停止時之核心分析次數)等欄位
+ * @returns {Promise} 回傳Promise，resolve為求解結果物件，含bestSolution(最佳解，內有ps設計變數陣列與fitness適應值)、stopMode(觸發停止之機制字串)、stopIteration(停止時之迴圈數)與stopExecutions(停止時之核心分析次數)等欄位
  * @example
  *
  * import ott from './src/ott.mjs'
  *
- * //st, 各設定以keySettings為鍵儲存
- * let st = {
- *     btc4hr: {
- *         name: 'btc',
- *         symbol: 'BTCUSDT',
- *         interval: '4hr',
- *     },
- * }
- *
  * //keys, 待率定門檻之指標key, 各key於fdParam內須有對應之`${key}.json`
  * let keys = ['btc_price_4hr_ma_1day']
  *
- * let m = await estimKeys(ott, st, './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', keys, './data/strategy', {
- *     keySettings: 'btc4hr',
+ * let m = await estimKeys(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', keys, './data/strategy', {
  *     thsTp: [1, 2, 3],
  *     thsSl: [1, 2, 3],
  *     useShowLog: true,
@@ -131,12 +128,12 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  * console.log(m.bestSolution.fitness)
  * // => 1.0325
  *
- * //可一併給予omlPSO之求解設定, 縮小Np與NContiguous即可快速試算
- * let mQuick = await estimKeys(ott, st, './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', keys, './data/strategy', {
- *     keySettings: 'btc4hr',
+ * //可指定演算法並一併給予其求解設定, 縮小族群數與NContiguous即可快速試算
+ * let mQuick = await estimKeys(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', keys, './data/strategy', {
  *     thsTp: [1, 2, 3],
  *     thsSl: [1, 2, 3],
- *     Np: 8, //粒子數, 預設40
+ *     methodOml: 'PSO',
+ *     Np: 8, //PSO之粒子數, 預設40
  *     NContiguous: 5, //最佳解連續未更新次數上限, 預設100
  * })
  * console.log(mQuick.stopMode)
@@ -145,8 +142,17 @@ import genStrategyFileName from './genStrategyFileName.mjs'
  * // => 357
  *
  */
-let estimKeys = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt = {}) => {
+let estimKeys = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt = {}) => {
 
+    if (!isestr(name)) {
+        throw new Error(`invalid name[${name}]`)
+    }
+    if (!isestr(symbol)) {
+        throw new Error(`invalid symbol[${symbol}]`)
+    }
+    if (!isestr(interval)) {
+        throw new Error(`invalid interval[${interval}]`)
+    }
     if (!isestr(fdOhlc)) {
         throw new Error(`invalid fdOhlc[${fdOhlc}]`)
     }
@@ -169,9 +175,9 @@ let estimKeys = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys,
         throw new Error(`invalid fdData[${fdData}]`)
     }
 
-    let keySettings = get(opt, 'keySettings', '')
-    if (!isestr(keySettings)) {
-        throw new Error(`invalid opt.keySettings[${keySettings}]`)
+    let methodOml = get(opt, 'methodOml', '')
+    if (!isestr(methodOml)) {
+        methodOml = 'PSO'
     }
     let thsTp = get(opt, 'thsTp', null)
     if (!isearr(thsTp)) {
@@ -198,11 +204,6 @@ let estimKeys = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys,
     //provideData
     let provideData = dataProvide(fdOhlc, fdParam)
 
-    //st
-    let name = get(st, `${keySettings}.name`, '')
-    let symbol = get(st, `${keySettings}.symbol`, '')
-    let interval = get(st, `${keySettings}.interval`, '')
-
     //fdData, 儲存策略資料夾, 由呼叫端指定, 不存在則建立
     if (!fsIsFolder(fdData)) {
         fsCreateFolder(fdData)
@@ -540,8 +541,26 @@ let estimKeys = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys,
         return fitness
     }
 
+    //oml
+    let oml = omlPSO
+    if (methodOml === 'RGA') {
+        oml = omlRGA
+    }
+    else if (methodOml === 'DE') {
+        oml = omlDE
+    }
+    else if (methodOml === 'HS') {
+        oml = omlHS
+    }
+    else if (methodOml === 'PSO') {
+        oml = omlPSO
+    }
+    else if (methodOml === 'ACO') {
+        oml = omlACO
+    }
+
     //m
-    let m = await omlPSO(dps, fun, {
+    let m = await oml(dps, fun, {
         // funGenerationBefore,
         // funGenerationAfter,
         // funGetBetter,
@@ -574,7 +593,7 @@ export default estimKeys
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/estimPicks.mjs.html

@@ -58,12 +58,14 @@ import estimKeys from './estimKeys.mjs'
  *
  * 先由fdParam列舉全部指標key，並依名稱分為3類: 開頭為'index_'者為keysIndex(指數類)、含'_vbs_'者為keysVolumn(成交量類)、其餘為keysNorm(一般類)
  * 分類後各類可經opt內對應之過濾函數再行篩選，接著呼叫funPickKeys由3類挑出待率定之keys，最後交由estimKeys求解
- * fdOhlc、fdParam、timeStart、timeEnd、fdData無效或mode非'long'或'short'或funPickKeys非函數時throw
+ * name、symbol、interval、fdOhlc、fdParam、timeStart、timeEnd、fdData無效或mode非'long'或'short'或funPickKeys非函數時throw
  *
  * Unit Test: {@link https://github.com/yuda-lyu/w-trade-solve/blob/master/test/unit-estimPicks.test.mjs Github}
  * @function
  * @param {Function} ott 輸入時區時間函數，傳入時間字串回傳dayjs時間物件，可用src/ott.mjs
- * @param {Object} st 輸入設定物件，需可由opt.keySettings取得name、symbol與interval欄位
+ * @param {String} name 輸入幣種名稱字串，例如'btc'
+ * @param {String} symbol 輸入交易對名稱字串，例如'BTCUSDT'
+ * @param {String} interval 輸入K線週期字串，例如'4hr'
  * @param {String} fdOhlc 輸入儲存K線(ohlc)序列資料夾字串
  * @param {String} fdParam 輸入儲存指標參數序列資料夾字串
  * @param {String} timeStart 輸入回測起始時間字串，格式'YYYY-MM-DDTHH:mm:ss'
@@ -80,22 +82,25 @@ import estimKeys from './estimKeys.mjs'
  *
  * import ott from './src/ott.mjs'
  *
- * let st = {
- *     btc4hr: { name: 'btc', symbol: 'BTCUSDT', interval: '4hr' },
- * }
- *
  * //funPickKeys, 由一般類挑第1個key為待率定key
  * let funPickKeys = ({ keysNorm, keysIndex, keysVolumn }) => {
  *     return [keysNorm[0]]
  * }
  *
- * await estimPicks(ott, st, './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', funPickKeys, './data/strategy', {
- *     keySettings: 'btc4hr',
- * })
+ * await estimPicks(ott, 'btc', 'BTCUSDT', '4hr', './data/ohlc', './data/param', '2022-07-01T00:00:00', '2025-04-08T00:00:00', 'long', funPickKeys, './data/strategy', {})
  *
  */
-let estimPicks = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt = {}) => {
+let estimPicks = async (ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, funPickKeys, fdData, opt = {}) => {
 
+    if (!isestr(name)) {
+        throw new Error(`invalid name[${name}]`)
+    }
+    if (!isestr(symbol)) {
+        throw new Error(`invalid symbol[${symbol}]`)
+    }
+    if (!isestr(interval)) {
+        throw new Error(`invalid interval[${interval}]`)
+    }
     if (!isestr(fdOhlc)) {
         throw new Error(`invalid fdOhlc[${fdOhlc}]`)
     }
@@ -167,7 +172,7 @@ let estimPicks = async (ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, funP
     // console.log('keys', keys)
 
     //estimKeys
-    await estimKeys(ott, st, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt)
+    await estimKeys(ott, name, symbol, interval, fdOhlc, fdParam, timeStart, timeEnd, mode, keys, fdData, opt)
 
 }
 
@@ -187,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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/genStrategyFileName.mjs.html

@@ -118,7 +118,7 @@ export default genStrategyFileName
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 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 Wed Aug 05 2026 10:37:47 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 Wed Aug 05 2026 14:58:22 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>