fix merge conflixt

joeyklee · joeyklee · commit 41e594c3453a · 2019-11-14T15:31:09.000-05:00
diff --git a/javascript/CharRNN/CharRNN_Interactive/index.html b/javascript/CharRNN/CharRNN_Interactive/index.html
@@ -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>
diff --git a/javascript/CharRNN/CharRNN_Text/index.html b/javascript/CharRNN/CharRNN_Text/index.html
@@ -11,12 +11,12 @@
   <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>
diff --git a/javascript/CharRNN/CharRNN_Text_Stateful/index.html b/javascript/CharRNN/CharRNN_Text_Stateful/index.html
@@ -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>
diff --git a/javascript/FeatureExtractor/FeatureExtractor_Image_Regression/index.html b/javascript/FeatureExtractor/FeatureExtractor_Image_Regression/index.html
@@ -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>
diff --git a/javascript/ImageClassification/ImageClassification/index.html b/javascript/ImageClassification/ImageClassification/index.html
@@ -9,7 +9,7 @@
 <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>
 
diff --git a/javascript/Pix2Pix/Pix2Pix_callback/index.html b/javascript/Pix2Pix/Pix2Pix_callback/index.html
@@ -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>
diff --git a/javascript/Pix2Pix/Pix2Pix_promise/index.html b/javascript/Pix2Pix/Pix2Pix_promise/index.html
@@ -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>
diff --git a/javascript/PoseNet/PoseNet_image_single/index.html b/javascript/PoseNet/PoseNet_image_single/index.html
@@ -10,7 +10,7 @@
 <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>
diff --git a/javascript/Sentiment/Sentiment_Interactive/index.html b/javascript/Sentiment/Sentiment_Interactive/index.html
@@ -12,7 +12,7 @@ <h1>Sentiment Analysis Demo</h1>
       maximum of 200 words and only the 20,000 most common words in the reviews are used.
     </p>
     <p id="statusText"></p>
-    <input id="inputText" type="text" value="Today is the happiest day and is full of rainbows!"    />
+    <input id="inputText" type="text" value="Today is the happiest day and is full of rainbows!"       />
     <button id="submitBtn">Submit</button>
     <p>sentiment score:<span id="score"></span></p>
     <script src="sketch.js"></script>
diff --git a/javascript/Sentiment/index.html b/javascript/Sentiment/index.html
@@ -27,7 +27,7 @@ <h3>
   <div>
     <div class="row">
       <p>
-        <input type="text" style="width: 100%" placeholder="input sentence to analize" id="inputText"     />
+        <input type="text" style="width: 100%" placeholder="input sentence to analize" id="inputText"        />
       </p>
       <p>
         <button id="submit" class="btn btn-primary">predict sentiment</button>
diff --git a/javascript/StyleTransfer/StyleTransfer_Image/index.html b/javascript/StyleTransfer/StyleTransfer_Image/index.html
@@ -13,16 +13,16 @@
   <h1>Style Transfer Image Example</h1>
   <p id="statusMsg">Loading Models...</p>
   <p>Input Image:</p>
-  <img src="img/patagonia.jpg" alt="input img" id="inputImg"               />
+  <img src="img/patagonia.jpg" alt="input img" id="inputImg"                  />
 
   <div id="styleA">
     <p>Style A: <a href="https://en.wikipedia.org/wiki/The_Great_Wave_off_Kanagawa">The Great Wave off Kanagawa, 1829 - Katsushika Hokusai</a></p>
-    <img src="img/wave.jpg" alt="style one"               />
+    <img src="img/wave.jpg" alt="style one"                  />
   </div>
 
   <div id="styleB">
     <p>Style B: <a href="https://en.wikipedia.org/wiki/The_Great_Wave_off_Kanagawa">Udnie (Young American Girl, The Dance), 1913 - Francis Picabia</a></p>
-    <img src="img/udnie.jpg" alt="style two"               />
+    <img src="img/udnie.jpg" alt="style two"                  />
   </div>
 
   <script src="sketch.js"></script>
diff --git a/javascript/StyleTransfer/StyleTransfer_Video/index.html b/javascript/StyleTransfer/StyleTransfer_Video/index.html
@@ -11,8 +11,8 @@
   <h1>Style Transfer Mirror Example</h1>
   <p>Sytle: Udnie (Young American Girl, The Dance), 1913 - Francis Picabia</p>
   <p id='status'>Loading model...</p>
-  <img src="images/udnie.jpg"                         />
-  <img id="myImage"    />
+  <img src="images/udnie.jpg"                            />
+  <img id="myImage"       />
   <br />
   <button id="startStop">Start</button>
   <script src="sketch.js"></script>
diff --git a/javascript/UNET/UNET_webcam/index.html b/javascript/UNET/UNET_webcam/index.html
@@ -9,7 +9,7 @@
     <h1>UNET example </h1>
     <canvas id="myCanvas" width="320" height="240"></canvas>
     <video id="video" style="display:none" width="320" height="240" autoplay></video>
-    <img src="" style="display:none" width="320" height="240" alt="segmentation image" id="segmentationImage"    />
+    <img src="" style="display:none" width="320" height="240" alt="segmentation image" id="segmentationImage"       />
     <script src="sketch.js"></script>
   </body>
 </html>
diff --git a/javascript/Word2Vec/Word2Vec_Interactive/index.html b/javascript/Word2Vec/Word2Vec_Interactive/index.html
@@ -17,7 +17,7 @@ <h1>Word2Vec example Using a pre-trained model on common English words.</h1>
   <div>
     <div class="row">
       <p>
-        <input type="text" value="rainbow" id="nearword"                        />
+        <input type="text" value="rainbow" id="nearword"                           />
         <button id="submit" class="btn btn-primary">is nearest to ...</button>
       </p>
       <p id="results"></p>
@@ -26,18 +26,18 @@ <h1>Word2Vec example Using a pre-trained model on common English words.</h1>
     <div class="row">
       <p>
         Between
-        <input type="text" value="rainbow" id="between1"                        /> and
-        <input type="text" value="kitten" id="between2"                        />
+        <input type="text" value="rainbow" id="between1"                           /> and
+        <input type="text" value="kitten" id="between2"                           />
         <button id="submit2" class="btn btn-primary">is ...</button>
       </p>
       <p id="results2"></p>
     </div>
 
     <div class="row">
       <p>
-        <input type="text" value="pizza" id="isto1"                        /> is to
-        <input type="text" value="humans" id="isto2"                        /> as
-        <input type="text" value="fish" id="isto3"                        />
+        <input type="text" value="pizza" id="isto1"                           /> is to
+        <input type="text" value="humans" id="isto2"                           /> as
+        <input type="text" value="fish" id="isto3"                           />
         <button id="submit3" class="btn btn-primary">is to ...</button>
       </p>
       <p id="results3"></p>
diff --git a/p5js/CharRNN/CharRNN_Interactive/index.html b/p5js/CharRNN/CharRNN_Interactive/index.html
@@ -18,9 +18,9 @@ <h1>Interactive CharRNN Text Generation Example using p5.js</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>
diff --git a/p5js/CharRNN/CharRNN_Text/index.html b/p5js/CharRNN/CharRNN_Text/index.html
@@ -14,12 +14,12 @@
   <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>
diff --git a/p5js/CharRNN/CharRNN_Text_Stateful/index.html b/p5js/CharRNN/CharRNN_Text_Stateful/index.html
@@ -18,10 +18,10 @@ <h1>Stateful CharRNN Text Generation Example using p5.js</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>
diff --git a/p5js/FeatureExtractor/FeatureExtractor_Image_Classification/index.html b/p5js/FeatureExtractor/FeatureExtractor_Image_Classification/index.html
@@ -29,7 +29,7 @@ <h1>Image Classification using Feature Extractor with MobileNet</h1>
     <p>
       <button id="save">Save Model</button> |
       <label for="avatar">Load Model:</label>
-      <input type="file" id="load" multiple     />
+      <input type="file" id="load" multiple        />
     </p>
     <script src="sketch.js"></script>
   </body>
diff --git a/p5js/FeatureExtractor/FeatureExtractor_Image_Regression/index.html b/p5js/FeatureExtractor/FeatureExtractor_Image_Regression/index.html
@@ -19,7 +19,7 @@ <h2>(Train a Neural Network to move the red square)</h2>
   <div id="videoContainer"></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>
diff --git a/p5js/NeuralNetwork/NeuralNetwork_Simple-Classification/index.html b/p5js/NeuralNetwork/NeuralNetwork_Simple-Classification/index.html
@@ -12,7 +12,7 @@
 <body>
   <h1>Neural Network Simple Classification</h1>
   <label for="avatar">Load Model:</label>
-  <input type="file" id="load" multiple     />
+  <input type="file" id="load" multiple        />
   <script src="sketch.js"></script>
 </body>
 
diff --git a/p5js/NeuralNetwork/NeuralNetwork_Simple-Regression/index.html b/p5js/NeuralNetwork/NeuralNetwork_Simple-Regression/index.html
@@ -12,7 +12,7 @@
 <body>
   <h1>Neural Network Simple Regression</h1>
   <label for="avatar">Load Model:</label>
-  <input type="file" id="load" multiple     />
+  <input type="file" id="load" multiple        />
   <script src="sketch.js"></script>
 </body>
 
diff --git a/p5js/NeuralNetwork/NeuralNetwork_basics/index.html b/p5js/NeuralNetwork/NeuralNetwork_basics/index.html
@@ -12,7 +12,7 @@
 <body>
   <h1>Neural Network</h1>
   <label for="avatar">Load Model:</label>
-  <input type="file" id="load" multiple     />
+  <input type="file" id="load" multiple        />
   <script src="sketch.js"></script>
 </body>
 
diff --git a/p5js/NeuralNetwork/NeuralNetwork_load_saved_data/index.html b/p5js/NeuralNetwork/NeuralNetwork_load_saved_data/index.html
@@ -14,7 +14,7 @@ <h1>Neural Network</h1>
   
   <h2>Step 1: load data</h2>
   <label for="avatar">Load Data:</label>
-  <input type="file" id="load" multiple     />
+  <input type="file" id="load" multiple        />
   <h2>Step 2: train the model</h2>
   <button id="trainBtn">Train Model</button>
   <h2>Step 3: see the label change as you move across the canvas</h2>
diff --git a/p5js/NeuralNetwork/NeuralNetwork_lowres_pixels/index.html b/p5js/NeuralNetwork/NeuralNetwork_lowres_pixels/index.html
@@ -15,7 +15,7 @@ <h1>Pixel Prediction</h1>
   <script src="sketch.js"></script>
 
   <p>
-    Training frequency: <input id="frequency" value="440"     />
+    Training frequency: <input id="frequency" value="440"        />
     <button id="addExample">add example</button>
   </p>
   <p>
diff --git a/p5js/NeuralNetwork/NeuralNetwork_musical_face/index.html b/p5js/NeuralNetwork/NeuralNetwork_musical_face/index.html
@@ -16,7 +16,7 @@ <h1>Face Prediction</h1>
 
   <p>
     Training frequency: <span id="training_freq">440</span>
-    <input type="range" id="frequency_slider" min="0" max="800" value="440"     />
+    <input type="range" id="frequency_slider" min="0" max="800" value="440"        />
     <button id="collectData">collect training data</button>
   </p>
   <p>
diff --git a/p5js/NeuralNetwork/NeuralNetwork_musical_mouse/index.html b/p5js/NeuralNetwork/NeuralNetwork_musical_mouse/index.html
@@ -15,7 +15,7 @@ <h1>Neural Network Musical Mouse</h1>
   <script src="sketch.js"></script>
 
   <p>
-    Training frequency: <input id="frequency" value="440"     />
+    Training frequency: <input id="frequency" value="440"        />
     <button id="train">train</button>
   </p>
   <p>
diff --git a/p5js/NeuralNetwork/NeuralNetwork_titanic/index.html b/p5js/NeuralNetwork/NeuralNetwork_titanic/index.html
@@ -15,10 +15,10 @@
   <script src="sketch.js"></script>
   <h1>Titanic - Neural Network</h1>
   <p>
-    age: <input id="age" value="32"     /><br />
-    fare: <input id="fare" value="100"     /><br />
-    fare_class: <input id="fare_class" value="first"     /><br />
-    sex: <input id="sex" value="female"     /><br />
+    age: <input id="age" value="32"        /><br />
+    fare: <input id="fare" value="100"        /><br />
+    fare_class: <input id="fare_class" value="first"        /><br />
+    sex: <input id="sex" value="female"        /><br />
   </p>
   <p>
     <button id="submit">submit</button>
diff --git a/p5js/StyleTransfer/StyleTransfer_Image/index.html b/p5js/StyleTransfer/StyleTransfer_Image/index.html
@@ -17,16 +17,16 @@ <h1>Style Transfer Image Example using p5.js</h1>
   <p id="statusMsg">Loading Models...</p>
   <button id="transferBtn">Transfer!</button>
   <p>Input Image:</p>
-  <img src="img/patagonia.jpg" alt="input img" id="inputImg"                        />
+  <img src="img/patagonia.jpg" alt="input img" id="inputImg"                           />
 
   <div id="styleA">
     <p>Style A: <a href="https://en.wikipedia.org/wiki/The_Great_Wave_off_Kanagawa">The Great Wave off Kanagawa, 1829 - Katsushika Hokusai</a></p>
-    <img src="img/wave.jpg" alt="style one"                        />
+    <img src="img/wave.jpg" alt="style one"                           />
   </div>
 
   <div id="styleB">
     <p>Style B: <a href="https://en.wikipedia.org/wiki/The_Great_Wave_off_Kanagawa">Udnie (Young American Girl, The Dance), 1913 - Francis Picabia</a></p>
-    <img src="img/udnie.jpg" alt="style two"                        />
+    <img src="img/udnie.jpg" alt="style two"                           />
   </div>
 
   <script src="sketch.js"></script>
diff --git a/p5js/StyleTransfer/StyleTransfer_Video/index.html b/p5js/StyleTransfer/StyleTransfer_Video/index.html
@@ -16,7 +16,7 @@
   <h1>Style Transfer Mirror Example using p5.js</h1>
   <p>Sytle: Udnie (Young American Girl, The Dance), 1913 - Francis Picabia</p>
   <p id='status'>Loading model...</p>
-  <img src="images/udnie.jpg"                         />
+  <img src="images/udnie.jpg"                            />
   <div id="canvasContainer"></div>
   <br />
   <button id="startStop">Start</button>
diff --git a/p5js/Word2Vec/Word2Vec_Interactive/index.html b/p5js/Word2Vec/Word2Vec_Interactive/index.html
@@ -20,7 +20,7 @@ <h1>Word2Vec example with p5.js. Using a pre-trained model on common English wor
   <div>
     <div class="row">
       <p>
-        <input type="text" value="rainbow" id="nearword"                        />
+        <input type="text" value="rainbow" id="nearword"                           />
         <button id="submit" class="btn btn-primary">is nearest to ...</button>
       </p>
       <p id="results"></p>
@@ -29,18 +29,18 @@ <h1>Word2Vec example with p5.js. Using a pre-trained model on common English wor
     <div class="row">
       <p>
         Between
-        <input type="text" value="rainbow" id="between1"                        /> and
-        <input type="text" value="kitten" id="between2"                        />
+        <input type="text" value="rainbow" id="between1"                           /> and
+        <input type="text" value="kitten" id="between2"                           />
         <button id="submit2" class="btn btn-primary">is ...</button>
       </p>
       <p id="results2"></p>
     </div>
 
     <div class="row">
       <p>
-        <input type="text" value="pizza" id="isto1"                        /> is to
-        <input type="text" value="humans" id="isto2"                        /> as
-        <input type="text" value="fish" id="isto3"                        />
+        <input type="text" value="pizza" id="isto1"                           /> is to
+        <input type="text" value="humans" id="isto2"                           /> as
+        <input type="text" value="fish" id="isto3"                           />
         <button id="submit3" class="btn btn-primary">is to ...</button>
       </p>
       <p id="results3"></p>
diff --git a/package.json b/package.json
