Spaces:
Sleeping
Sleeping
Jon Solow
commited on
Commit
·
a989318
1
Parent(s):
29e969c
Refactor luck calc to return intermediate df
Browse files- src/analyze_yahoo.py +5 -8
src/analyze_yahoo.py
CHANGED
@@ -1,8 +1,6 @@
|
|
1 |
import pandas as pd
|
2 |
from typing import Optional
|
3 |
|
4 |
-
from yahoo_client import LeagueSettings
|
5 |
-
|
6 |
|
7 |
def calculate_luck(df: pd.DataFrame, as_of_week: Optional[int] = None) -> pd.DataFrame:
|
8 |
if as_of_week:
|
@@ -27,6 +25,10 @@ def calculate_luck(df: pd.DataFrame, as_of_week: Optional[int] = None) -> pd.Dat
|
|
27 |
df_list.append(df_week)
|
28 |
|
29 |
df_luck = pd.concat(df_list)
|
|
|
|
|
|
|
|
|
30 |
summ_cols = [
|
31 |
"team_name",
|
32 |
"team_points",
|
@@ -37,7 +39,7 @@ def calculate_luck(df: pd.DataFrame, as_of_week: Optional[int] = None) -> pd.Dat
|
|
37 |
"luck_wins",
|
38 |
]
|
39 |
sort_by = "luck_wins"
|
40 |
-
return
|
41 |
|
42 |
|
43 |
def summarize_remaining_wins_from_matches_map(matches_map):
|
@@ -65,8 +67,3 @@ def summarize_remaining_wins_from_matches_map(matches_map):
|
|
65 |
team_remaining_map[n_wins] = prob_list
|
66 |
remaining_map[team_name] = team_remaining_map
|
67 |
return remaining_map
|
68 |
-
|
69 |
-
|
70 |
-
def analyze_league(df_scores: pd.DataFrame, league_settings: LeagueSettings) -> pd.DataFrame:
|
71 |
-
luck = calculate_luck(df_scores, as_of_week=league_settings.current_week - 1)
|
72 |
-
return luck
|
|
|
1 |
import pandas as pd
|
2 |
from typing import Optional
|
3 |
|
|
|
|
|
4 |
|
5 |
def calculate_luck(df: pd.DataFrame, as_of_week: Optional[int] = None) -> pd.DataFrame:
|
6 |
if as_of_week:
|
|
|
25 |
df_list.append(df_week)
|
26 |
|
27 |
df_luck = pd.concat(df_list)
|
28 |
+
return df_luck
|
29 |
+
|
30 |
+
|
31 |
+
def get_grouped_luck(df_luck_all_weeks: pd.DataFrame) -> pd.DataFrame:
|
32 |
summ_cols = [
|
33 |
"team_name",
|
34 |
"team_points",
|
|
|
39 |
"luck_wins",
|
40 |
]
|
41 |
sort_by = "luck_wins"
|
42 |
+
return df_luck_all_weeks[summ_cols].groupby("team_name").sum().sort_values(sort_by, ascending=False)
|
43 |
|
44 |
|
45 |
def summarize_remaining_wins_from_matches_map(matches_map):
|
|
|
67 |
team_remaining_map[n_wins] = prob_list
|
68 |
remaining_map[team_name] = team_remaining_map
|
69 |
return remaining_map
|
|
|
|
|
|
|
|
|
|