Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

Commit

Permalink
fixes merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@joeyklee
joeyklee committed Nov 14, 2019
2 parents 41e594c + 46e9093 commit 9e17bce
Show file tree
Hide file tree
Showing 118 changed files with 179 additions and 181 deletions.
2 changes: 1 addition & 1 deletion d3/KMeans/KMeans_GaussianClusterDemo/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<title>ml5.js kmeans example</title>
<script src="https://d3js.org/d3.v4.min.js"></script>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>
<body>
<center>
Expand Down
2 changes: 1 addition & 1 deletion examples.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion javascript/BodyPix/BodyPix_Image/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>BodyPix with Webcam</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/BodyPix/BodyPix_Webcam/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>BodyPix with Webcam</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/BodyPix/BodyPix_Webcam_Parts/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>BodyPix with Webcam</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/CVAE/CVAE_QuickDraw/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" >

<title>CVAE with quick_draw</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
<script src="sketch.js"></script>
</head>

Expand Down
6 changes: 3 additions & 3 deletions javascript/CharRNN/CharRNN_Interactive/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Interactive CharRNN Text Generation Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand All @@ -12,9 +12,9 @@ <h1>Interactive CharRNN Text Generation Example</h1>
<h2>This example uses a pre-trained model on a corpus of <a href="https://en.wikipedia.org/wiki/Virginia_Woolf">Virginia Woolf</a></h2>
<textarea id="textInput" style="width: 300px; height: 50px;" placeholder="type here"></textarea>
<br /> length:
<input id="lenSlider" type="range" min="1" max="100" value="20" /> <span id="length">20</span>
<input id="lenSlider" type="range" min="1" max="100" value="20" /> <span id="length">20</span>
<br /> temperature:
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
<p id="status">Loading Model</p>
<p id="result">
<span id="original"></span><span id="prediction"></span>
Expand Down
8 changes: 4 additions & 4 deletions javascript/CharRNN/CharRNN_Text/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<head>
<meta charset="UTF-8">
<title>LSTM Text Generation Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

<body>
<h1>LSTM Text Generation Example</h1>
<h2>This example uses a pre-trained model on a corpus of <a href="https://en.wikipedia.org/wiki/Virginia_Woolf">Virginia Woolf</a></h2>
<p>seed text:
<input id="textInput" value="The meaning of life is" />
<input id="textInput" value="The meaning of life is" />
</p>
<p>length:
<input id="lenSlider" type="range" min="10" max="500" value="100" /> <span id="length">100</span></p>
<input id="lenSlider" type="range" min="10" max="500" value="100" /> <span id="length">100</span></p>
<p>temperature:
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span></p>
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span></p>
<p id="status">Loading Model</p>
<button id="generate">generate</button>
<p id="result"></p>
Expand Down
6 changes: 3 additions & 3 deletions javascript/CharRNN/CharRNN_Text_Stateful/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Stateful CharRNN Text Generation Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>


<style></style>
Expand All @@ -15,10 +15,10 @@ <h1>Stateful CharRNN Text Generation Example</h1>
<p>Instead of feeding every single character every frame to predict the next character, we feed only the last character, and instruct the CharRNN to remember its internal state.</p>
<p>This example uses a pre-trained model on a corpus of <a href="https://en.wikipedia.org/wiki/Virginia_Woolf">Virginia Woolf</a></p>
<p>seed text:
<input id="textInput" value="The sky was blue and " />
<input id="textInput" value="The sky was blue and " />
</p>
<p>temperature:
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
</p>
<p><button id="reset">Reset</button><button id="start">Start</button><button id="single">Single</button></p>
<p id="status">Loading Model</p>
Expand Down
2 changes: 1 addition & 1 deletion javascript/DCGAN/DCGAN_Random/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>DCGAN Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
<script src="sketch.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/FaceApi/FaceApi_Image_Landmarks/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>FaceApi Landmarks Demo</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/FaceApi/FaceApi_Video_Landmarks/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>FaceApi Landmarks Demo</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/FaceApi/FaceApi_Video_Landmarks_LocalModels/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>FaceApi Landmarks Demo With Local Models</title>

<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/FeatureExtractor/FeatureExtractor_Image_Classification/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Image Classification using Feature Extraction with MobileNet</title>


<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
4 changes: 2 additions & 2 deletions javascript/FeatureExtractor/FeatureExtractor_Image_Regression/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Image Regression using Feature Extraction with MobileNet.</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>


<style></style>
Expand All @@ -17,7 +17,7 @@ <h2>(Train a Neural Network to move the red square)</h2>
</div>
<h6><span id="modelStatus">Loading base model...</span> | <span id="videoStatus">Loading video...</span></h6>
<p>
<input type="range" name="slider" id="slider" min="0.01" max="1.0" step="0.01" value="0.5" />
<input type="range" name="slider" id="slider" min="0.01" max="1.0" step="0.01" value="0.5" />
</p>
<br />
<p>
Expand Down
4 changes: 2 additions & 2 deletions javascript/ImageClassification/ImageClassification/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<head>
<meta charset="UTF-8">
<title>Image Classification Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>

<body>
<h1>Image classification using MobileNet</h1>
<p>The MobileNet model labeled this as <span id="result">...</span> with a confidence of <span id="probability">...</span>.</p>
<img src="images/bird.jpg" id="image" width="400" />
<img src="images/bird.jpg" id="image" width="400" />
<script src="sketch.js"></script>
</body>

Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_DoodleNet_Canvas/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Canvas Image Classification using DoodleNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
<style></style>
</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_DoodleNet_Video/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Webcam Image Classification using DoodleNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_MultipleImages/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Multiple Image classification using MobileNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_Video/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Webcam Image Classification using MobileNet</title>


<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_VideoScavengerHunt/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Webcam Image Classification with Speech Output using MobileNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_VideoSound/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Webcam Image Classification with Speech Output using MobileNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/ImageClassification/ImageClassification_Video_Load/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Webcam Image Classification using a pre-trianed customized model</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion javascript/KNNClassification/KNNClassification_PoseNet/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>PoseNet with KNN Classification on Webcam Images</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/KNNClassification/KNNClassification_Video/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>KNN Classification on Webcam Images with mobileNet.</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/KNNClassification/KNNClassification_VideoSound/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>KNN Classification on Webcam Images with Speech Output Using mobileNet.</title>


<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/KNNClassification/KNNClassification_VideoSquare/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>KNN Classification on Webcam Images with mobileNet</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion javascript/PitchDetection/PitchDetection/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">

<title>Pitch Detection</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/PitchDetection/PitchDetection_Game/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Pitch Tone Game</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/PitchDetection/PitchDetection_Piano/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">

<title>Pitch Detect Piano</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
6 changes: 3 additions & 3 deletions javascript/Pix2Pix/Pix2Pix_callback/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Pix2Pix Edges2Pikachu Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand All @@ -16,8 +16,8 @@ <h1>Pix2Pix Edges2Pichaku Example</h1>
<p>4. You could click the "Clear" button to clear the canvas and draw again.</p>
<p id="status">Loading Model... Please wait...</p>

<img id="inputImage" width="256px" src="images/input.png" alt="input image" />
<img id="outputImage" width="256px" src="" alt="output image" />
<img id="inputImage" width="256px" src="images/input.png" alt="input image" />
<img id="outputImage" width="256px" src="" alt="output image" />

<div class="flex">
<div>
Expand Down
6 changes: 3 additions & 3 deletions javascript/Pix2Pix/Pix2Pix_promise/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Pix2Pix Edges2Pikachu Example</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

<style></style>
</head>
Expand All @@ -16,8 +16,8 @@ <h1>Pix2Pix Edges2Pichaku Example</h1>
<p>4. You could click the "Clear" button to clear the canvas and draw again.</p>
<p id="status">Loading Model... Please wait...</p>

<img id="inputImage" width="256px" src="images/input.png" alt="input image" />
<img id="outputImage" width="256px" src="" alt="output image" />
<img id="inputImage" width="256px" src="images/input.png" alt="input image" />
<img id="outputImage" width="256px" src="" alt="output image" />

<div class="flex">
<div>
Expand Down
4 changes: 2 additions & 2 deletions javascript/PoseNet/PoseNet_image_single/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<head>
<meta charset="UTF-8">
<title>PoseNet example on image with single detection</title>
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

<body>
<h1>PoseNet example on image with single detection</h1>
<p id='status'>Loading model...</p>
<img id="image" style="display:none" src="data/runner.jpg" alt="runner image" />
<img id="image" style="display:none" src="data/runner.jpg" alt="runner image" />
<canvas id="canvas"></canvas>
<p>image via: <a href="https://www.pexels.com/photo/topless-man-wearing-grey-and-black-shorts-sprinting-on-concrete-road-1401796/" target="_blank">Pexels</a></p>
<script src="sketch.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion javascript/PoseNet/PoseNet_part_selection/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>PoseNet Part Selection</title>

<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion javascript/PoseNet/PoseNet_webcam/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>PoseNet Example</title>

<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>

</head>

Expand Down
Loading

0 comments on commit 9e17bce

Please sign in to comment.