Move multipliers into constants and make calulations easier to read.

sc2reader/constants.py

@@ -83,6 +83,14 @@
     },
 }
 
+LOTV_SPEEDUP = 1.4
+
+GAME_SECONDS_PER_SECOND = {
+        'WoL':  1.4,
+        'HotS': 1.4,
+        'LotV': 1
+}
+
 GATEWAY_CODES = {
     'US': 'Americas',
     'KR': 'Asia',

sc2reader/engine/plugins/apm.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import, print_function, unicode_literals, division
 
 from collections import defaultdict
+from sc2reader.constants import LOTV_SPEEDUP, GAME_SECONDS_PER_SECOND
 
 
 class APMTracker(object):
@@ -24,8 +25,15 @@ def handleInitGame(self, event, replay):
             human.seconds_played = replay.length.seconds
 
     def handlePlayerActionEvent(self, event, replay):
-        event.player.aps[event.second] += 1.4
-        event.player.apm[int(event.second/60)] += 1.4
+        speed_multiplier = 1
+        if replay.expansion == 'LotV':
+            speed_multiplier = LOTV_SPEEDUP
+
+        game_seconds_per_second = GAME_SECONDS_PER_SECOND[replay.expansion]
+
+        game_second = int(event.second/speed_multiplier)
+        event.player.aps[game_second] += game_seconds_per_second
+        event.player.apm[int(game_second/60)] += game_seconds_per_second
 
     def handlePlayerLeaveEvent(self, event, replay):
         event.player.seconds_played = event.second

sc2reader/factories/plugins/replay.py

@@ -7,6 +7,7 @@
 from sc2reader import log_utils
 from sc2reader.utils import Length
 from sc2reader.factories.plugins.utils import PlayerSelection, GameState, JSONDateEncoder, plugin
+from sc2reader.constants import LOTV_SPEEDUP, GAME_SECONDS_PER_SECOND
 
 
 @plugin
@@ -103,27 +104,28 @@ def APMTracker(replay):
 
     speed_multiplier = 1
     if replay.expansion == 'LotV':
-        speed_multiplier = 1.4
+        speed_multiplier = LOTV_SPEEDUP
 
-    game_seconds_per_second = 1.4
+    game_seconds_per_second = GAME_SECONDS_PER_SECOND[replay.expansion]
     if replay.expansion == 'LotV':
-        game_seconds_per_second = 1.4
+        game_seconds_per_second = 1
 
     for player in replay.players:
         player.aps = defaultdict(int)
         player.apm = defaultdict(int)
         player.seconds_played = replay.length.seconds
 
         for event in player.events:
+            game_second = int(event.second/speed_multiplier)
             if event.name == 'SelectionEvent' or 'AbilityEvent' in event.name or 'Hotkey' in event.name:
-                player.aps[event.second/speed_multiplier] += game_seconds_per_second
-                player.apm[int(event.second/60/speed_multiplier)] += game_seconds_per_second
+                player.aps[game_second] += game_seconds_per_second
+                player.apm[int(game_second/60)] += game_seconds_per_second
 
             elif event.name == 'PlayerLeaveEvent':
-                player.seconds_played = event.second/speed_multiplier
+                player.seconds_played = game_second
 
         if len(player.apm) > 0:
-            player.avg_apm = sum(player.aps.values())/float(player.seconds_played)*60*speed_multiplier
+            player.avg_apm = sum(player.aps.values())/float(player.seconds_played)*60
         else:
             player.avg_apm = 0
 

test_replays/test_all.py

@@ -503,7 +503,7 @@ def test_lotv_apm(self):
           from pprint import pprint
           pprint(player)
           if player.name == 'Zenchii':
-              self.assertTrue(int(player.avg_apm) == 56)
+              self.assertEquals(int(player.avg_apm), 56)
 
 
 class TestGameEngine(unittest.TestCase):