Merged PR 26: Final Refactors

Related work items: #206

Author: ChillinWars

.gitignore

@@ -1,2 +1,3 @@
 **/.idea
 **/.vscode
+build-Pacman*

CppClient/Game/Game.pro

@@ -49,4 +49,5 @@ DISTFILES += \
 HEADERS += \
     ks/commands.h \
     ks/models.h \
-    ai.h
+    ai.h \
+    simple_ai.h

CppClient/Game/ai.cpp

@@ -1,9 +1,10 @@
 #include "ai.h"
 
-#include <ctime>
 #include <vector>
 #include <iostream>
 
+#include "simple_ai.h"
+
 using namespace std;
 using namespace koala::chillin::client;
 using namespace ks::models;
@@ -12,35 +13,55 @@ using namespace ks::commands;
 
 AI::AI(World *world): RealtimeAI<World*>(world)
 {
-    srand(time(0));
+    simple_ai::ai = this;
 }
 
 AI::~AI()
 {
-    if (board)
-    {
-        for (int i = 0; i < world->height(); i++)
-            delete[] board[i];
-        delete[] board;
-    }
 }
 
 void AI::initialize()
 {
     cout << "initialize" << endl;
+
+    simple_ai::initialize(
+        world->width(),
+        world->height(),
+        world->ref_scores()[mySide],
+        world->ref_scores()[otherSide],
+        world->ref_board(),
+        world->ref_pacman(),
+        &world->ref_ghosts()[0],
+        world->ref_ghosts().size(),
+        world->ref_constants(),
+        mySide,
+        otherSide,
+        currentCycle,
+        cycleDuration
+    );
 }
 
 void AI::decide()
 {
     cout << "decide" << endl;
-}
 
-int AI::getRandInt(int start, int end)
-{
-    return (rand() % (end - start + 1)) + start;
+    simple_ai::decide(
+        world->width(),
+        world->height(),
+        world->ref_scores()[mySide],
+        world->ref_scores()[otherSide],
+        world->ref_board(),
+        world->ref_pacman(),
+        &world->ref_ghosts()[0],
+        world->ref_ghosts().size(),
+        world->ref_constants(),
+        mySide,
+        otherSide,
+        currentCycle,
+        cycleDuration
+    );
 }
 
-
 void AI::sendCommand(ks::KSObject *command)
 {
     BaseAI::sendCommand(command);

CppClient/Game/ai.h

@@ -9,10 +9,6 @@
 
 class AI : public koala::chillin::client::RealtimeAI<ks::models::World*>
 {
-private:
-    int **board;
-    int getRandInt(int start, int end);
-
 public:
     AI(ks::models::World *world);
     ~AI();

CppClient/Game/gamecfg.json

@@ -15,7 +15,7 @@
 		"": "creating a new decision thread each time a snapshot of game is received from server",
 		"create_new_thread": true,
 		"agent_name": "0",
-		"team_nickname": "BabyKnight",
+		"team_nickname": "Team1",
 		"token": "team_id1-xx"
 	}
 }

CppClient/Game/ks/commands.h

@@ -28,7 +28,7 @@ class KSObject
 namespace commands
 {
 
-enum class ECommandDirection
+enum ECommandDirection
 {
 	Up = 0,
 	Right = 1,

CppClient/Game/ks/models.h

@@ -28,7 +28,7 @@ class KSObject
 namespace models
 {
 
-enum class ECell
+enum ECell
 {
 	Empty = 0,
 	Food = 1,
@@ -37,7 +37,7 @@ enum class ECell
 };
 
 
-enum class EDirection
+enum EDirection
 {
 	Up = 0,
 	Right = 1,

CppClient/Game/simple_ai.h

@@ -19,29 +19,63 @@ namespace simple_ai {
 AI *ai;
 
 
-void move(int bananaId, int dir)
+const int CELL_EMPTY = ECell::Empty;
+const int CELL_FOOD = ECell::Food;
+const int CELL_SUPER_FOOD = ECell::SuperFood;
+const int CELL_WALL = ECell::Wall;
+
+const int DIR_UP = EDirection::Up;
+const int DIR_RIGHT = EDirection::Right;
+const int DIR_DOWN = EDirection::Down;
+const int DIR_LEFT = EDirection::Left;
+
+
+void changePacmanDirection(int dir)
 {
-    ai->sendCommand(&move);
+    ChangePacmanDirection changeDir;
+    changeDir.direction((ECommandDirection) dir);
+    ai->sendCommand(&changeDir);
 }
 
+void changeGhostDirection(int id, int dir)
+{
+    ChangeGhostDirection changeDir;
+    changeDir.id(id);
+    changeDir.direction((ECommandDirection) dir);
+    ai->sendCommand(&changeDir);
+}
+
+
 void initialize(
-    int width, int height, int myScore, int otherScore, int **board,
-    Banana myBananas[], int myBananasCount, Banana otherBananas[], int otherBananasCount,
-    PowerUp powerups[], int powerupsCount, int enter_score,
+    int width, int height, int myScore, int otherScore, std::vector<std::vector<ECell>>& board,
+    Pacman& Pacman, Ghost ghosts[], int ghostsCount,
+    Constants& constants,
     string mySide, string otherSide, int currentCycle, float cycleDuration)
 {
 }
 
 
 void decide(
-    int width, int height, int myScore, int otherScore, int **board,
-    Banana myBananas[], int myBananasCount, Banana otherBananas[], int otherBananasCount,
-    PowerUp powerups[], int powerupsCount, int enter_score,
+    int width, int height, int myScore, int otherScore, std::vector<std::vector<ECell>>& board,
+    Pacman& Pacman, Ghost ghosts[], int ghostsCount,
+    Constants& constants,
     string mySide, string otherSide, int currentCycle, float cycleDuration)
 {
-    
+    // Write your own AI code here
+    if (mySide == "Pacman")
+    {
+        changePacmanDirection(DIR_UP);
+    }
+    else if (mySide == "Ghost")
+    {
+        for (int i = 0; i < ghostsCount; i++)
+        {
+            Ghost ghost = ghosts[i];
+            changeGhostDirection(ghost.id(), DIR_UP);
+        }
+    }
 }
 
 }
 
-#endif // SIMPLE_AI_H
+#endif // SIMPLE_AI_H

PythonClient/ai.py

@@ -1,44 +1,33 @@
 # -*- coding: utf-8 -*-
 
-# python imports
-import random
-
 # chillin imports
 from chillin_client import RealtimeAI
 
 # project imports
-from ks.models import World, Pacman, Ghost, Constants, ECell, EDirection
-from ks.commands import ChangePacmanDirection, ChangeGhostDirection, ECommandDirection
+import simple_ai
+from ks.models import World
 
 
 class AI(RealtimeAI):
 
     def __init__(self, world):
         super(AI, self).__init__(world)
+        simple_ai.ai = self
 
 
     def initialize(self):
         print('initialize')
 
+        world = self.world
+        simple_ai.initialize(world.width, world.height, world.scores[self.my_side], world.scores[self.other_side],
+                             world.board, world.pacman, world.ghosts, world.constants,
+                             self.my_side, self.other_side, self.current_cycle, self.cycle_duration)
+
 
     def decide(self):
         print('decide')
-        
-        if self.my_side == 'Pacman':
-            direction = random.choice([
-                ECommandDirection.Up,
-                ECommandDirection.Right,
-                ECommandDirection.Down,
-                ECommandDirection.Left
-            ])
-            self.send_command(ChangePacmanDirection(direction=direction))
-
-        if self.my_side == 'Ghost':
-            for ghost in self.world.ghosts:
-                direction = random.choice([
-                    ECommandDirection.Up,
-                    ECommandDirection.Right,
-                    ECommandDirection.Down,
-                    ECommandDirection.Left
-                ])
-                self.send_command(ChangeGhostDirection(direction=direction, id=ghost.id))
+
+        world = self.world
+        simple_ai.decide(world.width, world.height, world.scores[self.my_side], world.scores[self.other_side],
+                             world.board, world.pacman, world.ghosts, world.constants,
+                             self.my_side, self.other_side, self.current_cycle, self.cycle_duration)

PythonClient/gamecfg.json

@@ -18,7 +18,7 @@
 		"": "creating a new decision thread each time a snapshot of game is received from server",
 		"create_new_thread": true,
 		"agent_name": "0",
-		"team_nickname": "BabyKnight",
+		"team_nickname": "Team1",
 		"token": "team_id1-xx"
 	}
 }