APM added for players

Author: alexhanh

sc2reader/objects.py

@@ -179,7 +179,8 @@ def __init__(self, pid, data, realm="us"):
         self.type = "" # Human or Computer
         self.events = list()
         self.avg_apm = 0
-        self.aps = dict()
+        self.aps = dict() # Doesn't contain seconds with zero actions
+        self.apm = dict() # Doesn't contain minutes with zero actions
 
     def __str__(self):
         return "Player %s - %s (%s)" % (self.pid, self.name, self.actual_race)

sc2reader/replay.py

@@ -155,11 +155,19 @@ def _parse_events(self):
                 player = self.player[event.player]
                 player.events.append(event)
 
+                # Calculate APS, APM and average
                 if event.is_player_action:
                     if event.seconds in player.aps:
                         player.aps[event.seconds] += 1
                     else:
                         player.aps[event.seconds] = 1
+                        
+                    minute = event.seconds/60
+                    if minute in player.apm:
+                        player.apm[minute] += 1
+                    else:
+                        player.apm[minute] = 1
+                        
                     player.avg_apm += 1
 
         # Average the APM

shell.py

@@ -6,4 +6,4 @@
 # replay = Replay("1.sc2replay")
 # 
 # print replay.player["Nexpacisor"].avg_apm
-# print replay.player["dblrainbow"].aps
+# print replay.player["dblrainbow"].apm