Reorganize files

erilyth · Dec 9, 2016 · a2dd3a9 · a2dd3a9
1 parent a50197d
commit a2dd3a9
Show file tree

Hide file tree

Showing 110 changed files with 6 additions and 88 deletions.
diff --git a/model0.keras → Current_Model_Pool/model_new0.keras b/model0.keras → Current_Model_Pool/model_new0.keras
diff --git a/model1.keras → Current_Model_Pool/model_new1.keras b/model1.keras → Current_Model_Pool/model_new1.keras
diff --git a/model_new10.keras → Current_Model_Pool/model_new10.keras b/model_new10.keras → Current_Model_Pool/model_new10.keras
diff --git a/model_new11.keras → Current_Model_Pool/model_new11.keras b/model_new11.keras → Current_Model_Pool/model_new11.keras
diff --git a/model_new26.keras → Current_Model_Pool/model_new12.keras b/model_new26.keras → Current_Model_Pool/model_new12.keras
diff --git a/model_new13.keras → Current_Model_Pool/model_new13.keras b/model_new13.keras → Current_Model_Pool/model_new13.keras
diff --git a/model_new14.keras → Current_Model_Pool/model_new14.keras b/model_new14.keras → Current_Model_Pool/model_new14.keras
diff --git a/model_new15.keras → Current_Model_Pool/model_new15.keras b/model_new15.keras → Current_Model_Pool/model_new15.keras
diff --git a/model_new16.keras → Current_Model_Pool/model_new16.keras b/model_new16.keras → Current_Model_Pool/model_new16.keras
diff --git a/model_new22.keras → Current_Model_Pool/model_new17.keras b/model_new22.keras → Current_Model_Pool/model_new17.keras
diff --git a/model11.keras → Current_Model_Pool/model_new18.keras b/model11.keras → Current_Model_Pool/model_new18.keras
diff --git a/model_new19.keras → Current_Model_Pool/model_new19.keras b/model_new19.keras → Current_Model_Pool/model_new19.keras
diff --git a/model_new2.keras → Current_Model_Pool/model_new2.keras b/model_new2.keras → Current_Model_Pool/model_new2.keras
diff --git a/model_new20.keras → Current_Model_Pool/model_new20.keras b/model_new20.keras → Current_Model_Pool/model_new20.keras
diff --git a/model_new21.keras → Current_Model_Pool/model_new21.keras b/model_new21.keras → Current_Model_Pool/model_new21.keras
diff --git a/model6.keras → Current_Model_Pool/model_new22.keras b/model6.keras → Current_Model_Pool/model_new22.keras
diff --git a/model_new23.keras → Current_Model_Pool/model_new23.keras b/model_new23.keras → Current_Model_Pool/model_new23.keras
diff --git a/model_new24.keras → Current_Model_Pool/model_new24.keras b/model_new24.keras → Current_Model_Pool/model_new24.keras
diff --git a/model_new40.keras → Current_Model_Pool/model_new25.keras b/model_new40.keras → Current_Model_Pool/model_new25.keras
diff --git a/Current_Model_Pool/model_new26.keras b/Current_Model_Pool/model_new26.keras
diff --git a/model_new27.keras → Current_Model_Pool/model_new27.keras b/model_new27.keras → Current_Model_Pool/model_new27.keras
diff --git a/model_new28.keras → Current_Model_Pool/model_new28.keras b/model_new28.keras → Current_Model_Pool/model_new28.keras
diff --git a/model_new29.keras → Current_Model_Pool/model_new29.keras b/model_new29.keras → Current_Model_Pool/model_new29.keras
diff --git a/model_new3.keras → Current_Model_Pool/model_new3.keras b/model_new3.keras → Current_Model_Pool/model_new3.keras
diff --git a/model_new30.keras → Current_Model_Pool/model_new30.keras b/model_new30.keras → Current_Model_Pool/model_new30.keras
diff --git a/model_new31.keras → Current_Model_Pool/model_new31.keras b/model_new31.keras → Current_Model_Pool/model_new31.keras
diff --git a/model_new32.keras → Current_Model_Pool/model_new32.keras b/model_new32.keras → Current_Model_Pool/model_new32.keras
diff --git a/model_new33.keras → Current_Model_Pool/model_new33.keras b/model_new33.keras → Current_Model_Pool/model_new33.keras
diff --git a/model_new34.keras → Current_Model_Pool/model_new34.keras b/model_new34.keras → Current_Model_Pool/model_new34.keras
diff --git a/model_new35.keras → Current_Model_Pool/model_new35.keras b/model_new35.keras → Current_Model_Pool/model_new35.keras
diff --git a/model_new36.keras → Current_Model_Pool/model_new36.keras b/model_new36.keras → Current_Model_Pool/model_new36.keras
diff --git a/model_new37.keras → Current_Model_Pool/model_new37.keras b/model_new37.keras → Current_Model_Pool/model_new37.keras
diff --git a/model_new38.keras → Current_Model_Pool/model_new38.keras b/model_new38.keras → Current_Model_Pool/model_new38.keras
diff --git a/model_new39.keras → Current_Model_Pool/model_new39.keras b/model_new39.keras → Current_Model_Pool/model_new39.keras
diff --git a/model_new4.keras → Current_Model_Pool/model_new4.keras b/model_new4.keras → Current_Model_Pool/model_new4.keras
diff --git a/Current_Model_Pool/model_new40.keras b/Current_Model_Pool/model_new40.keras
diff --git a/model_new41.keras → Current_Model_Pool/model_new41.keras b/model_new41.keras → Current_Model_Pool/model_new41.keras
diff --git a/model_new42.keras → Current_Model_Pool/model_new42.keras b/model_new42.keras → Current_Model_Pool/model_new42.keras
diff --git a/model_new43.keras → Current_Model_Pool/model_new43.keras b/model_new43.keras → Current_Model_Pool/model_new43.keras
diff --git a/model_new44.keras → Current_Model_Pool/model_new44.keras b/model_new44.keras → Current_Model_Pool/model_new44.keras
diff --git a/Current_Model_Pool/model_new45.keras b/Current_Model_Pool/model_new45.keras
diff --git a/model_new46.keras → Current_Model_Pool/model_new46.keras b/model_new46.keras → Current_Model_Pool/model_new46.keras
diff --git a/model_new47.keras → Current_Model_Pool/model_new47.keras b/model_new47.keras → Current_Model_Pool/model_new47.keras
diff --git a/Current_Model_Pool/model_new48.keras b/Current_Model_Pool/model_new48.keras
diff --git a/model_new49.keras → Current_Model_Pool/model_new49.keras b/model_new49.keras → Current_Model_Pool/model_new49.keras
diff --git a/model_new5.keras → Current_Model_Pool/model_new5.keras b/model_new5.keras → Current_Model_Pool/model_new5.keras
diff --git a/model_new6.keras → Current_Model_Pool/model_new6.keras b/model_new6.keras → Current_Model_Pool/model_new6.keras
diff --git a/model_new7.keras → Current_Model_Pool/model_new7.keras b/model_new7.keras → Current_Model_Pool/model_new7.keras
diff --git a/model_new8.keras → Current_Model_Pool/model_new8.keras b/model_new8.keras → Current_Model_Pool/model_new8.keras
diff --git a/model_new9.keras → Current_Model_Pool/model_new9.keras b/model_new9.keras → Current_Model_Pool/model_new9.keras
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,28 +1 @@
-FlappyBirdClone
-===============
-
-A Flappy Bird Clone made using [python-pygame][1]
-
-How-to
-------
-
-1. Install Python 2.7.X from [here](https://www.python.org/download/releases/)
-
-2. Install PyGame 1.9.X from [here](http://www.pygame.org/download.shtml)
-
-3. Clone this repository: `git clone https://github.com/sourabhv/FlappyBirdClone.git` or click `Download ZIP` in right panel and extract it.
-
-4. Run `python flappy.py` from the repo's directory
-
-5. use <kbd>&uarr;</kbd> or <kbd>Space</kbd> key to play and <kbd>Esc</kbd> to close the game.
-
-  (Note: Install pyGame for same version python as above)
-
-  (For x64 windows, get exe [here](http://www.lfd.uci.edu/~gohlke/pythonlibs/#pygame))
-
-ScreenShot
-----------
-
-![Flappy Bird](screenshot1.png)
-
-[1]: http://www.pygame.org
+# Flappy Bird Genetic Algorithm
diff --git a/TrainedModels/Individual_Best_Trained_Models/model_trained1.keras b/TrainedModels/Individual_Best_Trained_Models/model_trained1.keras
diff --git a/...ticallyTrainedModels/model_trained1.keras → ..._Best_Trained_Models/model_trained2.keras b/...ticallyTrainedModels/model_trained1.keras → ..._Best_Trained_Models/model_trained2.keras
diff --git a/model_new0.keras → ...dels/Model_Pool_Trained1/model_new0.keras b/model_new0.keras → ...dels/Model_Pool_Trained1/model_new0.keras
diff --git a/model_new1.keras → ...dels/Model_Pool_Trained1/model_new1.keras b/model_new1.keras → ...dels/Model_Pool_Trained1/model_new1.keras
diff --git a/model10.keras → ...els/Model_Pool_Trained1/model_new10.keras b/model10.keras → ...els/Model_Pool_Trained1/model_new10.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new11.keras b/TrainedModels/Model_Pool_Trained1/model_new11.keras
diff --git a/model_new12.keras → ...els/Model_Pool_Trained1/model_new12.keras b/model_new12.keras → ...els/Model_Pool_Trained1/model_new12.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new13.keras b/TrainedModels/Model_Pool_Trained1/model_new13.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new14.keras b/TrainedModels/Model_Pool_Trained1/model_new14.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new15.keras b/TrainedModels/Model_Pool_Trained1/model_new15.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new16.keras b/TrainedModels/Model_Pool_Trained1/model_new16.keras
diff --git a/model_new17.keras → ...els/Model_Pool_Trained1/model_new17.keras b/model_new17.keras → ...els/Model_Pool_Trained1/model_new17.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new18.keras b/TrainedModels/Model_Pool_Trained1/model_new18.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new19.keras b/TrainedModels/Model_Pool_Trained1/model_new19.keras
diff --git a/model2.keras → ...dels/Model_Pool_Trained1/model_new2.keras b/model2.keras → ...dels/Model_Pool_Trained1/model_new2.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new20.keras b/TrainedModels/Model_Pool_Trained1/model_new20.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new21.keras b/TrainedModels/Model_Pool_Trained1/model_new21.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new22.keras b/TrainedModels/Model_Pool_Trained1/model_new22.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new23.keras b/TrainedModels/Model_Pool_Trained1/model_new23.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new24.keras b/TrainedModels/Model_Pool_Trained1/model_new24.keras
diff --git a/model_new25.keras → ...els/Model_Pool_Trained1/model_new25.keras b/model_new25.keras → ...els/Model_Pool_Trained1/model_new25.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new26.keras b/TrainedModels/Model_Pool_Trained1/model_new26.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new27.keras b/TrainedModels/Model_Pool_Trained1/model_new27.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new28.keras b/TrainedModels/Model_Pool_Trained1/model_new28.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new29.keras b/TrainedModels/Model_Pool_Trained1/model_new29.keras
diff --git a/model3.keras → ...dels/Model_Pool_Trained1/model_new3.keras b/model3.keras → ...dels/Model_Pool_Trained1/model_new3.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new30.keras b/TrainedModels/Model_Pool_Trained1/model_new30.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new31.keras b/TrainedModels/Model_Pool_Trained1/model_new31.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new32.keras b/TrainedModels/Model_Pool_Trained1/model_new32.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new33.keras b/TrainedModels/Model_Pool_Trained1/model_new33.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new34.keras b/TrainedModels/Model_Pool_Trained1/model_new34.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new35.keras b/TrainedModels/Model_Pool_Trained1/model_new35.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new36.keras b/TrainedModels/Model_Pool_Trained1/model_new36.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new37.keras b/TrainedModels/Model_Pool_Trained1/model_new37.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new38.keras b/TrainedModels/Model_Pool_Trained1/model_new38.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new39.keras b/TrainedModels/Model_Pool_Trained1/model_new39.keras
diff --git a/model4.keras → ...dels/Model_Pool_Trained1/model_new4.keras b/model4.keras → ...dels/Model_Pool_Trained1/model_new4.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new40.keras b/TrainedModels/Model_Pool_Trained1/model_new40.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new41.keras b/TrainedModels/Model_Pool_Trained1/model_new41.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new42.keras b/TrainedModels/Model_Pool_Trained1/model_new42.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new43.keras b/TrainedModels/Model_Pool_Trained1/model_new43.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new44.keras b/TrainedModels/Model_Pool_Trained1/model_new44.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new45.keras b/TrainedModels/Model_Pool_Trained1/model_new45.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new46.keras b/TrainedModels/Model_Pool_Trained1/model_new46.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new47.keras b/TrainedModels/Model_Pool_Trained1/model_new47.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new48.keras b/TrainedModels/Model_Pool_Trained1/model_new48.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new49.keras b/TrainedModels/Model_Pool_Trained1/model_new49.keras
diff --git a/model5.keras → ...dels/Model_Pool_Trained1/model_new5.keras b/model5.keras → ...dels/Model_Pool_Trained1/model_new5.keras
diff --git a/TrainedModels/Model_Pool_Trained1/model_new6.keras b/TrainedModels/Model_Pool_Trained1/model_new6.keras
diff --git a/model7.keras → ...dels/Model_Pool_Trained1/model_new7.keras b/model7.keras → ...dels/Model_Pool_Trained1/model_new7.keras
diff --git a/model8.keras → ...dels/Model_Pool_Trained1/model_new8.keras b/model8.keras → ...dels/Model_Pool_Trained1/model_new8.keras
diff --git a/model9.keras → ...dels/Model_Pool_Trained1/model_new9.keras b/model9.keras → ...dels/Model_Pool_Trained1/model_new9.keras
diff --git a/flappy.py b/flappy.py
@@ -21,6 +21,7 @@
 IMAGES, SOUNDS, HITMASKS = {}, {}, {}
 
 load_saved_pool = 1
+save_current_pool = 1
 current_pool = []
 fitness = []
 total_models = 50
@@ -31,7 +32,7 @@
 
 def save_pool():
     for xi in range(total_models):
-        current_pool[xi].save_weights("model_new" + str(xi) + ".keras")
+        current_pool[xi].save_weights("Current_Model_Pool/model_new" + str(xi) + ".keras")
     print("Saved current pool!")
 
 def model_crossover(model_idx1, model_idx2):
@@ -83,7 +84,7 @@ def predict_action(height, dist, pipe_height, model_num):
 
 if load_saved_pool:
     for i in range(total_models):
-        current_pool[i].load_weights("model_new"+str(i)+".keras")
+        current_pool[i].load_weights("Current_Model_Pool/model_new"+str(i)+".keras")
 
 for i in range(total_models):
     print(current_pool[i].get_weights())
@@ -429,7 +430,8 @@ def showGameOverScreen(crashInfo):
     for select in range(len(new_weights)):
         fitness[select] = -100
         current_pool[select].set_weights(new_weights[select])
-    save_pool()
+    if save_current_pool == 1:
+        save_pool()
     generation = generation + 1
     return
 

diff --git a/model_new18.keras b/model_new18.keras
diff --git a/model_new45.keras b/model_new45.keras
diff --git a/model_new48.keras b/model_new48.keras
diff --git a/screenshot1.png b/screenshot1.png
diff --git a/setup.py b/setup.py