fixed stupid dataframe merge error i created with the match type filter

l1ghthouse · Dec 19, 2022 · 2861d3a · 2861d3a
1 parent 598fe0f
commit 2861d3a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/analysis/preprocess.py b/analysis/preprocess.py
@@ -62,6 +62,7 @@ def preprocess(games: pd.DataFrame) -> pd.DataFrame:
 
     ranked_games.set_index('matchID', inplace=True)
     ranked_games = ranked_games.loc[has_even_teams.intersection(has_damage).intersection(has_highlander)]
+    ranked_games = games.copy().set_index('matchID')
 
     recent_names = player_names(games=ranked_games)
     ranked_games['name'] = ranked_games['uid'].replace(recent_names)

diff --git a/analysis/utilities.py b/analysis/utilities.py
@@ -65,6 +65,11 @@ def get_game_type(games: pd.DataFrame) -> pd.DataFrame:
     :return:
     """
     team_size = games.groupby(['matchID', 'round', 'team'])['name'].count()
-    team_size = team_size.rename('team_size').reset_index(level=[1, 2])['team_size']
+    team_size = team_size.rename('team_size').reset_index()
 
-    return pd.merge(games, team_size, left_index=True, right_index=True).reset_index()
+    return pd.merge(
+        games,
+        team_size,
+        left_on=['matchID', 'round', 'team'],
+        right_on=['matchID', 'round', 'team']
+    )
diff --git a/spreadsheet/webapp.py b/spreadsheet/webapp.py
@@ -101,7 +101,7 @@ def load_game_data() -> pd.DataFrame:
 
     view_games = ranked_games.groupby(state.group_columns)[state.data_columns].agg(state.agg_func)
     round_count = ranked_games.groupby(
-        state.group_columns)["name"].count().squeeze().astype(int).rename("rounds_played")
+        state.group_columns).count()["team_size"].squeeze().astype(int).rename("rounds_played")
     view_games = pd.concat([view_games, round_count], axis=1)
     view_games = round(view_games, 2)