Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add relu activation function #135

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add relu activation function #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9f3730
Add pipe's width when bird is looking for closest pipe
MartinMSPedersen Jun 10, 2019
a86257c
Add birdsalives and generation info to webpage
MartinMSPedersen Jun 10, 2019
e1e13fc
Add relu activation function
MartinMSPedersen Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/neuroevolution-flappybird/bird.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Bird {
let closest = null;
let record = Infinity;
for (let i = 0; i < pipes.length; i++) {
let diff = pipes[i].x - this.x;
let diff = pipes[i].x - this.x + pipes[i].w;
if (diff > 0 && diff < record) {
record = diff;
closest = pipes[i];
Expand Down Expand Up @@ -111,4 +111,4 @@ class Bird {
// Every frame it is alive increases the score
this.score++;
}
}
}
2 changes: 2 additions & 0 deletions examples/neuroevolution-flappybird/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
speed: <input id="speedSlider" type="range" min="1" max="10" value="1"> <span id="speed">1</span>
<br/> high score: <span id="hs">0</span>
<br/> all time high score: <span id="ahs">0</span>
<br/> generation: <span id="gens">0</span>
<br/> birds alive: <span id="birdsalive">0</span>
</p>
<p>
<button id="best">run best so far</button>
Expand Down
10 changes: 9 additions & 1 deletion examples/neuroevolution-flappybird/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ let allTimeHighScoreSpan;
// All time high score
let highScore = 0;

// Count generations
let generations = 1

// Training or just showing the current best
let runBest = false;
let runBestButton;
Expand All @@ -34,6 +37,8 @@ function setup() {
canvas.parent('canvascontainer');

// Access the interface elements
generationText = select('#gens');
birdsAlive = select('#birdsalive');
speedSlider = select('#speedSlider');
speedSpan = select('#speed');
highScoreSpan = select('#hs');
Expand Down Expand Up @@ -159,6 +164,8 @@ function draw() {
// Update DOM Elements
highScoreSpan.html(tempHighScore);
allTimeHighScoreSpan.html(highScore);
generationText.html(generations);
birdsAlive.html(activeBirds.length);

// Draw everything!
for (let i = 0; i < pipes.length; i++) {
Expand All @@ -173,7 +180,8 @@ function draw() {
}
// If we're out of birds go to the next generation
if (activeBirds.length == 0) {
generations++;
nextGeneration();
}
}
}
}
5 changes: 5 additions & 0 deletions lib/nn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ let tanh = new ActivationFunction(
y => 1 - (y * y)
);

let tanh = new ActivationFunction(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be "let relu" instead

x => (x<0)?0:x,
y => (x<0)?0:1
);


class NeuralNetwork {
/*
Expand Down