w-cluster 1.0.10 → 1.0.13

package/docs/global.html

@@ -130,7 +130,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WCluster.mjs.html">WCluster.mjs</a>, <a href="WCluster.mjs.html#line166">line 166</a>
+        <a href="WCluster.mjs.html">WCluster.mjs</a>, <a href="WCluster.mjs.html#line280">line 280</a>
     </li></ul></dd>
     
 
@@ -181,7 +181,7 @@
 
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code>async function testPCA() {
    let mat = [
        [40, 50, 60],
        [50, 70, 60],
        [80, 70, 90],
        [50, 60, 80]
    ]
    console.log('mat', mat)
    // => mat [ [ 40, 50, 60 ], [ 50, 70, 60 ], [ 80, 70, 90 ], [ 50, 60, 80 ] ]
    let resMat = await WCluster.PCA(mat, { nCompNIPALS: 2 })
    console.log(resMat)
    // => [
    //     [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
    //     [ 50.520478881706346, 69.86935352609807, 59.679283942385844 ],
    //     [ 77.39502404588043, 70.65388036857387, 91.60517102143689 ],
    //     [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
    // ]
    .catch((err) => {
        console.log(err)
    })
    let mode = 'k-medoids'
    let mat = [
        [40, 50, 60],
        [50, 70, 60],
        [80, 70, 90],
        [50, 60, 80]
    ]
    console.log('mat', mat)
    // => mat [ [ 40, 50, 60 ], [ 50, 70, 60 ], [ 80, 70, 90 ], [ 50, 60, 80 ] ]
    let resMat = await WCluster.cluster(mat, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resMat, null, 2))
    // => {
    //   "keys": null,
    //   "ginds": [
    //     [ 2 ],
    //     [ 0, 1, 3 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ 77.39502404588043, 70.65388036857387 ]
    //     ],
    //     [
    //       [ 36.76572825085965, 50.81184119955175 ],
    //       [ 50.520478881706346, 69.86935352609807 ],
    //       [ 55.318768821553576, 58.66492490577632 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       [ 80, 70, 90 ]
    //     ],
    //     [
    //       [ 40, 50, 60 ],
    //       [ 50, 70, 60 ],
    //       [ 50, 60, 80 ]
    //     ]
    //   ]
    // }
    let ltdt = [
        { name: 'Cameron', a: 40, b: 50, c: 60 },
        { name: 'Buckley', a: 50, b: 70, c: 60 },
        { name: 'Paul', a: 80, b: 70, c: 90 },
        { name: 'Fawcett', a: 50, b: 60, c: 80 },
    ]
    console.log('ltdt', ltdt)
    // => ltdt [
    //     { name: 'Cameron', a: 40, b: 50, c: 60 },
    //     { name: 'Buckley', a: 50, b: 70, c: 60 },
    //     { name: 'Paul', a: 80, b: 70, c: 90 },
    //     { name: 'Fawcett', a: 50, b: 60, c: 80 }
    // ]
    let resLtdt = await WCluster.cluster(ltdt, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resLtdt, null, 2))
    // => {
    //   "keys": [ "a", "b", "c" ],
    //   "ginds": [
    //     [ 2 ],
    //     [ 0, 1, 3 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ 77.39502404588043, 70.65388036857387 ]
    //     ],
    //     [
    //       [ 36.76572825085965, 50.81184119955175 ],
    //       [ 50.520478881706346, 69.86935352609807 ],
    //       [ 55.318768821553576, 58.66492490577632 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       { "name": "Paul", "a": 80, "b": 70, "c": 90 }
    //     ],
    //     [
    //       { "name": "Cameron", "a": 40, "b": 50, "c": 60 },
    //       { "name": "Buckley", "a": 50, "b": 70, "c": 60 },
    //       { "name": "Fawcett", "a": 50, "b": 60, "c": 80 }
    //     ]
    //   ]
    // }
    .catch((err) => {
        console.log(err)
    })</code></pre>
+    <pre class="prettyprint"><code>async function testPCA() {
    let mat = [
        [40, 50, 60],
        [50, 70, 60],
        [80, 70, 90],
        [50, 60, 80]
    ]
    console.log('mat', mat)
    // => mat [ [ 40, 50, 60 ], [ 50, 70, 60 ], [ 80, 70, 90 ], [ 50, 60, 80 ] ]
    let resMat = await WCluster.PCA(mat, { nCompNIPALS: 2 })
    console.log(resMat)
    // => [
    //   [ -1.704002697669786, 0.43087564048799354 ],
    //   [ -0.2509699164590232, -1.1519035967558147 ],
    //   [ 1.9913098008410954, 0.23244503334983269 ],
    //   [ -0.03633718671228592, 0.48858292291798827 ]
    // ]
    let mat2 = [
        [1040, 50, 60],
        [1050, 70, 60],
        [1080, 70, 90],
        [1050, 60, 80]
    ]
    console.log('mat2', mat2)
    // => mat [ [ 1040, 50, 60 ], [ 1050, 70, 60 ], [ 1080, 70, 90 ], [ 1050, 60, 80 ] ]
    let resMat2 = await WCluster.PCA(mat2, { nCompNIPALS: 2 })
    console.log(resMat2)
    // => [
    //   [ -1.704002697669786, 0.43087564048799354 ],
    //   [ -0.2509699164590232, -1.1519035967558147 ],
    //   [ 1.9913098008410954, 0.23244503334983269 ],
    //   [ -0.03633718671228592, 0.48858292291798827 ]
    // ]
    let mat3 = [
        [11040, 50, 60],
        [13050, 70, 60],
        [15080, 70, 90],
        [17050, 60, 80]
    ]
    console.log('mat3', mat3)
    // => mat [ [ 11040, 50, 60 ], [ 13050, 70, 60 ], [ 15080, 70, 90 ], [ 17050, 60, 80 ] ]
    let resMat3 = await WCluster.PCA(mat3, { nCompNIPALS: 2 })
    console.log(resMat3)
    // => [
    //   [ -1.8599655569892897, 0.4908764271508211 ],
    //   [ -0.3950941652793108, -1.0977355294143445 ],
    //   [ 1.3430199944041517, -0.17213692267477554 ],
    //   [ 0.912039727864449, 0.778996024938299 ]
    // ]
    .catch((err) => {
        console.log(err)
    })
    let mode = 'k-medoids'
    let mat = [
        [40, 50, 60],
        [50, 70, 60],
        [80, 70, 90],
        [50, 60, 80]
    ]
    console.log('mat', mat)
    // => mat [ [ 40, 50, 60 ], [ 50, 70, 60 ], [ 80, 70, 90 ], [ 50, 60, 80 ] ]
    let resMat = await WCluster.cluster(mat, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resMat, null, 2))
    // => {
    //   "keys": null,
    //   "ginds": [
    //     [ 0, 1, 3 ],
    //     [ 2 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ -1.704002697669786, 0.43087564048799354 ],
    //       [ -0.2509699164590232, -1.1519035967558147 ],
    //       [ -0.03633718671228592, 0.48858292291798827 ]
    //     ],
    //     [
    //       [ 1.9913098008410954, 0.23244503334983269 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       [ 40, 50, 60 ],
    //       [ 50, 70, 60 ],
    //       [ 50, 60, 80 ]
    //     ],
    //     [
    //       [ 80, 70, 90 ]
    //     ]
    //   ]
    // }
    let mat2 = [
        [1040, 50, 60],
        [1050, 70, 60],
        [1080, 70, 90],
        [1050, 60, 80]
    ]
    console.log('mat2', mat2)
    // => mat [ [ 1040, 50, 60 ], [ 1050, 70, 60 ], [ 1080, 70, 90 ], [ 1050, 60, 80 ] ]
    let resMat2 = await WCluster.cluster(mat2, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resMat2, null, 2))
    // => {
    //   "keys": null,
    //   "ginds": [
    //     [ 0, 1, 3 ],
    //     [ 2 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ -1.704002697669786, 0.43087564048799354 ],
    //       [ -0.2509699164590232, -1.1519035967558147 ],
    //       [ -0.03633718671228592, 0.48858292291798827 ]
    //     ],
    //     [
    //       [ 1.9913098008410954, 0.23244503334983269 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       [ 1040, 50, 60 ],
    //       [ 1050, 70, 60 ],
    //       [ 1050, 60, 80 ]
    //     ],
    //     [
    //       [ 1080, 70, 90 ]
    //     ]
    //   ]
    // }
    let mat3 = [
        [11040, 50, 60],
        [13050, 70, 60],
        [15080, 70, 90],
        [17050, 60, 80]
    ]
    console.log('mat3', mat3)
    // => mat [ [ 11040, 50, 60 ], [ 13050, 70, 60 ], [ 15080, 70, 90 ], [ 17050, 60, 80 ] ]
    let resMat3 = await WCluster.cluster(mat3, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resMat3, null, 2))
    // => {
    //   "keys": null,
    //   "ginds": [
    //     [ 1, 2, 3 ],
    //     [ 0 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ -0.3950941652793108, -1.0977355294143445 ],
    //       [ 1.3430199944041517, -0.17213692267477554 ],
    //       [ 0.912039727864449, 0.778996024938299 ]
    //     ],
    //     [
    //       [ -1.8599655569892897, 0.4908764271508211 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       [ 13050, 70, 60 ],
    //       [ 15080, 70, 90 ],
    //       [ 17050, 60, 80 ]
    //     ],
    //     [
    //       [ 11040, 50, 60 ]
    //     ]
    //   ]
    // }
    let ltdt = [
        { name: 'Cameron', a: 40, b: 50, c: 60 },
        { name: 'Buckley', a: 50, b: 70, c: 60 },
        { name: 'Paul', a: 80, b: 70, c: 90 },
        { name: 'Fawcett', a: 50, b: 60, c: 80 },
    ]
    console.log('ltdt', ltdt)
    // => ltdt [
    //     { name: 'Cameron', a: 40, b: 50, c: 60 },
    //     { name: 'Buckley', a: 50, b: 70, c: 60 },
    //     { name: 'Paul', a: 80, b: 70, c: 90 },
    //     { name: 'Fawcett', a: 50, b: 60, c: 80 }
    // ]
    let resLtdt = await WCluster.cluster(ltdt, { mode, kNumber: 2, nCompNIPALS: 2 })
    console.log(JSON.stringify(resLtdt, null, 2))
    // => {
    //   "keys": [ "a", "b", "c" ],
    //   "ginds": [
    //     [ 0, 1, 3 ],
    //     [ 2 ]
    //   ],
    //   "gmat": [
    //     [
    //       [ -1.704002697669786, 0.43087564048799354 ],
    //       [ -0.2509699164590232, -1.1519035967558147 ],
    //       [ -0.03633718671228592, 0.48858292291798827 ]
    //     ],
    //     [
    //       [ 1.9913098008410954, 0.23244503334983269 ]
    //     ]
    //   ],
    //   "gltdt": [
    //     [
    //       { "name": "Cameron", "a": 40, "b": 50, "c": 60 },
    //       { "name": "Buckley", "a": 50, "b": 70, "c": 60 },
    //       { "name": "Fawcett", "a": 50, "b": 60, "c": 80 }
    //     ],
    //     [
    //       { "name": "Paul", "a": 80, "b": 70, "c": 90 }
    //     ]
    //   ]
    // }
    .catch((err) => {
        console.log(err)
    })</code></pre>
 
 
 
@@ -902,7 +902,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Wed Aug 03 2022 18:39:23 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 3.6.10</a> on Thu Aug 04 2022 08:38:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -68,7 +68,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Wed Aug 03 2022 18:39:23 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 3.6.10</a> on Thu Aug 04 2022 08:38:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/examples/ex-PCA.html

@@ -30,7 +30,6 @@
         </div>
         
         <pre id="message"></pre>
-        <pre id="error"></pre>
 
         <script>
 
@@ -38,6 +37,8 @@
             console.log(WCluster)
             
             function cls(){
+
+                document.querySelector('#message').innerHTML = 'analysing...'
             
                 let nCompNIPALS = wsemi.cint(document.querySelector('#nCompNIPALS option:checked').value)
                 console.log('nCompNIPALS',nCompNIPALS)
@@ -53,12 +54,10 @@
                     .then(function(res){
                         console.log(res)
                         document.querySelector('#message').innerHTML = JSON.stringify(res, null, 2)
-                        document.querySelector('#error').innerHTML = ''
                     })
                     .catch(function(err){
                         console.log(err)
-                        document.querySelector('#message').innerHTML = 'done'
-                        document.querySelector('#error').innerHTML = JSON.stringify(err.toString(), null, 2)
+                        document.querySelector('#message').innerHTML = JSON.stringify(err.toString(), null, 2)
                     })
                 
             }

package/examples/{ex-cluster-webworker-k-medoids.html → ex-cluster-webworker.html}

@@ -3,7 +3,7 @@
 
     <head>
         <meta http-equiv="content-type" content="text/html charset=UTF-8" />
-        <title>w-cluster cluster for k-medoids with web worker</title>
+        <title>cluster with web worker</title>
 
         <!-- @babel/polyfill已廢棄 -->
         <script nomodule src="https://cdn.jsdelivr.net/npm/@babel/polyfill@7.12.1/dist/polyfill.min.js"></script>
@@ -25,6 +25,11 @@
         <div style="margin-bottom:5px; color:#f26; font-size:0.9rem;">WebWorkers(from blob) does not support IE11</div>
         
         <div style="display:flex;">
+            <div style="margin-right:5px;">method:</div>
+            <select id="method" style="width:100px; margin-right:15px;" onchange="cls()">
+                <option value="k-means" selected>k-means</option>
+                <option value="k-medoids">k-medoids</option>
+            </select>
             <div style="margin-right:5px;">kNumber:</div>
             <select id="kNumber" style="width:50px; margin-right:15px;" onchange="cls()">
                 <option value="2">2</option>
@@ -54,7 +59,10 @@
             console.log(WCluster)
             
             function cls(){
-            
+
+                let method = wsemi.cint(document.querySelector('#method option:checked').value)
+                console.log('method',method)
+
                 let kNumber = wsemi.cint(document.querySelector('#kNumber option:checked').value)
                 console.log('kNumber',kNumber)
 
@@ -66,7 +74,7 @@
                 wsemi.delay(100)
                     .then(function (){
         
-                        WCluster.cluster(dataIris, { kNumber: kNumber, nCompNIPALS: nCompNIPALS, mode: 'k-medoids' })
+                        WCluster.cluster(dataIris, { kNumber: kNumber, nCompNIPALS: nCompNIPALS, mode: method })
                             .then(function(res){
                                 console.log('res',res)
                 

package/examples/{ex-cluster-k-means.html → ex-cluster.html}

@@ -3,7 +3,7 @@
 
     <head>
         <meta http-equiv="content-type" content="text/html charset=UTF-8" />
-        <title>w-cluster cluster for k-means</title>
+        <title>cluster</title>
 
         <!-- @babel/polyfill已廢棄 -->
         <script nomodule src="https://cdn.jsdelivr.net/npm/@babel/polyfill@7.12.1/dist/polyfill.min.js"></script>
@@ -23,6 +23,11 @@
     <body>
 
         <div style="display:flex;">
+            <div style="margin-right:5px;">method:</div>
+            <select id="method" style="width:100px; margin-right:15px;" onchange="cls()">
+                <option value="k-means" selected>k-means</option>
+                <option value="k-medoids">k-medoids</option>
+            </select>
             <div style="margin-right:5px;">kNumber:</div>
             <select id="kNumber" style="width:50px; margin-right:15px;" onchange="cls()">
                 <option value="2">2</option>
@@ -53,6 +58,9 @@
             
             function cls(){
             
+                let method = wsemi.cint(document.querySelector('#method option:checked').value)
+                console.log('method',method)
+
                 let kNumber = wsemi.cint(document.querySelector('#kNumber option:checked').value)
                 console.log('kNumber',kNumber)
 
@@ -64,7 +72,7 @@
                 wsemi.delay(100)
                     .then(function (){
         
-                        WCluster.cluster(dataIris, { kNumber: kNumber, nCompNIPALS: nCompNIPALS, mode: 'k-means' })
+                        WCluster.cluster(dataIris, { kNumber: kNumber, nCompNIPALS: nCompNIPALS, mode: method })
                             .then(function(res){
                                 console.log('res',res)
                 

package/g-PCA-nodeworker.mjs

@@ -16,10 +16,46 @@ async function testPCA() {
     let resMat = await WCluster.PCA(mat, { nCompNIPALS: 2 })
     console.log(resMat)
     // => [
-    //     [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //     [ 50.520478881706346, 69.86935352609807, 59.679283942385844 ],
-    //     [ 77.39502404588043, 70.65388036857387, 91.60517102143689 ],
-    //     [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
+    //   [ -1.704002697669786, 0.43087564048799354 ],
+    //   [ -0.2509699164590232, -1.1519035967558147 ],
+    //   [ 1.9913098008410954, 0.23244503334983269 ],
+    //   [ -0.03633718671228592, 0.48858292291798827 ]
+    // ]
+
+    let mat2 = [
+        [1040, 50, 60],
+        [1050, 70, 60],
+        [1080, 70, 90],
+        [1050, 60, 80]
+    ]
+    console.log('mat2', mat2)
+    // => mat [ [ 1040, 50, 60 ], [ 1050, 70, 60 ], [ 1080, 70, 90 ], [ 1050, 60, 80 ] ]
+
+    let resMat2 = await WCluster.PCA(mat2, { nCompNIPALS: 2 })
+    console.log(resMat2)
+    // => [
+    //   [ -1.704002697669786, 0.43087564048799354 ],
+    //   [ -0.2509699164590232, -1.1519035967558147 ],
+    //   [ 1.9913098008410954, 0.23244503334983269 ],
+    //   [ -0.03633718671228592, 0.48858292291798827 ]
+    // ]
+
+    let mat3 = [
+        [11040, 50, 60],
+        [13050, 70, 60],
+        [15080, 70, 90],
+        [17050, 60, 80]
+    ]
+    console.log('mat3', mat3)
+    // => mat [ [ 11040, 50, 60 ], [ 13050, 70, 60 ], [ 15080, 70, 90 ], [ 17050, 60, 80 ] ]
+
+    let resMat3 = await WCluster.PCA(mat3, { nCompNIPALS: 2 })
+    console.log(resMat3)
+    // => [
+    //   [ -1.8599655569892897, 0.4908764271508211 ],
+    //   [ -0.3950941652793108, -1.0977355294143445 ],
+    //   [ 1.3430199944041517, -0.17213692267477554 ],
+    //   [ 0.912039727864449, 0.778996024938299 ]
     // ]
 
 }
@@ -29,4 +65,3 @@ testPCA()
     })
 
 //node --experimental-modules --es-module-specifier-resolution=node g-PCA-nodeworker.mjs
-

package/g-PCA.mjs

@@ -15,10 +15,46 @@ async function testPCA() {
     let resMat = await WCluster.PCA(mat, { nCompNIPALS: 2 })
     console.log(resMat)
     // => [
-    //     [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //     [ 50.520478881706346, 69.86935352609807, 59.679283942385844 ],
-    //     [ 77.39502404588043, 70.65388036857387, 91.60517102143689 ],
-    //     [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
+    //   [ -1.704002697669786, 0.43087564048799354 ],
+    //   [ -0.2509699164590232, -1.1519035967558147 ],
+    //   [ 1.9913098008410954, 0.23244503334983269 ],
+    //   [ -0.03633718671228592, 0.48858292291798827 ]
+    // ]
+
+    let mat2 = [
+        [1040, 50, 60],
+        [1050, 70, 60],
+        [1080, 70, 90],
+        [1050, 60, 80]
+    ]
+    console.log('mat2', mat2)
+    // => mat [ [ 1040, 50, 60 ], [ 1050, 70, 60 ], [ 1080, 70, 90 ], [ 1050, 60, 80 ] ]
+
+    let resMat2 = await WCluster.PCA(mat2, { nCompNIPALS: 2 })
+    console.log(resMat2)
+    // => [
+    //   [ -1.704002697669786, 0.43087564048799354 ],
+    //   [ -0.2509699164590232, -1.1519035967558147 ],
+    //   [ 1.9913098008410954, 0.23244503334983269 ],
+    //   [ -0.03633718671228592, 0.48858292291798827 ]
+    // ]
+
+    let mat3 = [
+        [11040, 50, 60],
+        [13050, 70, 60],
+        [15080, 70, 90],
+        [17050, 60, 80]
+    ]
+    console.log('mat3', mat3)
+    // => mat [ [ 11040, 50, 60 ], [ 13050, 70, 60 ], [ 15080, 70, 90 ], [ 17050, 60, 80 ] ]
+
+    let resMat3 = await WCluster.PCA(mat3, { nCompNIPALS: 2 })
+    console.log(resMat3)
+    // => [
+    //   [ -1.8599655569892897, 0.4908764271508211 ],
+    //   [ -0.3950941652793108, -1.0977355294143445 ],
+    //   [ 1.3430199944041517, -0.17213692267477554 ],
+    //   [ 0.912039727864449, 0.778996024938299 ]
     // ]
 
 }
@@ -28,4 +64,3 @@ testPCA()
     })
 
 //node --experimental-modules --es-module-specifier-resolution=node g-PCA.mjs
-