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

Commit 9e17bce

Browse files
joeykleejoeyklee
committed
fixes merge conflicts
2 parents 41e594c + 46e9093 commit 9e17bce

File tree

118 files changed

+179
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+179
-181
lines changed

‎d3/KMeans/KMeans_GaussianClusterDemo/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<head>
33
<title>ml5.js kmeans example</title>
44
<script src="https://d3js.org/d3.v4.min.js"></script>
5-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
5+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
66
</head>
77
<body>
88
<center>

‎examples.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎javascript/BodyPix/BodyPix_Image/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>BodyPix with Webcam</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88
<style></style>
99
</head>

‎javascript/BodyPix/BodyPix_Webcam/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>BodyPix with Webcam</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88
<style></style>
99
</head>

‎javascript/BodyPix/BodyPix_Webcam_Parts/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>BodyPix with Webcam</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88
<style></style>
99
</head>

‎javascript/CVAE/CVAE_QuickDraw/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1" >
66

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

‎javascript/CharRNN/CharRNN_Interactive/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>Interactive CharRNN Text Generation Example</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88
<style></style>
99
</head>
@@ -12,9 +12,9 @@ <h1>Interactive CharRNN Text Generation Example</h1>
1212
<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>
1313
<textarea id="textInput" style="width: 300px; height: 50px;" placeholder="type here"></textarea>
1414
<br /> length:
15-
<input id="lenSlider" type="range" min="1" max="100" value="20" /> <span id="length">20</span>
15+
<input id="lenSlider" type="range" min="1" max="100" value="20" /> <span id="length">20</span>
1616
<br /> temperature:
17-
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
17+
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
1818
<p id="status">Loading Model</p>
1919
<p id="result">
2020
<span id="original"></span><span id="prediction"></span>

‎javascript/CharRNN/CharRNN_Text/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>LSTM Text Generation Example</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88
</head>
99

1010
<body>
1111
<h1>LSTM Text Generation Example</h1>
1212
<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>
1313
<p>seed text:
14-
<input id="textInput" value="The meaning of life is" />
14+
<input id="textInput" value="The meaning of life is" />
1515
</p>
1616
<p>length:
17-
<input id="lenSlider" type="range" min="10" max="500" value="100" /> <span id="length">100</span></p>
17+
<input id="lenSlider" type="range" min="10" max="500" value="100" /> <span id="length">100</span></p>
1818
<p>temperature:
19-
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span></p>
19+
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span></p>
2020
<p id="status">Loading Model</p>
2121
<button id="generate">generate</button>
2222
<p id="result"></p>

‎javascript/CharRNN/CharRNN_Text_Stateful/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>Stateful CharRNN Text Generation Example</title>
6-
<script src="https://unpkg.com/[email protected].2/dist/ml5.min.js" type="text/javascript"></script>
6+
<script src="https://unpkg.com/[email protected].3/dist/ml5.min.js" type="text/javascript"></script>
77

88

99
<style></style>
@@ -15,10 +15,10 @@ <h1>Stateful CharRNN Text Generation Example</h1>
1515
<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>
1616
<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>
1717
<p>seed text:
18-
<input id="textInput" value="The sky was blue and " />
18+
<input id="textInput" value="The sky was blue and " />
1919
</p>
2020
<p>temperature:
21-
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
21+
<input id="tempSlider" type="range" min="0" max="1" step="0.01" /><span id="temperature">0.5</span>
2222
</p>
2323
<p><button id="reset">Reset</button><button id="start">Start</button><button id="single">Single</button></p>
2424
<p id="status">Loading Model</p>

‎javascript/DCGAN/DCGAN_Random/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66

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

0 commit comments

Comments
 (0)