w-geo 1.1.19 → 1.1.21

package/docs/-_class.mjs.html

@@ -62,7 +62,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthByDepthStartEnd.mjs.html

@@ -233,7 +233,7 @@ export default calcDepthByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByConnect.mjs.html

@@ -322,7 +322,7 @@ export default calcDepthStartEndByConnect
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByDepth.mjs.html

@@ -347,7 +347,7 @@ export default calcDepthStartEndByDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByGroup.mjs.html

@@ -566,7 +566,7 @@ export default calcDepthStartEndByGroup
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcLiquefaction.mjs.html

@@ -7801,7 +7801,7 @@ export default calcLiquefaction
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcVerticalStress.mjs.html

@@ -733,7 +733,7 @@ export default { //整合輸出預設得要有default
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepth.mjs.html

@@ -214,7 +214,7 @@ export default checkDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepthStartEnd.mjs.html

@@ -273,7 +273,7 @@ export default checkDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/complementDepthData.mjs.html

@@ -506,7 +506,7 @@ export default complementDepthData
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/groupByDepthStartEnd.mjs.html

@@ -492,7 +492,7 @@ export default groupByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 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.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/mergeByDepthStartEnd.mjs.html

@@ -907,7 +907,7 @@ export default mergeByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPlasticityParams.mjs.html

@@ -334,7 +334,7 @@ export default relaPlasticityParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPorousParams.mjs.html

@@ -524,7 +524,7 @@ export default relaPorousParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/sepDepthStartEndByDepth.mjs.html

@@ -324,7 +324,7 @@ export default sepDepthStartEndByDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/smoothDepthByKey.mjs.html

@@ -280,7 +280,7 @@ export default smoothDepthByKey
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/w-geo.html

@@ -9658,7 +9658,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed May 01 2024 22:27:08 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.2</a> on Wed May 08 2024 22:17:07 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g_6-1-calcLayersByCompress.mjs

@@ -5155,5 +5155,16 @@ fs.writeFileSync(`./calcLayersByCompress-rowsIn.json`, JSON.stringify(_rowsIn),
 fs.writeFileSync(`./calcLayersByCompress-rowsOut.json`, JSON.stringify(rowsOut), 'utf8')
 w.downloadExcelFileFromData(`./calcLayersByCompress-mat(${numMaxLayers}).xlsx`, 'data', rowsOut)
 
+//待加入可調整厚度陣列或起訖上下限設定
+
+// 已確認要加入「最小分層厚度」之分層機制，只要小於該厚度就判斷為「薄層」，整個風場採用相同「最小分層厚度」，完成各孔分層厚，
+
+// 最大層數若超過45層(暫定，強限制條件)，就增加「最小分層厚度」後重跑全孔；
+
+// 反之，若最大層數小於30層(暫定，弱限制條件，因為風場土層可能較為均質，雖然台灣海峽海域不太可能發生)，則減小「最小分層厚度」後重跑，
+
+// 另外「最小分層厚度」不宜太薄，可能須>=1.0 m(暫定，後續分析建模土層不宜過薄，強限制條件)。
+
+
 
 //node --experimental-modules g_6-1-calcLayersByCompress.mjs

package/g_7_1-intrpPsdBySize.mjs

@@ -0,0 +1,52 @@
+import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import intrpPsdBySize from './src/intrpPsdBySize.mjs'
+
+
+let psd = [101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]
+let psf = [100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]
+let pfss = _.map(psd, (_v, k) => {
+    let s = _.get(psd, k)
+    let f = _.get(psf, k)
+    return {
+        size: s,
+        fraction: f,
+    }
+})
+console.log('pfss', pfss)
+// => pfss [
+//   { size: 101.6, fraction: 100 },
+//   { size: 76.2, fraction: 100 },
+//   { size: 50.8, fraction: 100 },
+//   { size: 25.4, fraction: 100 },
+//   { size: 19, fraction: 100 },
+//   { size: 9.5, fraction: 100 },
+//   { size: 4.75, fraction: 100 },
+//   { size: 2, fraction: 100 },
+//   { size: 0.85, fraction: 100 },
+//   { size: 0.425, fraction: 100 },
+//   { size: 0.25, fraction: 100 },
+//   { size: 0.15, fraction: -1 },
+//   { size: 0.106, fraction: 100 },
+//   { size: 0.075, fraction: 99 },
+//   { size: 0.027, fraction: 96 },
+//   { size: 0.018, fraction: 86 },
+//   { size: 0.011, fraction: 74 },
+//   { size: 0.008, fraction: 61 },
+//   { size: 0.006, fraction: 51 },
+//   { size: 0.003, fraction: 32 },
+//   { size: 0.001, fraction: 16 },
+//   { size: 0, fraction: 0 },
+//   { size: 0, fraction: 0 },
+//   { size: 0, fraction: 0 }
+// ]
+
+let psizes = 0.063
+
+let r = intrpPsdBySize(pfss, psizes)
+console.log(r)
+// => 98.4880247416152
+
+
+//node --experimental-modules g_7_1-intrpPsdBySize.mjs

package/{g_7_9-calcPropInterfaceFrictionAngle.mjs → g_7_a1-calcPropInterfaceFrictionAngle.mjs}

@@ -105,4 +105,4 @@ await w.pmSeries(ms, async (m, i) => {
 
 })
 
-//node --experimental-modules g_7_9-calcPropInterfaceFrictionAngle.mjs
+//node --experimental-modules g_7_a1-calcPropInterfaceFrictionAngle.mjs

package/g_8_1-dtIntrpPsdBySize.mjs

@@ -0,0 +1,50 @@
+import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import dtIntrpPsdBySize from './src/dtIntrpPsdBySize.mjs'
+
+
+let dt = {
+    GSD: `[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]`,
+    GSP: `[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]`,
+}
+console.log('dt', dt)
+// => dt {
+//   GSD: '[101.6, 76.2, 50.8, 25.4, 19.0, 9.5, 4.75, 2.0, 0.85, 0.425, 0.25, 0.15, 0.106, 0.075, 0.027, 0.018, 0.011, 0.008, 0.006, 0.003, 0.001, 0.0, 0.0, 0.0]',
+//   GSP: '[100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, -1.0, 100.0, 99.0, 96.0, 86.0, 74.0, 61.0, 51.0, 32.0, 16.0, 0.0, 0.0, 0.0]'
+// }
+
+let psizes = [
+    630,
+    200,
+    63,
+    20,
+    6.3,
+    2,
+    0.63,
+    0.2,
+    0.063,
+    0.02,
+    0.0063,
+    0.002,
+]
+
+let fss = dtIntrpPsdBySize(dt, psizes)
+console.log('fss', fss)
+// => [
+//   { size: 630, fraction: 100 },
+//   { size: 200, fraction: 100 },
+//   { size: 63, fraction: 99.99999999999999 },
+//   { size: 20, fraction: 99.99999999999999 },
+//   { size: 6.3, fraction: 100.00000000000001 },
+//   { size: 2, fraction: 100 },
+//   { size: 0.63, fraction: 100.00000000000001 },
+//   { size: 0.2, fraction: 100 },
+//   { size: 0.063, fraction: 98.4880247416152 },
+//   { size: 0.02, fraction: 88.59851004564663 },
+//   { size: 0.0063, fraction: 52.69597513510718 },
+//   { size: 0.002, fraction: 26.094876057143324 }
+// ]
+
+
+//node --experimental-modules g_8_1-dtIntrpPsdBySize.mjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-geo",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "main": "dist/w-geo.umd.js",
   "dependencies": {
     "decimal.js": "^10.4.3",

package/src/WGeo.mjs

@@ -25,10 +25,12 @@ export { default as checkDepth } from './checkDepth.mjs'
 export { default as checkDepthStartEnd } from './checkDepthStartEnd.mjs'
 export { default as cnst } from './cnst.mjs'
 export { default as complementDepthData } from './complementDepthData.mjs'
+export { default as dtIntrpPsdBySize } from './dtIntrpPsdBySize.mjs'
 export { default as getCptDepthHcOpt } from './getCptDepthHcOpt.mjs'
 export { default as getDepthMaxMin } from './getDepthMaxMin.mjs'
 export { default as groupByDepthStartEnd } from './groupByDepthStartEnd.mjs'
 export { default as intrpDefParam } from './intrpDefParam.mjs'
+export { default as intrpPsdBySize } from './intrpPsdBySize.mjs'
 export { default as judge } from './judge.mjs'
 export { default as mergeByDepthStartEnd } from './mergeByDepthStartEnd.mjs'
 export { default as relaPlasticityParams } from './relaPlasticityParams.mjs'

package/src/calcLayersByCompress.mjs

@@ -10,6 +10,7 @@ import isnum from 'wsemi/src/isnum.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
+import isearr from 'wsemi/src/isearr.mjs'
 import cdbl from 'wsemi/src/cdbl.mjs'
 import cstr from 'wsemi/src/cstr.mjs'
 import arrSort from 'wsemi/src/arrSort.mjs'
@@ -66,6 +67,53 @@ function calcLayersByCompress(ltdt, opt = {}) {
     //keyMgValueIcn
     let keyMgValueIcn = get(opt, 'keyMgValueIcn', 'Icn')
 
+    //levelsForThicknessMax
+    let levelsForThicknessMax = get(opt, 'levelsForThicknessMax', [])
+    if (!isearr(levelsForThicknessMax)) {
+        levelsForThicknessMax = [
+            0.0201,
+            0.0401,
+            0.0601,
+            0.0801,
+            0.1001,
+            0.1251,
+            0.1501,
+            0.1751,
+            0.2001,
+            0.2501,
+            0.3001,
+            0.3501,
+            0.4001,
+            0.4501,
+            0.5001,
+            0.7501,
+            1.0001,
+            1.5001,
+            2.0001,
+            3.0001,
+            4.0001,
+            5.0001,
+            // 6.0001,
+            // 7.0001,
+            // 8.0001,
+            // 9.0001,
+            // 10.0001,
+        ]
+    }
+
+    //levelsForMgValueIcnDiffMax
+    let levelsForMgValueIcnDiffMax = get(opt, 'levelsForMgValueIcnDiffMax', [])
+    if (!isearr(levelsForMgValueIcnDiffMax)) {
+        levelsForMgValueIcnDiffMax = [
+            0.20,
+            0.25,
+            0.30,
+            // 0.35,
+            // 0.40,
+            // 0.50,
+        ]
+    }
+
     //saveFromInds
     let saveFromInds = get(opt, 'saveFromInds')
     if (!isbol(saveFromInds)) {
@@ -537,45 +585,10 @@ function calcLayersByCompress(ltdt, opt = {}) {
     if (true) {
 
         //_thicknessMax
-        let _thicknessMax = [
-            0.0201,
-            0.0401,
-            0.0601,
-            0.0801,
-            0.1001,
-            0.1251,
-            0.1501,
-            0.1751,
-            0.2001,
-            0.2501,
-            0.3001,
-            0.3501,
-            0.4001,
-            0.4501,
-            0.5001,
-            0.7501,
-            1.0001,
-            1.5001,
-            2.0001,
-            3.0001,
-            4.0001,
-            5.0001,
-            // 6.0001,
-            // 7.0001,
-            // 8.0001,
-            // 9.0001,
-            // 10.0001,
-        ]
+        let _thicknessMax = levelsForThicknessMax
 
         //_mgValueIcnDiffMax
-        let _mgValueIcnDiffMax = [
-            0.20,
-            0.25,
-            0.30,
-            // 0.35,
-            // 0.40,
-            // 0.50,
-        ]
+        let _mgValueIcnDiffMax = levelsForMgValueIcnDiffMax
 
         //ss
         let ss = []

package/src/dtIntrpPsdBySize.mjs

@@ -0,0 +1,137 @@
+import each from 'lodash-es/each.js'
+import map from 'lodash-es/map.js'
+import get from 'lodash-es/get.js'
+import j2o from 'wsemi/src/j2o.mjs'
+import isearr from 'wsemi/src/isearr.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
+import cdbl from 'wsemi/src/cdbl.mjs'
+import intrpPsdBySize from './intrpPsdBySize.mjs'
+
+
+//parseStrArray
+let parseStrArray = (c) => {
+    let r = j2o(c)
+    if (!isearr(r)) {
+        console.log('c', c)
+        throw new Error('無法解析JSON字串型陣列')
+    }
+    return r
+}
+
+
+function dtIntrpPsdBySize(dt, psizes, opt = {}) {
+
+    //keySize
+    let keySize = get(opt, 'keySize', '')
+    if (!isestr(keySize)) {
+        keySize = 'size'
+    }
+
+    //keyFraction
+    let keyFraction = get(opt, 'keyFraction', '')
+    if (!isestr(keyFraction)) {
+        keyFraction = 'fraction'
+    }
+
+    //GSD
+    let GSD = get(dt, 'GSD', '')
+    if (!isestr(GSD) && !isearr(GSD)) {
+        throw new Error('invalid GSD')
+    }
+    if (isestr(GSD)) {
+        GSD = parseStrArray(GSD)
+    }
+    // console.log('GSD', GSD)
+
+    //GSP
+    let GSP = get(dt, 'GSP', '')
+    if (!isestr(GSP) && !isearr(GSP)) {
+        throw new Error('invalid GSP')
+    }
+    if (isestr(GSP)) {
+        GSP = parseStrArray(GSP)
+    }
+    // console.log('GSP', GSP)
+
+    //psizes
+    if (!isearr(psizes)) {
+        //ASTM
+        psizes = [
+            101.6,
+            76.2,
+            50.8,
+            25.4,
+            19.0,
+            9.5,
+            4.75,
+            2.0,
+            0.85,
+            0.425,
+            0.25,
+            0.15,
+            0.106,
+            0.075,
+            0.034,
+            0.022,
+            0.013,
+            0.009,
+            0.007,
+            0.003,
+            0.001,
+        ]
+        // //ISO
+        // psizes = [
+        //     630,
+        //     200,
+        //     63,
+        //     20,
+        //     6.3,
+        //     2,
+        //     0.63,
+        //     0.2,
+        //     0.063,
+        //     0.02,
+        //     0.0063,
+        //     0.002,
+        // ]
+    }
+
+    //fss
+    let fss = []
+    each(GSD, (_v, k) => {
+        let size = get(GSD, k, '')
+        if (!isnum(size)) {
+            console.log(k, 'size', size)
+            throw new Error(`size[${size}] is not an effective number`)
+        }
+        size = cdbl(size)
+        let fraction = get(GSP, k, '')
+        if (!isnum(fraction)) {
+            console.log(k, 'fraction', fraction)
+            throw new Error(`fraction[${fraction}] is not an effective number`)
+        }
+        fraction = cdbl(fraction)
+        fss.push({
+            [keySize]: size,
+            [keyFraction]: fraction,
+        })
+    })
+    // console.log('fss', fss)
+
+    //重算各size處之通過百分比
+    let rs = intrpPsdBySize(fss, psizes, { keySize, keyFraction })
+    rs = map(rs, (fraction, k) => {
+        let size = get(psizes, k)
+        return {
+            [keySize]: size,
+            [keyFraction]: fraction,
+        }
+    })
+    // console.log('rs', rs)
+
+    return rs
+}
+
+
+export default dtIntrpPsdBySize