Merge branch 'main' into joeyklee.637-refactor-tests-to-jest

Author: joeyklee

.all-contributorsrc

@@ -1249,6 +1249,44 @@
         "bug",
         "code"
       ]
+    },
+    {
+      "login": "eltociear",
+      "name": "Ikko Ashimine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22633385?v=4",
+      "profile": "https://bandism.net/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Mudasar-Makandar",
+      "name": "Mudasar-Makandar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46401916?v=4",
+      "profile": "https://github.com/Mudasar-Makandar",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "amirfeqhi",
+      "name": "Amir Feqhi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26363996?v=4",
+      "profile": "https://github.com/amirfeqhi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "danidask",
+      "name": "DasK",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9405129?v=4",
+      "profile": "https://github.com/danidask",
+      "contributions": [
+        "code",
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -57,17 +57,20 @@ Before getting started with ml5.js, review our [Code of Conduct](https://github.
 
 
 
+
+
+
 
 
 
 
 <p id="latest-version">
 
-* You can use the latest version (0.9.8) by adding it to the head section of your HTML document:
+* You can use the latest version (0.10.1) by adding it to the head section of your HTML document:
 
-**v0.9.8**
+**v0.10.1**
 
-    <script src="https://unpkg.com/ml5@0.9.8/dist/ml5.min.js" type="text/javascript"></script>
+    <script src="https://unpkg.com/ml5@0.10.1/dist/ml5.min.js" type="text/javascript"></script>
 
 </p data-id="latest-version">
 
@@ -98,6 +101,9 @@ Before getting started with ml5.js, review our [Code of Conduct](https://github.
 
 
 
+    
+    
+    
 
 
 
@@ -321,6 +327,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://p5js.org"><img src="https://avatars.githubusercontent.com/u/191056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lauren Lee McCarthy</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=lmccart" title="Code">💻</a> <a href="https://github.com/ml5js/ml5-library/commits?author=lmccart" title="Documentation">📖</a></td>
     <td align="center"><a href="https://www.suse.com/"><img src="https://avatars.githubusercontent.com/u/940170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sorin Curescu</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=en3sis" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/mofanke"><img src="https://avatars.githubusercontent.com/u/54242816?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mofanke</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/issues?q=author%3Amofanke" title="Bug reports">🐛</a> <a href="https://github.com/ml5js/ml5-library/commits?author=mofanke" title="Code">💻</a></td>
+    <td align="center"><a href="https://bandism.net/"><img src="https://avatars.githubusercontent.com/u/22633385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ikko Ashimine</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=eltociear" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Mudasar-Makandar"><img src="https://avatars.githubusercontent.com/u/46401916?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mudasar-Makandar</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/issues?q=author%3AMudasar-Makandar" title="Bug reports">🐛</a> <a href="https://github.com/ml5js/ml5-library/commits?author=Mudasar-Makandar" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/amirfeqhi"><img src="https://avatars.githubusercontent.com/u/26363996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Amir Feqhi</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=amirfeqhi" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/danidask"><img src="https://avatars.githubusercontent.com/u/9405129?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DasK</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=danidask" title="Code">💻</a> <a href="#ideas-danidask" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
 </table>
 

docs/reference/charrnn.md

@@ -159,9 +159,11 @@ charrnn.reset();
 
 **p5 web editor**
 
-* [CharRNN_Interactive](https://editor.p5js.org/ml5/sketches/CharRNN_Interactive)
+Please be advised, that due to an incompatibility of the p5 web-editor and the weights that are used in this example, this example does not work in the p5 we-editor. 
+Please use the p5.js example locally. Learn more about how to run examples locally [here.](https://github.com/ml5js/ml5-library/blob/main/examples/README.md#setup)
+<!-- * [CharRNN_Interactive](https://editor.p5js.org/ml5/sketches/CharRNN_Interactive)
 * [CharRNN_Text](https://editor.p5js.org/ml5/sketches/CharRNN_Text)
-* [CharRNN_Text_Stateful](https://editor.p5js.org/ml5/sketches/CharRNN_Text_Stateful)
+* [CharRNN_Text_Stateful](https://editor.p5js.org/ml5/sketches/CharRNN_Text_Stateful) -->
 
 **plain javascript**
 * [CharRNN_Interactive](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/CharRNN/CharRNN_Interactive)

examples/CONTRIBUTING.md

@@ -24,7 +24,7 @@ Please refer to [#1](https://github.com/ml5js/ml5-examples/issues/1) (thanks [@d
 
 ## Organizing Examples of different features
 
-If you're interested to make example, you can organize them as heirarchy like so:
+If you're interested to make example, you can organize them as hierarchy like so:
 
 ```
 /FeatureName

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ml5",
-  "version": "0.9.8",
+  "version": "0.10.1",
   "description": "A friendly machine learning library for the web.",
   "main": "dist/ml5.min.js",
   "directories": {

src/ImageClassifier/index.js

@@ -65,7 +65,10 @@ class ImageClassifier {
             this.modelToUse = null;
         }
       } else {
+        // its a url, we expect to find model.json
         this.modelUrl = modelNameOrUrl;
+        // The teachablemachine urls end with a slash, so add model.json to complete the full path
+        if (this.modelUrl.endsWith('/')) this.modelUrl += "model.json";
       }
     }
     // Load the model

src/NeuralNetwork/NeuralNetworkData.js

@@ -955,6 +955,16 @@ class NeuralNetworkData {
 
     return parentCopy;
   }
+  
+  /**
+   * getData
+   * return data object's raw array
+   * to make getting raw data easier
+   */
+  getData() {
+    const rawArray = this.data.raw;
+    return rawArray;
+  }
 }
 
 export default NeuralNetworkData;