Merge pull request #136 from don4get/master

Update manager to comply with new halite 3 arguments

Author: lidavidm

tools/manager/manager.py

@@ -32,11 +32,11 @@
 # db_filename is now specified at command line, with the default set to "db.sqlite3"
 browser_binary = "firefox"
 
+
 def max_match_rounds(width, height):
     return 300 # FIXME check the actual final forumla
 
 
-
 class Manager:
     def __init__(self, halite_binary, db_filename, players=None, rounds=-1, players_max=4):
         self.halite_binary = halite_binary
@@ -85,7 +85,6 @@ def pick_contestants(self, num):
         random.shuffle(contestants)
         return contestants
 
-
     def run_rounds(self, player_dist, map_dist):
         try:
             self.run_rounds_unix(player_dist, map_dist)
@@ -155,9 +154,6 @@ def show_results(self, offset, limit):
     def view_replay_id(self, id):
         filename = self.db.get_replay_filename(id)
         view_replay(filename)
-        
-
-
 
 
 def view_replay(filename):
@@ -398,6 +394,7 @@ def act(self):
         elif self.no_args:
             self.parser.print_help()
 
+
 cmd = Commandline()
 cmd.parse(sys.argv[1:])
 cmd.act()

tools/manager/match.py

@@ -9,14 +9,14 @@
 
 record_dir = "replays"
 
+
 def update_skills(players, ranks):
     """ Update player skills based on ranks from a match """
     teams = [skills.Team({player.name: skills.GaussianRating(player.mu, player.sigma)}) for player in players]
     match = skills.Match(teams, ranks)
     calc = trueskill.FactorGraphTrueSkillCalculator()
     game_info = trueskill.TrueSkillGameInfo()
     updated = calc.new_ratings(match, game_info)
-    print ("Updating ranks")
     for team in updated:
         player_name, skill_data = next(iter(team.items()))    #in Halite, teams will always be a team of one player
         player = next(player for player in players if player.name == str(player_name))   #this suggests that players should be a dictionary instead of a list
@@ -25,6 +25,7 @@ def update_skills(players, ranks):
         player.update_skill()
         print("skill = %4f  mu = %3f  sigma = %3f  name = %s" % (player.skill, player.mu, player.sigma, str(player_name)))
 
+
 class Match:
     def __init__(self, players, width, height, seed, time_limit, keep_replays, keep_logs):
         print("Seed = " + str(seed))
@@ -43,7 +44,6 @@ def __init__(self, players, width, height, seed, time_limit, keep_replays, keep_
         self.num_players = len(players)
         self.keep_replay = keep_replays
         self.keep_logs = keep_logs
-        self.parameters = None
         self.logs = None
         self.map_generator = None
 
@@ -56,63 +56,33 @@ def __repr__(self):
         return title1 + title2 + dims + results + replay
 
     def get_command(self, halite_binary):
-        dims = "-d " + str(self.map_width) + " " + str(self.map_height)
-        quiet = "-q"
+        if self.keep_replay is True:
+            replays = "--replay-directory replays/"
+        else:
+            replays = "--no-replay"
+        width = "--width 32"
+        height = "--height 32"
         seed = "-s " + str(self.map_seed)
-        result = [halite_binary, dims, quiet, seed]
+        results = "--results-as-json"
+        result = [halite_binary, replays, width, height, seed, results]
+        if self.keep_logs is False:
+            result.append("--no-logs")
+
         return result + self.paths
 
     def run_match(self, halite_binary):
         command = self.get_command(halite_binary)
         print("Command = " + str(command))
         p = Popen(command, stdin=None, stdout=PIPE, stderr=None)
         results, _ = p.communicate(None, self.total_time_limit)
+
         self.results_string = results.decode('ascii')
         self.return_code = p.returncode
         self.parse_results_string()
         update_skills(self.players, copy.deepcopy(self.results))
-        if self.keep_replay:
-            print("Keeping replay\n")
-            if not os.path.exists(record_dir):
-                os.makedirs(record_dir)
-            try:
-                shutil.move(self.replay_file, record_dir)
-                if self.replay_file.startswith('./'):
-                    self.replay_file = self.replay_file[2:]
-                self.replay_file = os.path.join(record_dir, self.replay_file)
-            except Exception as e:
-                print(e)
-        else: 
-            print("Deleting replay\n")
-            os.remove(self.replay_file)
-
-        if self.keep_logs:
-            print("Keeping logs\n")
-            if not os.path.exists(record_dir):
-                os.makedirs(record_dir)
-            try:
-                for key, filename in self.logs.items():
-                    shutil.move(filename, record_dir)
-                    self.logs[key] = os.path.join(record_dir, filename)
-            except Exception as e:
-                print(e)
-        else: 
-            print("Deleting logs\n")
-            for file in self.logs.values():
-                os.remove(file)
-#        self.fix_logs()
-
-#    def fix_logs(self):
-#        print("Fixing logs")
-#        for index in range(0, self.num_players):
-#            if not self.logs[index]:
-#                self.logs[index] = None
-#        print(self.logs)
-        
 
     def parse_results_string(self):
         data = json.loads(self.results_string)
-        self.parameters = data['gameplay_parameters']
         self.logs = data['error_logs']
         self.map_height = data['map_height']
         self.map_width = data['map_width']

tools/manager/requirements.txt

@@ -0,0 +1 @@
+skills