Merge pull request #4 from Somnibyte/neural-network-revision

Fixed Flappy bird bugs

Author: Guled

Example/MLKit/GameScene.swift

@@ -48,10 +48,12 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
     var generationLabel: SKLabelNode!
     var fitnessLabel: SKLabelNode!
 
+    let groundTexture = SKTexture(imageNamed: "land")
 
     /// Best score (regardless of generation)
     var bestScore: Int = 0
 
+
     /// Label that displays the best score (bestScore attribute)
     var bestScoreLabel: SKLabelNode!
 
@@ -93,7 +95,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
         moving.addChild(pipes)
 
         // ground
-        let groundTexture = SKTexture(imageNamed: "land")
+
         groundTexture.filteringMode = .nearest // shorter form for SKTextureFilteringMode.Nearest
 
         let moveGroundSprite = SKAction.moveBy(x: -groundTexture.size().width * 2.0, y: 0, duration: TimeInterval(0.02 * groundTexture.size().width * 2.0))
@@ -207,7 +209,9 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
         self.addChild(fitnessLabel)
 
         // Set the current bird
-        currentBird = flappyBirdGenerationContainer?[currentFlappy]
+        if let generation = flappyBirdGenerationContainer {
+            currentBird = generation[currentFlappy]
+        }
 
     }
 
@@ -293,22 +297,17 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
         currentTimeForFlappyBird = NSDate()
 
         // Evaluate the current birds fitness
-        currentBird?.generateFitness(score: score, time: Float(timeInterval))
-
-        // Current generation, bird, and fitness of current bird information
-        print("--------------------------- \n")
-        print("GENERATION: \(generationCounter)")
-        print("BIRD COUNT: \(currentFlappy)")
-        print("FITNESS: \(currentBird?.fitness)")
-        self.generationLabel.text = "Gen: \(self.generationCounter)"
-        print("--------------------------- \n")
-
-        // Go to next flappy bird
-        currentFlappy += 1
+        if let bird = currentBird {
+            bird.generateFitness(score: score, time: Float(timeInterval))
 
-        // Filter out the worst birds after gen 6 (can be adjusted)
+            // Current generation, bird, and fitness of current bird information
+            print("--------------------------- \n")
+            print("GENERATION: \(generationCounter)")
+            print("BIRD COUNT: \(currentFlappy)")
+            print("FITNESS: \(bird.fitness)")
+            self.generationLabel.text = "Gen: \(self.generationCounter)"
+            print("--------------------------- \n")
 
-        if let bird = currentBird {
             if bird.fitness >= 9.0 {
                 print("FOUND RARE BIRD")
                 print(bird.brain?.layers[0].weights)
@@ -318,10 +317,17 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
             }
         }
 
-        if generationCounter >= 3 {
+        // Go to next flappy bird
+        currentFlappy += 1
 
+        if let generation = flappyBirdGenerationContainer {
             // Experiment: Keep some of the last best birds and put them back into the population
-            lastBestGen = (flappyBirdGenerationContainer?.filter({$0.fitness >= 7.0}))!
+            lastBestGen = generation.filter({$0.fitness >= 6.0})
+
+            if lastBestGen.count > 10 {
+                // We want to make room for unique birds
+                lastBestGen = Array<FlappyGenome>(lastBestGen[0...6])
+            }
         }
 
         if let bird = currentBird {
@@ -341,8 +347,11 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
             // New generation array
             var newGen: [FlappyGenome] = []
 
-            newGen += lastBestGen
-            newGen.append(maxBird!)
+            newGen = lastBestGen
+
+            if let bestBird = maxBird {
+                flappyBirdGenerationContainer?.append(bestBird)
+            }
 
             while newGen.count < 20 {
 
@@ -382,17 +391,26 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
             flappyBirdGenerationContainer = newGen
 
             // Set the current bird
-            if (flappyBirdGenerationContainer?.count)! > currentFlappy {
-                currentBird = flappyBirdGenerationContainer?[currentFlappy]
-            } else {
-                currentBird = maxBird
+
+            if let generation = flappyBirdGenerationContainer {
+                if generation.count > currentFlappy{
+                    currentBird = generation[currentFlappy]
+                }else{
+                    if let bestBird = maxBird {
+                        currentBird = maxBird
+                    }
+                }
             }
 
         } else {
 
             // Set the current bird
-            if (flappyBirdGenerationContainer?.count)! > currentFlappy {
-                currentBird = flappyBirdGenerationContainer?[currentFlappy]
+            if let generation = flappyBirdGenerationContainer {
+                if generation.count > currentFlappy {
+                    currentBird = generation[currentFlappy]
+                }
+            }else{
+                currentBird = maxBird
             }
 
         }
@@ -402,8 +420,7 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         if moving.speed > 0 {
             for _ in touches { // do we need all touches?
-                bird.physicsBody?.velocity = CGVector(dx: 0, dy: 0)
-                bird.physicsBody?.applyImpulse(CGVector(dx: 0, dy: 30))
+
             }
         } else if canRestart {
             self.resetScene()
@@ -457,6 +474,16 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 
             let normalizedDistanceOfNextPipe = (distanceOfNextPipe - 3)/(725-3)
 
+            let distanceFromTheGround = abs(self.bird.position.y - self.moving.children[1].position.y)
+
+            let normalizedDistanceFromTheGround = (distanceFromTheGround - 135)/(840-135)
+
+            let distanceFromTheSky = abs(880 - self.bird.position.y)
+
+            let normalizedDistanceFromTheSky = distanceFromTheSky/632
+
+
+
             // Bird Y position
             let birdYPos = bird.position.y/CGFloat(880)
 
@@ -465,25 +492,31 @@ class GameScene: SKScene, SKPhysicsContactDelegate {
 
             let normalizedPosToGap = (posToGap - (-439))/(279 - (-439))
 
-            // Decision AI makes
-            let input = Matrix<Float>(rows: 4, columns: 1, elements: [Float(normalizedDistanceOfNextPipe), Float(normalizedPosToGap), Float(birdYPos), Float(normalizedDistanceFromBottomPipe)])
-            let decision = currentBird?.brain?.feedforward(input: input)
+            if let flappyBird = currentBird {
 
-            print("FLAPPY BIRD DECISION: \(decision)")
+                // Decision AI makes
+                let input = Matrix<Float>(rows: 6, columns: 1, elements: [Float(normalizedDistanceOfNextPipe), Float(normalizedPosToGap), Float(birdYPos), Float(normalizedDistanceFromBottomPipe), Float(normalizedDistanceFromTheGround), Float(normalizedDistanceFromTheSky)])
+                let potentialDescision = flappyBird.brain?.feedforward(input: input)
 
-            // 0.95 was arbitrary, tweaking is recommended
-            if  (decision?.elements[0])! >= Float(0.5) {
 
-                if moving.speed > 0 {
+                if let decision = potentialDescision {
 
-                       bird.physicsBody?.velocity = CGVector(dx: 0, dy: 0)
-                       bird.physicsBody?.applyImpulse(CGVector(dx: 0, dy: 30))
+                    print("FLAPPY BIRD DECISION: \(decision)")
 
-                }
+                    if  (decision.elements[0]) >= Float(0.5) {
 
-            } else {
+                        if moving.speed > 0 {
+
+                            bird.physicsBody?.velocity = CGVector(dx: 0, dy: 0)
+                            bird.physicsBody?.applyImpulse(CGVector(dx: 0, dy: 30))
+
+                        }
+                        
+                    }
+                }
 
             }
+
         }
 
         if canRestart {

Example/MLKit/GameViewController.swift

@@ -64,23 +64,40 @@ class GameViewController: UIViewController {
         // Create First Generation of Flappy Birds
         var generation1: [FlappyGenome] = []
 
-        for _ in 1...20 {
+        for _ in 1...19 {
 
             // Bias already included
-            let brain = NeuralNetwork(size: (4, 1))
-            brain.addLayer(layer: Layer(size: (4, 4), activationType: .siglog))
-            brain.addLayer(layer: Layer(size: (4, 1), activationType: .siglog))
+            let brain = NeuralNetwork(size: (6, 1))
+            brain.addLayer(layer: Layer(size: (6, 12), activationType: .siglog))
+            brain.addLayer(layer: Layer(size: (12, 1), activationType: .siglog))
 
             let newBird = FlappyGenome(genotype: GeneticOperations.encode(network: brain), network: brain)
 
             generation1.append(newBird)
         }
 
+        // Best Bird Weights
+        let brain = NeuralNetwork(size: (6, 1))
+        brain.addLayer(layer: Layer(size: (6, 12), activationType: .siglog))
+        brain.addLayer(layer: Layer(size: (12, 1), activationType: .siglog))
+
+        brain.layers[0].weights = Matrix<Float>(rows: 12, columns: 6, elements: ValueArray<Float>([1.14517,	0.691113, -0.938394, 0.798185, -1.20595, 0.732543, 0.174731, -1.0585,-0.500974,-1.02413,0.841067, -0.530047,-0.336522, -1.68883, -1.47241, 0.907576, 0.71408, 0.646764, -0.331544, 0.141004, 2.42381, 0.0683608, 1.01601,  1.42153, -0.672598, 0.889775, -1.55454, -0.530047, 0.307019, -0.483846, 0.0292488, 0.478605, 0.000960251	, -0.379445, -0.336532, -0.17253, 0.892149, -0.301041, 1.06579, -0.230897, 0.39673, -1.93952, 1.69516, 0.185731, -1.48985, -0.17253, -0.336532, -0.379445, 2.12388, 0.0292488, -0.483846, 0.307019, -1.29687, 0.941488, -1.50857	, -1.47241, 0.594132, 1.69516, 0.185731, -1.48985, -0.17253	, 1.06579, -0.301041, 0.892149, -1.15464, 1.15181,0.000960251, 0.478605, 0.0292488	, -0.483846, 0.307019, -1.29687]))
+
+        brain.layers[1].weights = Matrix<Float>(rows: 1, columns: 12, elements: ValueArray<Float>([1.10186, -1.68883, -0.336522, -2.54774, 0.202769, 1.50816	, -3.25252, 0.830278 , 0.104464, -1.26191, 0.698875, -0.447793]))
+
+        brain.layers[0].bias = Matrix<Float>(rows: 12, columns: 1, elements: ValueArray<Float>([0.941488, -1.50857, -1.47241, 0.594132, -0.189659, 0.804515, -1.60174, 0.741886, -0.811568, 0.0985006, -0.863954, -0.729362]))
+        brain.layers[1].bias = Matrix<Float>(rows: 1, columns: 1, elements: ValueArray<Float>([0.440734]))
+
+        let bestBird =  FlappyGenome(genotype: GeneticOperations.encode(network: brain), network: brain)
+        generation1.append(bestBird)
+
+
         if let scene = GameScene.unarchiveFromFile("GameScene") as? GameScene {
 
             // Set the first generation of Flappy Birds
             scene.flappyBirdGenerationContainer = generation1
-
+            scene.maxBird = bestBird
+            
             // Configure the view.
             let skView = self.view as! SKView
             skView.showsFPS = false

Example/MLKit/GeneticOperations.swift

@@ -33,7 +33,6 @@ final class GeneticOperations {
             genotypeRepresentation += Array<Float>(layer.bias!.elements)
         }
 
-
         return genotypeRepresentation
     }
 
@@ -47,14 +46,14 @@ final class GeneticOperations {
     public static func decode(genotype: [Float]) -> NeuralNetwork {
 
         // Create a new NueralNet
-        let brain = NeuralNetwork(size: (4, 1))
-        brain.addLayer(layer: Layer(size: (4, 4), activationType: .siglog))
-        brain.addLayer(layer: Layer(size: (4, 1), activationType: .siglog))
-
-        brain.layers[0].weights = Matrix<Float>(rows: 4, columns: 4, elements: ValueArray<Float>(Array<Float>(genotype[0...15])))
-        brain.layers[0].bias = Matrix<Float>(rows: 4, columns: 1, elements: ValueArray<Float>(Array<Float>(genotype[20...23])))
-        brain.layers[1].weights = Matrix<Float>(rows: 1, columns: 4, elements: ValueArray<Float>(Array<Float>(genotype[16...19])))
-        brain.layers[1].bias = Matrix<Float>(rows: 1, columns: 1, elements: ValueArray<Float>([genotype[24]]))
+        let brain = NeuralNetwork(size: (6, 1))
+        brain.addLayer(layer: Layer(size: (6, 12), activationType: .siglog))
+        brain.addLayer(layer: Layer(size: (12, 1), activationType: .siglog))
+
+        brain.layers[0].weights = Matrix<Float>(rows: 12, columns: 6, elements: ValueArray<Float>(Array<Float>(genotype[0...71])))
+        brain.layers[0].bias = Matrix<Float>(rows: 12, columns: 1, elements: ValueArray<Float>(Array<Float>(genotype[72...83])))
+        brain.layers[1].weights = Matrix<Float>(rows: 1, columns: 12, elements: ValueArray<Float>(Array<Float>(genotype[84...95])))
+        brain.layers[1].bias = Matrix<Float>(rows: 1, columns: 1, elements: ValueArray<Float>([genotype[96]]))
 
         return brain
     }

MLKit/Classes/ANN/Layer.swift

@@ -103,7 +103,7 @@ open class Layer {
         var a = input
 
         self.input = input
-
+        
         a = (self.weights! * a)
 
         a = Matrix<Float>(rows: a.rows, columns: a.columns, elements: a.elements + self.bias!.elements)

MachineLearningKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'MachineLearningKit'
-  s.version          = '0.1.6'
+  s.version          = '0.1.7'
   s.summary          = 'A simple machine learning framework written in Swift 🤖'
 
   s.description      = <<-DESC

README.md

@@ -20,7 +20,7 @@ MLKit is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'MachineLearningKit', '0.1.6'
+pod 'MachineLearningKit', '0.1.7'
 ```