Merge pull request #990 from nature-of-code/notion-update-docs

Fixing numbering and ml5.js version for chapter 10 and 11 examples
nature-of-code · Jul 10, 2024 · 0221a78 · 0221a78
2 parents ce4235a + 82d093f
commit 0221a78
Show file tree

Hide file tree

Showing 44 changed files with 19 additions and 26 deletions.
diff --git a/content/11_nn_ga.html b/content/11_nn_ga.html
@@ -165,7 +165,7 @@ <h2 id="coding-flappy-bird">Coding Flappy Bird</h2>
 <div data-type="example">
   <h3 id="example-111-flappy-bird-clone">Example 11.1: Flappy Bird Clone</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/Pv-JlO0cl" data-example-path="examples/11_nn_ga/11_3_flappy_bird"><img src="examples/11_nn_ga/11_3_flappy_bird/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/Pv-JlO0cl" data-example-path="examples/11_nn_ga/11_1_flappy_bird"><img src="examples/11_nn_ga/11_1_flappy_bird/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>
@@ -439,7 +439,7 @@ <h3 id="heredity-baby-birds">Heredity: Baby Birds</h3>
 <div data-type="example">
   <h3 id="example-112-flappy-bird-with-neuroevolution">Example 11.2: Flappy Bird with Neuroevolution</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/PEUKc5dpZ" data-example-path="examples/11_nn_ga/11_4_flappy_bird_neuro_evolution"><img src="examples/11_nn_ga/11_4_flappy_bird_neuro_evolution/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/PEUKc5dpZ" data-example-path="examples/11_nn_ga/11_2_flappy_bird_neuro_evolution"><img src="examples/11_nn_ga/11_2_flappy_bird_neuro_evolution/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>
@@ -506,7 +506,7 @@ <h2 id="steering-the-neuroevolutionary-way">Steering the Neuroevolutionary Way</
 <div data-type="example">
   <h3 id="example-113-smart-rockets-with-neuroevolution">Example 11.3: Smart Rockets with Neuroevolution</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/KkV4lTS4H" data-example-path="examples/11_nn_ga/10_5_smart_rockets_neuro_evolution"><img src="examples/11_nn_ga/10_5_smart_rockets_neuro_evolution/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/KkV4lTS4H" data-example-path="examples/11_nn_ga/11_3_smart_rockets_neuro_evolution"><img src="examples/11_nn_ga/11_3_smart_rockets_neuro_evolution/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>
@@ -641,7 +641,7 @@ <h3 id="speeding-up-time">Speeding Up Time</h3>
 <div data-type="example">
   <h3 id="example-114-dynamic-neuroevolutionary-steering">Example 11.4: Dynamic Neuroevolutionary Steering</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/fZDfxxVrf" data-example-path="examples/11_nn_ga/10_6_neuro_evolution_steering_seek"><img src="examples/11_nn_ga/10_6_neuro_evolution_steering_seek/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/fZDfxxVrf" data-example-path="examples/11_nn_ga/11_4_neuro_evolution_steering_seek"><img src="examples/11_nn_ga/11_4_neuro_evolution_steering_seek/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>
@@ -749,7 +749,7 @@ <h3 id="sensing-the-environment">Sensing the Environment</h3>
 <div data-type="example">
   <h3 id="example-115-a-bloop-with-sensors">Example 11.5: A Bloop with Sensors</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/vCTMtXXSS" data-example-path="examples/11_nn_ga/10_7_creature_sensors"><img src="examples/11_nn_ga/10_7_creature_sensors/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/vCTMtXXSS" data-example-path="examples/11_nn_ga/11_5_creature_sensors"><img src="examples/11_nn_ga/11_5_creature_sensors/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>
@@ -879,7 +879,7 @@ <h3 id="learning-from-the-sensors">Learning from the Sensors</h3>
 <div data-type="example">
   <h3 id="example-116-a-neuroevolutionary-ecosystem">Example 11.6: A Neuroevolutionary Ecosystem</h3>
   <figure>
-    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/IQbcREjUK" data-example-path="examples/11_nn_ga/10_8_neuroevolution_ecosystem"><img src="examples/11_nn_ga/10_8_neuroevolution_ecosystem/screenshot.png"></div>
+    <div data-type="embed" data-p5-editor="https://editor.p5js.org/natureofcode/sketches/IQbcREjUK" data-example-path="examples/11_nn_ga/11_6_neuroevolution_ecosystem"><img src="examples/11_nn_ga/11_6_neuroevolution_ecosystem/screenshot.png"></div>
     <figcaption></figcaption>
   </figure>
 </div>

diff --git a/content/examples/04_particles/4_6_particle_system_forces/sketch.js b/content/examples/04_particles/4_6_particle_system_forces/sketch.js
@@ -19,7 +19,3 @@ function draw() {
   emitter.addParticle();
   emitter.run();
 }
-
-function mousePressed(){
-  save('screenshot.png')
-}
diff --git a/content/examples/10_nn/10_2_gesture_classifier/index.html b/content/examples/10_nn/10_2_gesture_classifier/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.7.0/p5.min.js"></script>
-    <script src="https://unpkg.com/ml5@latest/dist/ml5.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/p5.min.js"></script>
+    <script src="https://unpkg.com/ml5@1.0.1/dist/ml5.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css" />
     <meta charset="utf-8" />
   </head>

diff --git a/content/examples/10_nn/10_2_gesture_classifier/sketch.js b/content/examples/10_nn/10_2_gesture_classifier/sketch.js
@@ -16,6 +16,7 @@ let start, end;
 
 function setup() {
   createCanvas(640, 240);
+  ml5.setBackend('cpu');
   // Step 2: set your neural network options
   let options = {
     task: "classification",

diff --git a/...xamples/11_nn_ga/11_3_flappy_bird/bird.js → ...xamples/11_nn_ga/11_1_flappy_bird/bird.js b/...xamples/11_nn_ga/11_3_flappy_bird/bird.js → ...xamples/11_nn_ga/11_1_flappy_bird/bird.js
diff --git a/...ples/11_nn_ga/11_3_flappy_bird/index.html → ...ples/11_nn_ga/11_1_flappy_bird/index.html b/...ples/11_nn_ga/11_3_flappy_bird/index.html → ...ples/11_nn_ga/11_1_flappy_bird/index.html
diff --git a/...xamples/11_nn_ga/11_3_flappy_bird/pipe.js → ...xamples/11_nn_ga/11_1_flappy_bird/pipe.js b/...xamples/11_nn_ga/11_3_flappy_bird/pipe.js → ...xamples/11_nn_ga/11_1_flappy_bird/pipe.js
diff --git a/.../11_nn_ga/11_3_flappy_bird/screenshot.png → .../11_nn_ga/11_1_flappy_bird/screenshot.png b/.../11_nn_ga/11_3_flappy_bird/screenshot.png → .../11_nn_ga/11_1_flappy_bird/screenshot.png
diff --git a/...mples/11_nn_ga/11_3_flappy_bird/sketch.js → ...mples/11_nn_ga/11_1_flappy_bird/sketch.js b/...mples/11_nn_ga/11_3_flappy_bird/sketch.js → ...mples/11_nn_ga/11_1_flappy_bird/sketch.js
diff --git a/...mples/11_nn_ga/11_3_flappy_bird/style.css → ...mples/11_nn_ga/11_1_flappy_bird/style.css b/...mples/11_nn_ga/11_3_flappy_bird/style.css → ...mples/11_nn_ga/11_1_flappy_bird/style.css
diff --git a/.../11_4_flappy_bird_neuro_evolution/bird.js → .../11_2_flappy_bird_neuro_evolution/bird.js b/.../11_4_flappy_bird_neuro_evolution/bird.js → .../11_2_flappy_bird_neuro_evolution/bird.js
@@ -10,8 +10,7 @@ class Bird {
         task: "classification",
 
         // change to "neuroEvolution" for next ml5.js release
-        noTraining: true
-        // neuroEvolution: true,
+        neuroEvolution: true,
       });
     }
 

diff --git a/..._4_flappy_bird_neuro_evolution/index.html → ..._2_flappy_bird_neuro_evolution/index.html b/..._4_flappy_bird_neuro_evolution/index.html → ..._2_flappy_bird_neuro_evolution/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.7.0/p5.min.js"></script>
-    <script src="https://unpkg.com/ml5@latest/dist/ml5.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/p5.min.js"></script>
+    <script src="https://unpkg.com/ml5@1.0.1/dist/ml5.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css" />
     <meta charset="utf-8" />
   </head>

diff --git a/.../11_4_flappy_bird_neuro_evolution/pipe.js → .../11_2_flappy_bird_neuro_evolution/pipe.js b/.../11_4_flappy_bird_neuro_evolution/pipe.js → .../11_2_flappy_bird_neuro_evolution/pipe.js
diff --git a/...lappy_bird_neuro_evolution/screenshot.png → ...lappy_bird_neuro_evolution/screenshot.png b/...lappy_bird_neuro_evolution/screenshot.png → ...lappy_bird_neuro_evolution/screenshot.png
diff --git a/...1_4_flappy_bird_neuro_evolution/sketch.js → ...1_2_flappy_bird_neuro_evolution/sketch.js b/...1_4_flappy_bird_neuro_evolution/sketch.js → ...1_2_flappy_bird_neuro_evolution/sketch.js
@@ -3,12 +3,11 @@ let pipes = [];
 
 function setup() {
   createCanvas(640, 240);
+  ml5.tf.setBackend("cpu");
   for (let i = 0; i < 200; i++) {
     birds[i] = new Bird();
   }
   pipes.push(new Pipe());
-
-  ml5.tf.setBackend("cpu");
 }
 
 function draw() {

diff --git a/...1_4_flappy_bird_neuro_evolution/style.css → ...1_2_flappy_bird_neuro_evolution/style.css b/...1_4_flappy_bird_neuro_evolution/style.css → ...1_2_flappy_bird_neuro_evolution/style.css
diff --git a/..._smart_rockets_neuro_evolution/index.html → ..._smart_rockets_neuro_evolution/index.html b/..._smart_rockets_neuro_evolution/index.html → ..._smart_rockets_neuro_evolution/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.7.0/p5.min.js"></script>
-    <script src="https://unpkg.com/ml5@latest/dist/ml5.min.js"></script>
+    <script src="https://unpkg.com/ml5@1.0.1/dist/ml5.min.js"></script>
     <meta charset="utf-8" />
     <title>Nature of Code Example 9.3: Smart Rockets</title>
     <link rel="stylesheet" type="text/css" href="style.css" />

diff --git a/...smart_rockets_neuro_evolution/obstacle.js → ...smart_rockets_neuro_evolution/obstacle.js b/...smart_rockets_neuro_evolution/obstacle.js → ...smart_rockets_neuro_evolution/obstacle.js
diff --git a/...art_rockets_neuro_evolution/population.js → ...art_rockets_neuro_evolution/population.js b/...art_rockets_neuro_evolution/population.js → ...art_rockets_neuro_evolution/population.js
diff --git a/...5_smart_rockets_neuro_evolution/rocket.js → ...3_smart_rockets_neuro_evolution/rocket.js b/...5_smart_rockets_neuro_evolution/rocket.js → ...3_smart_rockets_neuro_evolution/rocket.js
@@ -30,7 +30,7 @@ class Rocket {
         inputs: 2,
         outputs: 2,
         task: "regression",
-        noTraining: true,
+        neuroEvolution: true,
       });
     }
   }

diff --git a/...rt_rockets_neuro_evolution/screenshot.png → ...rt_rockets_neuro_evolution/screenshot.png b/...rt_rockets_neuro_evolution/screenshot.png → ...rt_rockets_neuro_evolution/screenshot.png
diff --git a/...5_smart_rockets_neuro_evolution/sketch.js → ...3_smart_rockets_neuro_evolution/sketch.js b/...5_smart_rockets_neuro_evolution/sketch.js → ...3_smart_rockets_neuro_evolution/sketch.js
diff --git a/...5_smart_rockets_neuro_evolution/style.css → ...3_smart_rockets_neuro_evolution/style.css b/...5_smart_rockets_neuro_evolution/style.css → ...3_smart_rockets_neuro_evolution/style.css
diff --git a/...neuro_evolution_steering_seek/creature.js → ...neuro_evolution_steering_seek/creature.js b/...neuro_evolution_steering_seek/creature.js → ...neuro_evolution_steering_seek/creature.js
@@ -14,8 +14,7 @@ class Creature {
         inputs: 5,
         outputs: 2,
         task: "regression",
-        // neuroEvolution: true,
-        noTraining: true,
+        neuroEvolution: true,
       });
     }
   }

diff --git a/...0_6_neuro_evolution_steering_seek/glow.js → ...1_4_neuro_evolution_steering_seek/glow.js b/...0_6_neuro_evolution_steering_seek/glow.js → ...1_4_neuro_evolution_steering_seek/glow.js
diff --git a/..._neuro_evolution_steering_seek/index.html → ..._neuro_evolution_steering_seek/index.html b/..._neuro_evolution_steering_seek/index.html → ..._neuro_evolution_steering_seek/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.7.0/p5.min.js"></script>
-    <script src="https://unpkg.com/ml5@latest/dist/ml5.min.js"></script>
+    <script src="https://unpkg.com/ml5@1.0.1/dist/ml5.min.js"></script>
     <meta charset="utf-8" />
     <title>Nature of Code Example 9.3: Smart Rockets</title>
     <link rel="stylesheet" type="text/css" href="style.css" />

diff --git a/...uro_evolution_steering_seek/population.js → ...uro_evolution_steering_seek/population.js b/...uro_evolution_steering_seek/population.js → ...uro_evolution_steering_seek/population.js
diff --git a/...ro_evolution_steering_seek/screenshot.png → ...ro_evolution_steering_seek/screenshot.png b/...ro_evolution_steering_seek/screenshot.png → ...ro_evolution_steering_seek/screenshot.png
diff --git a/...6_neuro_evolution_steering_seek/sketch.js → ...4_neuro_evolution_steering_seek/sketch.js b/...6_neuro_evolution_steering_seek/sketch.js → ...4_neuro_evolution_steering_seek/sketch.js
diff --git a/...6_neuro_evolution_steering_seek/style.css → ...4_neuro_evolution_steering_seek/style.css b/...6_neuro_evolution_steering_seek/style.css → ...4_neuro_evolution_steering_seek/style.css
diff --git a/...1_nn_ga/10_7_creature_sensors/creature.js → ...1_nn_ga/11_5_creature_sensors/creature.js b/...1_nn_ga/10_7_creature_sensors/creature.js → ...1_nn_ga/11_5_creature_sensors/creature.js
diff --git a/...es/11_nn_ga/10_7_creature_sensors/food.js → ...es/11_nn_ga/11_5_creature_sensors/food.js b/...es/11_nn_ga/10_7_creature_sensors/food.js → ...es/11_nn_ga/11_5_creature_sensors/food.js
diff --git a/...11_nn_ga/10_7_creature_sensors/index.html → ...11_nn_ga/11_5_creature_sensors/index.html b/...11_nn_ga/10_7_creature_sensors/index.html → ...11_nn_ga/11_5_creature_sensors/index.html
diff --git a/...n_ga/10_7_creature_sensors/screenshot.png → ...n_ga/11_5_creature_sensors/screenshot.png b/...n_ga/10_7_creature_sensors/screenshot.png → ...n_ga/11_5_creature_sensors/screenshot.png
diff --git a/.../11_nn_ga/10_7_creature_sensors/sensor.js → .../11_nn_ga/11_5_creature_sensors/sensor.js b/.../11_nn_ga/10_7_creature_sensors/sensor.js → .../11_nn_ga/11_5_creature_sensors/sensor.js
diff --git a/.../11_nn_ga/10_7_creature_sensors/sketch.js → .../11_nn_ga/11_5_creature_sensors/sketch.js b/.../11_nn_ga/10_7_creature_sensors/sketch.js → .../11_nn_ga/11_5_creature_sensors/sketch.js
diff --git a/.../11_nn_ga/10_7_creature_sensors/style.css → .../11_nn_ga/11_5_creature_sensors/style.css b/.../11_nn_ga/10_7_creature_sensors/style.css → .../11_nn_ga/11_5_creature_sensors/style.css
diff --git a/...10_8_neuroevolution_ecosystem/creature.js → ...11_6_neuroevolution_ecosystem/creature.js b/...10_8_neuroevolution_ecosystem/creature.js → ...11_6_neuroevolution_ecosystem/creature.js
@@ -24,8 +24,7 @@ class Creature {
         inputs: this.sensors.length,
         outputs: 2,
         task: "regression",
-        noTraining: true,
-        //  neuroEvolution: true,
+        neuroEvolution: true,
       });
     }
   }

diff --git a/..._ga/10_8_neuroevolution_ecosystem/food.js → ..._ga/11_6_neuroevolution_ecosystem/food.js b/..._ga/10_8_neuroevolution_ecosystem/food.js → ..._ga/11_6_neuroevolution_ecosystem/food.js
diff --git a/.../10_8_neuroevolution_ecosystem/index.html → .../11_6_neuroevolution_ecosystem/index.html b/.../10_8_neuroevolution_ecosystem/index.html → .../11_6_neuroevolution_ecosystem/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.7.0/p5.min.js"></script>
-    <script src="https://unpkg.com/ml5@latest/dist/ml5.min.js"></script>
+    <script src="https://unpkg.com/ml5@1/dist/ml5.min.js"></script>
     <meta charset="utf-8" />
     <title>Nature of Code Example 9.3: Smart Rockets</title>
     <link rel="stylesheet" type="text/css" href="style.css" />

diff --git a/...8_neuroevolution_ecosystem/screenshot.png → ...6_neuroevolution_ecosystem/screenshot.png b/...8_neuroevolution_ecosystem/screenshot.png → ...6_neuroevolution_ecosystem/screenshot.png
diff --git a/...a/10_8_neuroevolution_ecosystem/sensor.js → ...a/11_6_neuroevolution_ecosystem/sensor.js b/...a/10_8_neuroevolution_ecosystem/sensor.js → ...a/11_6_neuroevolution_ecosystem/sensor.js
diff --git a/...a/10_8_neuroevolution_ecosystem/sketch.js → ...a/11_6_neuroevolution_ecosystem/sketch.js b/...a/10_8_neuroevolution_ecosystem/sketch.js → ...a/11_6_neuroevolution_ecosystem/sketch.js
diff --git a/...a/10_8_neuroevolution_ecosystem/style.css → ...a/11_6_neuroevolution_ecosystem/style.css b/...a/10_8_neuroevolution_ecosystem/style.css → ...a/11_6_neuroevolution_ecosystem/style.css