w-cluster 1.0.8 → 1.0.11

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#line174">line 174</a>
+        <a href="WCluster.mjs.html">WCluster.mjs</a>, <a href="WCluster.mjs.html#line166">line 166</a>
     </li></ul></dd>
     
 
@@ -181,7 +181,7 @@
 
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code>async function testCluster() {
    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 ]
    //   ],
    //   "gltdt": [
    //     [
    //       [ 80, 70, 90 ]
    //     ],
    //     [
    //       [ 40, 50, 60 ],
    //       [ 50, 70, 60 ],
    //       [ 50, 60, 80 ],
    //     ]
    //   ],
    //   "dmat": [
    //     [
    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
    //     ],
    //     [
    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
    //     ]
    //   ]
    // }
    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 ]
    //   ],
    //   "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
    //       }
    //     ]
    //   ],
    //   "dmat": [
    //     [
    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
    //     ],
    //     [
    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
    //     ]
    //   ]
    // }
    .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)
    // => [
    //     [ 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>
 
 
 
@@ -208,7 +208,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#line57">line 57</a>
+        <a href="WCluster.mjs.html">WCluster.mjs</a>, <a href="WCluster.mjs.html#line31">line 31</a>
     </li></ul></dd>
     
 
@@ -259,6 +259,11 @@
 
 
 
+    <h5>Example</h5>
+    
+    <pre class="prettyprint"><code></code></pre>
+
+
 
 
     <h5>Parameters:</h5>
@@ -568,7 +573,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#line42">line 42</a>
+        <a href="WCluster.mjs.html">WCluster.mjs</a>, <a href="WCluster.mjs.html#line15">line 15</a>
     </li></ul></dd>
     
 
@@ -621,7 +626,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)
    })</code></pre>
+    <pre class="prettyprint"><code></code></pre>
 
 
 
@@ -897,7 +902,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 07 2022 15:34:57 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 Wed Aug 03 2022 18:54:31 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 Thu Apr 07 2022 15:34:57 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 Wed Aug 03 2022 18:54:31 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

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-cluster-nodeworker.mjs

@@ -22,24 +22,24 @@ async function testCluster() {
     //     [ 2 ],
     //     [ 0, 1, 3 ]
     //   ],
-    //   "gltdt": [
+    //   "gmat": [
     //     [
-    //       [ 80, 70, 90 ]
+    //       [ 77.39502404588043, 70.65388036857387 ]
     //     ],
     //     [
-    //       [ 40, 50, 60 ],
-    //       [ 50, 70, 60 ],
-    //       [ 50, 60, 80 ],
+    //       [ 36.76572825085965, 50.81184119955175 ],
+    //       [ 50.520478881706346, 69.86935352609807 ],
+    //       [ 55.318768821553576, 58.66492490577632 ]
     //     ]
     //   ],
-    //   "dmat": [
+    //   "gltdt": [
     //     [
-    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
+    //       [ 80, 70, 90 ]
     //     ],
     //     [
-    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
-    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
+    //       [ 40, 50, 60 ],
+    //       [ 50, 70, 60 ],
+    //       [ 50, 60, 80 ],
     //     ]
     //   ]
     // }
@@ -66,6 +66,16 @@ async function testCluster() {
     //     [ 2 ],
     //     [ 0, 1, 3 ]
     //   ],
+    //   "gmat": [
+    //     [
+    //       [ 77.39502404588043, 70.65388036857387 ]
+    //     ],
+    //     [
+    //       [ 36.76572825085965, 50.81184119955175 ],
+    //       [ 50.520478881706346, 69.86935352609807 ],
+    //       [ 55.318768821553576, 58.66492490577632 ]
+    //     ]
+    //   ],
     //   "gltdt": [
     //     [
     //       {
@@ -83,16 +93,6 @@ async function testCluster() {
     //         "name": "Fawcett", "a": 50, "b": 60, "c": 80
     //       }
     //     ]
-    //   ],
-    //   "dmat": [
-    //     [
-    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
-    //     ],
-    //     [
-    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
-    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
-    //     ]
     //   ]
     // }
 

package/g-cluster.mjs

@@ -21,24 +21,24 @@ async function testCluster() {
     //     [ 2 ],
     //     [ 0, 1, 3 ]
     //   ],
-    //   "gltdt": [
+    //   "gmat": [
     //     [
-    //       [ 80, 70, 90 ]
+    //       [ 77.39502404588043, 70.65388036857387 ]
     //     ],
     //     [
-    //       [ 40, 50, 60 ],
-    //       [ 50, 70, 60 ],
-    //       [ 50, 60, 80 ],
+    //       [ 36.76572825085965, 50.81184119955175 ],
+    //       [ 50.520478881706346, 69.86935352609807 ],
+    //       [ 55.318768821553576, 58.66492490577632 ]
     //     ]
     //   ],
-    //   "dmat": [
+    //   "gltdt": [
     //     [
-    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
+    //       [ 80, 70, 90 ]
     //     ],
     //     [
-    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
-    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
+    //       [ 40, 50, 60 ],
+    //       [ 50, 70, 60 ],
+    //       [ 50, 60, 80 ]
     //     ]
     //   ]
     // }
@@ -65,32 +65,24 @@ async function testCluster() {
     //     [ 2 ],
     //     [ 0, 1, 3 ]
     //   ],
-    //   "gltdt": [
+    //   "gmat": [
     //     [
-    //       {
-    //         "name": "Paul", "a": 80, "b": 70, "c": 90
-    //       }
+    //       [ 77.39502404588043, 70.65388036857387 ]
     //     ],
     //     [
-    //       {
-    //         "name": "Cameron", "a": 40, "b": 50, "c": 60
-    //       },
-    //       {
-    //         "name": "Buckley", "a": 50, "b": 70, "c": 60
-    //       },
-    //       {
-    //         "name": "Fawcett", "a": 50, "b": 60, "c": 80
-    //       }
+    //       [ 36.76572825085965, 50.81184119955175 ],
+    //       [ 50.520478881706346, 69.86935352609807 ],
+    //       [ 55.318768821553576, 58.66492490577632 ]
     //     ]
     //   ],
-    //   "dmat": [
+    //   "gltdt": [
     //     [
-    //       [77.39502404588043, 70.65388036857387, 91.60517102143689]
+    //       { "name": "Paul", "a": 80, "b": 70, "c": 90 }
     //     ],
     //     [
-    //       [ 36.76572825085965, 50.81184119955175, 61.992939427698765 ],
-    //       [ 50.520478881706346, 69.86935352609807, 59.679283942385844],
-    //       [ 55.318768821553576, 58.66492490577632, 76.7226056084785 ]
+    //       { "name": "Cameron", "a": 40, "b": 50, "c": 60 },
+    //       { "name": "Buckley", "a": 50, "b": 70, "c": 60 },
+    //       { "name": "Fawcett", "a": 50, "b": 60, "c": 80 }
     //     ]
     //   ]
     // }

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "w-cluster",
-  "version": "1.0.8",
-  "description": "A tool for data PCA(Principle Component Analysis) and cluster(K-Means & K-Medoids).",
+  "version": "1.0.11",
   "main": "dist/w-cluster.umd.js",
   "dependencies": {
     "lodash": "^4.17.21",
     "k-medoids": "^1.0.6",
     "ml-kmeans": "^5.0.0",
     "ml-pca": "^4.0.2",
-    "wsemi": "^1.6.54"
+    "wsemi": "^1.6.69"
   },
   "devDependencies": {
     "w-package-tools": "^1.0.65"
@@ -33,9 +32,5 @@
     "browser"
   ],
   "author": "yuda-lyu(semisphere)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/yuda-lyu/w-cluster/issues"
-  },
-  "homepage": "https://github.com/yuda-lyu/w-cluster#readme"
+  "license": "MIT"
 }