Fixed a bug with the bot test hardness replacing the files of round 0…

… with those of round 1
EntelectChallenge · Jun 12, 2016 · 28359ed · 28359ed
1 parent 2adeb28
commit 28359ed
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/Game Engine/Bomberman/TestHarness/TestHarnesses/Bot/BotHarness.cs b/Game Engine/Bomberman/TestHarness/TestHarnesses/Bot/BotHarness.cs
@@ -73,6 +73,8 @@ public override void StartGame(GameMap gameState)
 
         public override void NewRoundStarted(GameMap gameState)
         {
+            _currentRound = gameState.CurrentRound;
+            WriteRoundFiles(gameState);
             if (!PlayerEntity.Killed)
             {
                 RunBotAndGetNextMove();
@@ -83,9 +85,7 @@ public override void RoundComplete(GameMap gameMap, int round)
         {
             base.RoundComplete(gameMap, round);
 
-            _currentRound = round;
-            ClearPreviousRoundFiles();
-            WriteRoundFiles(gameMap);
+            ClearRoundFiles();
         }
 
         public override void GameEnded(GameMap gameMap)
@@ -157,14 +157,14 @@ private void RunBotAndGetNextMove()
             PublishCommand(command);
         }
 
-        private void ClearPreviousRoundFiles()
+        private void ClearRoundFiles()
         {
-            var dir = Path.Combine(PreviousWorkingDirectory, Settings.Default.StateFileName);
+            var dir = Path.Combine(CurrentWorkingDirectory, Settings.Default.StateFileName);
 
             if(File.Exists(dir))
                 File.Delete(dir);
 
-            dir = Path.Combine(PreviousWorkingDirectory, Settings.Default.MapFileName);
+            dir = Path.Combine(CurrentWorkingDirectory, Settings.Default.MapFileName);
 
             if (File.Exists(dir))
                 File.Delete(dir);
@@ -234,14 +234,5 @@ public string CurrentWorkingDirectory
                 return Path.Combine(roundPath, PlayerEntity.Key.ToString(CultureInfo.InvariantCulture));
             }
         }
-
-        public string PreviousWorkingDirectory
-        {
-            get
-            {
-                var roundPath = Path.Combine(WorkDir, (_currentRound - 1).ToString(CultureInfo.InvariantCulture));
-                return Path.Combine(roundPath, PlayerEntity.Key.ToString(CultureInfo.InvariantCulture));
-            }
-        }
     }
 }