Removed print statements.

barbacbd · barbacbd · commit c29c5939ac45 · 2025-10-31T14:24:13.000-04:00
Added a new variable - average number of shifts. This did not appear to have bearing on the output.
diff --git a/src/nhl_model/ann.py b/src/nhl_model/ann.py
@@ -387,6 +387,10 @@ def correctData(df, droppable=[]):
     output = df["winner"]
 
     labelsToRemove = ["atTeamname", "atTricode", "htTeamname", "htTricode"] + droppable
+    currentLabels = df.columns.tolist()
+    for label in labelsToRemove.copy():
+        if label not in currentLabels:
+            labelsToRemove.remove(label)
 
     # Drop the output from the Dataframe, leaving the only data left as
     # the dataset to train.
@@ -600,7 +604,6 @@ def _setPredictions(todaysData):
     originalDF = _readPredictionsFile()
     if originalDF is None:
         logger.debug("failed to read predictions file, setting current data")
-        print("here")
         pd.DataFrame.from_dict(outputForDF, orient='columns').to_excel(filename)
         return
 
@@ -686,14 +689,10 @@ def _execAnnCommon(model, predictionFile, comparisonFunction, day, month, year):
     todaysGameData = findGamesByDate(day, month, year)
     outputForDF = []
 
-    print(dumps(todaysGameData, indent=2))
-
     for index, game in enumerate(todaysGameData["games"]):
-        print("homeTeam data")
         for x in teams:
             if x['id'] == game['homeTeam']['id']:
                 print(x['fullName'])
-        print("awayTeam data")
         for x in teams:
             if x['id'] == game['awayTeam']['id']:
                 print(x['fullName'])
diff --git a/src/nhl_model/dataset.py b/src/nhl_model/dataset.py
@@ -284,7 +284,8 @@ def _parseInternalBoxScorePlayersNew(teamDict):  # pylint: disable=too-many-bran
         "assists": 0,
         "shortHandedGoals": 0,
         "shortHandedAssists": 0,
-        "powerPlayAssists": 0
+        "powerPlayAssists": 0,
+        "shiftsPerPlayer": 0.0,
     }
     goalieDict = {
         "saves": 0,
@@ -302,7 +303,6 @@ def _parseInternalBoxScorePlayersNew(teamDict):  # pylint: disable=too-many-bran
     }
 
     for playerType, playerValues in teamDict.items():
-
         if playerType in ("forwards", "defense",):
             for playerData in playerValues:
                 spTOI = playerData["toi"].split(":")
@@ -315,6 +315,7 @@ def _parseInternalBoxScorePlayersNew(teamDict):  # pylint: disable=too-many-bran
                          playerData.get("powerPlayGoals", 0)
                     skaterDict["shortHandedAssists"] += playerData.get("shPoints", 0) - \
                         playerData.get("shorthandedGoals", 0)
+                    skaterDict["shiftsPerPlayer"] += playerData.get("shifts", 0)
 
         elif playerType in ("goalies",):
             for playerData in playerValues:
@@ -364,6 +365,7 @@ def _parseInternalBoxScorePlayersNew(teamDict):  # pylint: disable=too-many-bran
     skaterDict.update(goalieDict)
     skaterDict["numGoalies"] = numGoalies
     skaterDict["numPlayers"] = numPlayers
+    skaterDict["shiftsPerPlayer"] = skaterDict["shiftsPerPlayer"] / numPlayers if numPlayers > 0 else 0.0
 
     return skaterDict
 
