gr-analytics 0.3.2__tar.gz → 0.4.0__tar.gz

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gr_analytics
-Version: 0.3.2
+Version: 0.4.0
 Summary: Scoring and salary calculation for GridRival fantasy F1
 Author: nce8
 License-Expression: MIT
@@ -14,6 +14,8 @@ Description-Content-Type: text/markdown
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: numpy
+Provides-Extra: fastf1
+Requires-Dist: fastf1; extra == "fastf1"
 
 # gr_analytics
 
@@ -39,7 +41,8 @@ scenario = pd.read_csv("my_race.csv")
 # Score the event (defaults to the latest round in driver_data)
 result = score_event(scenario)
 
-# Or score a specific round
+# Or score a specific race: pass the round one less than the race
+# (round=1 is the post-race-1 state, so this scores race 2). See "Driver Data".
 result = score_event(scenario, round=1)
 
 # Score your specific team selection
@@ -135,19 +138,31 @@ Bundled driver data (`gr_analytics/data/driver_data.csv`) contains starting sala
 - `round=0` — pre-season (before Australia 2026)
 - `round=1` — post-Australia 2026
 
+Each `round=N` row holds the state **after** race N: the post-race salaries,
+the finishing position from race N, and the 8-race average including race N.
+
+**Round semantics for `score_event`:** the `round` argument is that
+post-race state, so `score_event(scenario, round=N)` scores the race that
+*follows* it. Pass the round **one less** than the race you're scoring:
+`round=0` scores race 1 (off the pre-season seeds), `round=1` scores race 2,
+and so on. Improvement points therefore compare each finish to the 8-race
+average *going into* that race (`calculate_eight_race_averages(through_round=round)`).
+
 ## Eight-Race Average
 
 GridRival's "8 race average" can be computed instead of entered by hand.
 GridRival seeds the season with 8 slots holding a hard-coded initial
 average (the `round=0` values in driver_data); each race replaces one
 slot with the driver's classified finishing position, and the displayed
-value is the **ceiling** of the slot mean. Race finishing positions live
-in `gr_analytics/data/race_results.csv`.
+value is the **ceiling** of the slot mean. Each driver's finishing
+position per race is recorded in the `finishing_position` column of
+`driver_data.csv` (the `round=N` row holds the finish from race N), so
+the average is derived entirely from `driver_data`.
 
 ```python
 from gr_analytics import calculate_eight_race_averages, eight_race_average
 
-# All drivers, after the latest round in race_results.csv
+# All drivers, after the latest round with recorded finishing positions
 calculate_eight_race_averages()
 
 # All drivers, after round 2
@@ -160,6 +175,12 @@ eight_race_average(1, [6, 16])
 This reproduces GridRival's displayed values exactly for all rounds so
 far (verified in `tests/test_eight_race_average.py`).
 
+`score_event` uses this computed average for improvement points (the value
+*going into* the race, i.e. `calculate_eight_race_averages(through_round=round)`)
+rather than the stored `eight_race_average` column. That column is kept only as
+GridRival's transcribed ground-truth/test oracle and may be blank for recent
+rounds; scoring no longer depends on it.
+
 ## Lineup Optimisation
 
 `optimal_lineup` uses mixed-integer linear programming (via `scipy.optimize.milp`) to find the best 5-driver + 1-constructor lineup within a salary budget.

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/README.md

@@ -22,7 +22,8 @@ scenario = pd.read_csv("my_race.csv")
 # Score the event (defaults to the latest round in driver_data)
 result = score_event(scenario)
 
-# Or score a specific round
+# Or score a specific race: pass the round one less than the race
+# (round=1 is the post-race-1 state, so this scores race 2). See "Driver Data".
 result = score_event(scenario, round=1)
 
 # Score your specific team selection
@@ -118,19 +119,31 @@ Bundled driver data (`gr_analytics/data/driver_data.csv`) contains starting sala
 - `round=0` — pre-season (before Australia 2026)
 - `round=1` — post-Australia 2026
 
+Each `round=N` row holds the state **after** race N: the post-race salaries,
+the finishing position from race N, and the 8-race average including race N.
+
+**Round semantics for `score_event`:** the `round` argument is that
+post-race state, so `score_event(scenario, round=N)` scores the race that
+*follows* it. Pass the round **one less** than the race you're scoring:
+`round=0` scores race 1 (off the pre-season seeds), `round=1` scores race 2,
+and so on. Improvement points therefore compare each finish to the 8-race
+average *going into* that race (`calculate_eight_race_averages(through_round=round)`).
+
 ## Eight-Race Average
 
 GridRival's "8 race average" can be computed instead of entered by hand.
 GridRival seeds the season with 8 slots holding a hard-coded initial
 average (the `round=0` values in driver_data); each race replaces one
 slot with the driver's classified finishing position, and the displayed
-value is the **ceiling** of the slot mean. Race finishing positions live
-in `gr_analytics/data/race_results.csv`.
+value is the **ceiling** of the slot mean. Each driver's finishing
+position per race is recorded in the `finishing_position` column of
+`driver_data.csv` (the `round=N` row holds the finish from race N), so
+the average is derived entirely from `driver_data`.
 
 ```python
 from gr_analytics import calculate_eight_race_averages, eight_race_average
 
-# All drivers, after the latest round in race_results.csv
+# All drivers, after the latest round with recorded finishing positions
 calculate_eight_race_averages()
 
 # All drivers, after round 2
@@ -143,6 +156,12 @@ eight_race_average(1, [6, 16])
 This reproduces GridRival's displayed values exactly for all rounds so
 far (verified in `tests/test_eight_race_average.py`).
 
+`score_event` uses this computed average for improvement points (the value
+*going into* the race, i.e. `calculate_eight_race_averages(through_round=round)`)
+rather than the stored `eight_race_average` column. That column is kept only as
+GridRival's transcribed ground-truth/test oracle and may be blank for recent
+rounds; scoring no longer depends on it.
+
 ## Lineup Optimisation
 
 `optimal_lineup` uses mixed-integer linear programming (via `scipy.optimize.milp`) to find the best 5-driver + 1-constructor lineup within a salary budget.

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/gr_analytics/__init__.py

@@ -34,16 +34,6 @@ def driver_data() -> pd.DataFrame:
     return pd.read_csv(_DATA_DIR / "driver_data.csv")
 
 
-def race_results() -> pd.DataFrame:
-    """
-    Load and return race_results.csv as a DataFrame.
-
-    One row per driver per round with the official classified finishing
-    position (DNF/DNS drivers receive their classified position).
-    """
-    return pd.read_csv(_DATA_DIR / "race_results.csv")
-
-
 # ---------------------------------------------------------------------------
 # Lookup tables — Drivers
 # ---------------------------------------------------------------------------
@@ -372,16 +362,19 @@ def calculate_eight_race_averages(through_round: int = None) -> pd.Series:
     """
     Compute every driver's eight-race average after ``through_round``.
 
-    Uses the round-0 seeds in driver_data.csv and the finishing positions
-    in race_results.csv. Matches the convention of driver_data, where the
-    round-N row holds the state *after* race N (so the returned values are
-    what GridRival displays going into race N+1).
+    Reads everything from driver_data.csv: the round-0 ``eight_race_average``
+    seeds and the per-race ``finishing_position`` recorded on each driver's
+    round row (the round-N row holds the finishing position from race N,
+    parallel to ``points_from_last_race``). Matches the convention of
+    driver_data, where the round-N row holds the state *after* race N (so
+    the returned values are what GridRival displays going into race N+1).
 
     Parameters
     ----------
     through_round : int, optional
         Include races 1 through this round. Defaults to the latest round
-        in race_results. Pass 0 to get the season-start seeds.
+        whose finishing positions are recorded in driver_data. Pass 0 to
+        get the season-start seeds.
 
     Returns
     -------
@@ -389,20 +382,20 @@ def calculate_eight_race_averages(through_round: int = None) -> pd.Series:
         Eight-race average indexed by driver_abbr.
     """
     dd = driver_data()
-    seeds = (
-        dd[(dd["type"] == "driver") & (dd["round"] == 0)]
-        .set_index("driver_abbr")["eight_race_average"]
-    )
+    drivers = dd[dd["type"] == "driver"]
+    seeds = drivers[drivers["round"] == 0].set_index("driver_abbr")[
+        "eight_race_average"
+    ]
 
-    results = race_results()
+    finishes = drivers[(drivers["round"] >= 1) & drivers["finishing_position"].notna()]
     if through_round is None:
-        through_round = results["round"].max()
-    results = results[results["round"] <= through_round].sort_values("round")
+        through_round = int(finishes["round"].max())
+    finishes = finishes[finishes["round"] <= through_round].sort_values("round")
 
     averages = {
         abbr: eight_race_average(
             seed,
-            results.loc[results["driver_abbr"] == abbr, "finishing_position"],
+            finishes.loc[finishes["driver_abbr"] == abbr, "finishing_position"],
         )
         for abbr, seed in seeds.items()
     }
@@ -531,6 +524,11 @@ def score_event(scenario: pd.DataFrame, round: int = None) -> pd.DataFrame:
         round = dd["round"].max()
     dd = dd[dd["round"] == round].copy()
 
+    # `finishing_position` stored in driver_data is the historical race result
+    # (used only for the eight-race average); the race being scored is supplied
+    # by `scenario`, so drop the stored column to avoid a merge collision.
+    dd = dd.drop(columns=["finishing_position"], errors="ignore")
+
     drivers_dd = dd[dd["type"] == "driver"].copy()
     teams_dd = dd[dd["type"] == "team"].copy()
 
@@ -562,6 +560,15 @@ def score_event(scenario: pd.DataFrame, round: int = None) -> pd.DataFrame:
         how="left",
     ).rename(columns={"race_position": "finishing_position"})
 
+    # Improvement points compare each driver's finish to GridRival's eight-race
+    # average *going into* this race — i.e. the average as of the end of `round`,
+    # the state the scenario is scored against (round=0 scores race 1 off the
+    # season-start seeds). Compute it rather than trust the stored
+    # eight_race_average column, which is left blank for rounds whose GridRival
+    # value hasn't been transcribed.
+    avgs = calculate_eight_race_averages(through_round=round)
+    drivers_merged["eight_race_average"] = drivers_merged["driver_abbr"].map(avgs)
+
     df = pd.concat([drivers_merged, teams_dd], ignore_index=True)
 
     drivers = df[df["type"] == "driver"].copy()

gr_analytics-0.4.0/gr_analytics/data/driver_data.csv

@@ -0,0 +1,265 @@
+type,driver_abbr,driver_name,driver_team,round,starting_salary,eight_race_average,points_from_last_race,finishing_position
+driver,VER,M. Verstappen,RBR,0,30,1,,
+driver,RUS,G. Russell,MER,0,28.7,2,,
+driver,NOR,L. Norris,MCL,0,27.4,3,,
+driver,PIA,O. Piastri,MCL,0,26.1,4,,
+driver,ANT,K. Antonelli,MER,0,24.8,5,,
+driver,LEC,C. Leclerc,FER,0,23.5,6,,
+driver,ALO,F. Alonso,AMR,0,22.2,7,,
+driver,HAM,L. Hamilton,FER,0,20.9,8,,
+driver,HAD,I. Hadjar,RBR,0,19.6,9,,
+driver,GAS,P. Gasly,ALP,0,18.3,10,,
+driver,STR,L. Stroll,AMR,0,17,11,,
+driver,SAI,C. Sainz Jr,WIL,0,15.7,12,,
+driver,LAW,L. Lawson,RBS,0,14.4,13,,
+driver,ALB,A. Albon,WIL,0,13.1,14,,
+driver,HUL,N. Hulkenberg,AUD,0,11.8,15,,
+driver,BOR,G. Bortoleto,AUD,0,10.5,16,,
+driver,BEA,O. Bearman,HAS,0,9.2,17,,
+driver,OCO,E. Ocon,HAS,0,7.9,18,,
+driver,BOT,V. Bottas,CAD,0,4.7,19,,
+driver,PER,S. Perez,CAD,0,4.7,19,,
+driver,COL,F. Colapinto,ALP,0,4.7,19,,
+driver,LIN,A. Lindblad,RBS,0,4.6,19,,
+team,MER,MER,,0,28.5,1,,
+team,MCL,MCL,,0,28.5,2,,
+team,RBR,RBR,,0,25,3,,
+team,FER,FER,,0,22.5,4,,
+team,AMR,AMR,,0,20,5,,
+team,WIL,WIL,,0,17.5,6,,
+team,RBS,RBS,,0,15,7,,
+team,ALP,ALP,,0,12.5,8,,
+team,AUD,AUD,,0,10,9,,
+team,CAD,CAD,,0,7.5,10,,
+team,HAS,HAS,,0,5,11,,
+driver,VER,M. Verstappen,RBR,1,28.2,2,,6
+driver,RUS,G. Russell,MER,1,29.6,2,,1
+driver,NOR,L. Norris,MCL,1,26.7,4,,5
+driver,PIA,O. Piastri,MCL,1,24.1,7,,21
+driver,ANT,K. Antonelli,MER,1,25.9,5,,2
+driver,LEC,C. Leclerc,FER,1,24.5,6,,3
+driver,ALO,F. Alonso,AMR,1,20.2,9,,18
+driver,HAM,L. Hamilton,FER,1,22.1,8,,4
+driver,HAD,I. Hadjar,RBR,1,17.6,11,,20
+driver,GAS,P. Gasly,ALP,1,18.3,10,,10
+driver,STR,L. Stroll,AMR,1,15,12,,17
+driver,SAI,C. Sainz Jr,WIL,1,13.9,13,,15
+driver,LAW,L. Lawson,RBS,1,14.5,13,,13
+driver,ALB,A. Albon,WIL,1,13.9,14,,12
+driver,HUL,N. Hulkenberg,AUD,1,9.8,16,,22
+driver,BOR,G. Bortoleto,AUD,1,12.5,16,,9
+driver,BEA,O. Bearman,HAS,1,11.2,16,,7
+driver,OCO,E. Ocon,HAS,1,9.9,18,,11
+driver,BOT,V. Bottas,CAD,1,4.5,19,,19
+driver,PER,S. Perez,CAD,1,6.4,19,,16
+driver,COL,F. Colapinto,ALP,1,6.7,19,,14
+driver,LIN,A. Lindblad,RBS,1,6.6,18,,8
+team,MER,MER,,1,28.8,,,
+team,MCL,MCL,,1,25.7,,,
+team,RBR,RBR,,1,22.4,,,
+team,FER,FER,,1,23.7,,,
+team,AMR,AMR,,1,17,,,
+team,WIL,WIL,,1,16.1,,,
+team,RBS,RBS,,1,17.4,,,
+team,ALP,ALP,,1,14.2,,,
+team,AUD,AUD,,1,9.8,,,
+team,CAD,CAD,,1,7.3,,,
+team,HAS,HAS,,1,8,,,
+driver,RUS,G. Russell,MER,2,29.5,2,171,2
+driver,ANT,K. Antonelli,MER,2,27.5,5,174,1
+driver,VER,M. Verstappen,RBR,2,26.2,4,132,16
+driver,LEC,C. Leclerc,FER,2,24.8,6,164,4
+driver,NOR,L. Norris,MCL,2,24.7,6,107,20
+driver,HAM,L. Hamilton,FER,2,24.1,7,169,3
+driver,PIA,O. Piastri,MCL,2,22.1,8,50,19
+driver,GAS,P. Gasly,ALP,2,19.8,10,143,6
+driver,ALO,F. Alonso,AMR,2,18.2,10,78,17
+driver,HAD,I. Hadjar,RBR,2,18.1,11,118,8
+driver,LAW,L. Lawson,RBS,2,16.5,13,142,7
+driver,SAI,C. Sainz Jr,WIL,2,15.9,12,123,9
+driver,BEA,O. Bearman,HAS,2,13.2,15,186,5
+driver,STR,L. Stroll,AMR,2,13,13,75,18
+driver,ALB,A. Albon,WIL,2,11.9,15,68,22
+driver,HUL,N. Hulkenberg,AUD,2,11.8,16,81,11
+driver,OCO,E. Ocon,HAS,2,10.7,17,124,14
+driver,BOR,G. Bortoleto,AUD,2,10.5,16,90,21
+driver,COL,F. Colapinto,ALP,2,8.7,18,130,10
+driver,LIN,A. Lindblad,RBS,2,8.6,17,143,12
+driver,PER,S. Perez,CAD,2,7.3,19,102,15
+driver,BOT,V. Bottas,CAD,2,6.5,19,94,13
+team,MER,MER,,2,29.1,,177,
+team,FER,FER,,2,24.6,,163,
+team,MCL,MCL,,2,22.7,,77,
+team,RBR,RBR,,2,21.7,,110,
+team,RBS,RBS,,2,17.3,,123,
+team,ALP,ALP,,2,16.8,,121,
+team,AMR,AMR,,2,15.7,,72,
+team,WIL,WIL,,2,13.8,,78,
+team,HAS,HAS,,2,11,,125,
+team,AUD,AUD,,2,9.7,,80,
+team,CAD,CAD,,2,9,,83,
+driver,RUS,G. Russell,MER,3,29.5,3,164,4
+driver,ANT,K. Antonelli,MER,3,28.7,4,173,1
+driver,LEC,C. Leclerc,FER,3,26.3,5,162,3
+driver,NOR,L. Norris,MCL,3,24.7,6,118,5
+driver,VER,M. Verstappen,RBR,3,24.6,5,133,8
+driver,PIA,O. Piastri,MCL,3,24.1,8,91,2
+driver,HAM,L. Hamilton,FER,3,23.4,7,158,6
+driver,GAS,P. Gasly,ALP,3,21.7,10,143,7
+driver,LAW,L. Lawson,RBS,3,18,12,140,9
+driver,HAD,I. Hadjar,RBR,3,17.7,11,117,12
+driver,ALO,F. Alonso,AMR,3,16.2,11,79,18
+driver,SAI,C. Sainz Jr,WIL,3,14.9,13,115,15
+driver,HUL,N. Hulkenberg,AUD,3,13.3,15,95,11
+driver,OCO,E. Ocon,HAS,3,12.7,16,130,10
+driver,BOR,G. Bortoleto,AUD,3,11.5,16,98,13
+driver,BEA,O. Bearman,HAS,3,11.2,15,142,22
+driver,STR,L. Stroll,AMR,3,11,14,69,21
+driver,ALB,A. Albon,WIL,3,9.9,16,70,20
+driver,LIN,A. Lindblad,RBS,3,9.7,17,131,14
+driver,COL,F. Colapinto,ALP,3,9,17,117,16
+driver,PER,S. Perez,CAD,3,7.5,18,97,17
+driver,BOT,V. Bottas,CAD,3,6.2,19,87,19
+team,MER,MER,,3,29.3,,175,
+team,FER,FER,,3,24.6,,161,
+team,MCL,MCL,,3,23.8,,106,
+team,RBR,RBR,,3,21.8,,116,
+team,ALP,ALP,,3,17.5,,120,
+team,RBS,RBS,,3,17.3,,120,
+team,AMR,AMR,,3,12.8,,69,
+team,WIL,WIL,,3,12.7,,80,
+team,HAS,HAS,,3,11.2,,114,
+team,AUD,AUD,,3,10.8,,92,
+team,CAD,CAD,,3,8.4,,80,
+driver,ANT,K. Antonelli,MER,4,28.8,4,176,1
+driver,RUS,G. Russell,MER,4,28.7,3,165,4
+driver,NOR,L. Norris,MCL,4,26.7,6,136,2
+driver,LEC,C. Leclerc,FER,4,25.9,6,161,8
+driver,PIA,O. Piastri,MCL,4,25.7,8,114,3
+driver,VER,M. Verstappen,RBR,4,25.3,5,144,5
+driver,HAM,L. Hamilton,FER,4,23.3,7,157,6
+driver,GAS,P. Gasly,ALP,4,19.7,11,130,21
+driver,SAI,C. Sainz Jr,WIL,4,16.4,12,122,9
+driver,LAW,L. Lawson,RBS,4,16,13,126,20
+driver,HAD,I. Hadjar,RBR,4,15.7,13,100,22
+driver,ALO,F. Alonso,AMR,4,15.1,12,85,15
+driver,OCO,E. Ocon,HAS,4,13.2,15,127,13
+driver,BEA,O. Bearman,HAS,4,12.9,15,140,11
+driver,BOR,G. Bortoleto,AUD,4,12.7,15,105,12
+driver,ALB,A. Albon,WIL,4,11.9,15,87,10
+driver,HUL,N. Hulkenberg,AUD,4,11.3,16,91,19
+driver,COL,F. Colapinto,ALP,4,11,16,135,7
+driver,LIN,A. Lindblad,RBS,4,10.5,16,125,14
+driver,STR,L. Stroll,AMR,4,10.4,15,74,17
+driver,PER,S. Perez,CAD,4,8.1,18,98,16
+driver,BOT,V. Bottas,CAD,4,6,19,85,18
+team,MER,MER,,4,29.4,,174,
+team,MCL,MCL,,4,24.7,,120,
+team,FER,FER,,4,24.6,,158,
+team,RBR,RBR,,4,20,,111,
+team,ALP,ALP,,4,18,,118,
+team,RBS,RBS,,4,15.3,,113,
+team,WIL,WIL,,4,15,,90,
+team,HAS,HAS,,4,12.6,,113,
+team,AMR,AMR,,4,11.3,,74,
+team,AUD,AUD,,4,11,,92,
+team,CAD,CAD,,4,7.3,,80,
+driver,ANT,K. Antonelli,MER,5,30.1,,180,1
+driver,RUS,G. Russell,MER,5,26.7,,156,19
+driver,VER,M. Verstappen,RBR,5,26.2,,150,3
+driver,LEC,C. Leclerc,FER,5,25.9,,163,4
+driver,HAM,L. Hamilton,FER,5,25.3,,163,2
+driver,NOR,L. Norris,MCL,5,24.7,,133,18
+driver,PIA,O. Piastri,MCL,5,24.6,,121,11
+driver,GAS,P. Gasly,ALP,5,19.3,,132,8
+driver,SAI,C. Sainz Jr,WIL,5,18,,128,9
+driver,LAW,L. Lawson,RBS,5,18,,135,7
+driver,HAD,I. Hadjar,RBR,5,17.7,,113,5
+driver,BEA,O. Bearman,HAS,5,14.5,,140,10
+driver,ALO,F. Alonso,AMR,5,13.1,,80,20
+driver,COL,F. Colapinto,ALP,5,13,,145,6
+driver,HUL,N. Hulkenberg,AUD,5,12.5,,98,12
+driver,BOR,G. Bortoleto,AUD,5,12.5,,107,13
+driver,OCO,E. Ocon,HAS,5,12.4,,124,14
+driver,STR,L. Stroll,AMR,5,9.9,,81,15
+driver,ALB,A. Albon,WIL,5,9.9,,81,21
+driver,LIN,A. Lindblad,RBS,5,8.5,,110,22
+driver,PER,S. Perez,CAD,5,7.4,,96,17
+driver,BOT,V. Bottas,CAD,5,6.2,,89,16
+team,MER,MER,,5,28.3,,168,
+team,FER,FER,,5,25.9,,158,
+team,MCL,MCL,,5,23.5,,120,
+team,RBR,RBR,,5,21.8,,120,
+team,ALP,ALP,,5,19,,121,
+team,WIL,WIL,,5,14.2,,90,
+team,RBS,RBS,,5,13.8,,108,
+team,HAS,HAS,,5,13,,111,
+team,AUD,AUD,,5,12.5,,96,
+team,AMR,AMR,,5,9.5,,74,
+team,CAD,CAD,,5,7.2,,79,
+driver,ANT,K. Antonelli,MER,6,29.9,,179,1
+driver,HAM,L. Hamilton,FER,6,27,,165,2
+driver,PIA,O. Piastri,MCL,6,25.3,,130,5
+driver,RUS,G. Russell,MER,6,24.7,,150,12
+driver,VER,M. Verstappen,RBR,6,24.2,,139,22
+driver,LEC,C. Leclerc,FER,6,23.9,,153,17
+driver,NOR,L. Norris,MCL,6,22.7,,125,19
+driver,LAW,L. Lawson,RBS,6,20,,140,6
+driver,GAS,P. Gasly,ALP,6,19.7,,134,3
+driver,HAD,I. Hadjar,RBR,6,19.7,,126,4
+driver,SAI,C. Sainz Jr,WIL,6,16,,122,16
+driver,ALO,F. Alonso,AMR,6,14.7,,90,10
+driver,OCO,E. Ocon,HAS,6,14.4,,128,9
+driver,BOR,G. Bortoleto,AUD,6,13.8,,110,11
+driver,HUL,N. Hulkenberg,AUD,6,12.6,,99,13
+driver,BEA,O. Bearman,HAS,6,12.5,,127,20
+driver,COL,F. Colapinto,ALP,6,12.3,,137,14
+driver,ALB,A. Albon,WIL,6,11.9,,94,8
+driver,LIN,A. Lindblad,RBS,6,10.5,,121,7
+driver,PER,S. Perez,CAD,6,8.4,,97,15
+driver,STR,L. Stroll,AMR,6,8.4,,80,18
+driver,BOT,V. Bottas,CAD,6,4.8,,83,21
+team,MER,MER,,6,28.7,,165,
+team,FER,FER,,6,26.2,,155,
+team,MCL,MCL,,6,22.6,,121,
+team,RBR,RBR,,6,21.9,,122,
+team,ALP,ALP,,6,18.5,,121,
+team,RBS,RBS,,6,16.5,,113,
+team,WIL,WIL,,6,14.2,,94,
+team,AUD,AUD,,6,12.4,,98,
+team,HAS,HAS,,6,12.1,,108,
+team,AMR,AMR,,6,8.8,,76,
+team,CAD,CAD,,6,6.4,,79,
+driver,HAM,L. Hamilton,FER,7,28.7,,168,1
+driver,ANT,K. Antonelli,MER,7,27.9,,169,16
+driver,RUS,G. Russell,MER,7,26.6,,154,2
+driver,PIA,O. Piastri,MCL,7,25.8,,132,5
+driver,VER,M. Verstappen,RBR,7,25.4,,142,4
+driver,NOR,L. Norris,MCL,7,24.7,,132,3
+driver,LEC,C. Leclerc,FER,7,21.9,,146,15
+driver,HAD,I. Hadjar,RBR,7,21.2,,129,6
+driver,GAS,P. Gasly,ALP,7,20.8,,135,7
+driver,LAW,L. Lawson,RBS,7,20.3,,139,8
+driver,SAI,C. Sainz Jr,WIL,7,16.1,,121,12
+driver,BOR,G. Bortoleto,AUD,7,14.8,,112,11
+driver,OCO,E. Ocon,HAS,7,14.1,,125,13
+driver,COL,F. Colapinto,ALP,7,14.1,,135,10
+driver,ALO,F. Alonso,AMR,7,12.7,,88,19
+driver,LIN,A. Lindblad,RBS,7,12.5,,123,9
+driver,BEA,O. Bearman,HAS,7,11.5,,121,17
+driver,HUL,N. Hulkenberg,AUD,7,11.2,,96,20
+driver,ALB,A. Albon,WIL,7,10.3,,91,18
+driver,PER,S. Perez,CAD,7,9.2,,99,14
+driver,STR,L. Stroll,AMR,7,6.4,,75,22
+driver,BOT,V. Bottas,CAD,7,4.1,,78,21
+team,MER,MER,,7,27.8,,162,
+team,FER,FER,,7,25.2,,153,
+team,MCL,MCL,,7,24.4,,126,
+team,RBR,RBR,,7,23.2,,126,
+team,ALP,ALP,,7,18.2,,122,
+team,RBS,RBS,,7,17.2,,116,
+team,WIL,WIL,,7,13,,94,
+team,AUD,AUD,,7,12.9,,99,
+team,HAS,HAS,,7,12.1,,106,
+team,AMR,AMR,,7,7.6,,74,
+team,CAD,CAD,,7,6.4,,78,

gr_analytics-0.4.0/gr_analytics/get_positions.py

@@ -0,0 +1,119 @@
+"""
+Fetch official F1 classified finishing positions via FastF1.
+
+These feed the ``finishing_position`` column of ``driver_data.csv`` (the
+round-N row holds each driver's finishing position in race N), which
+``calculate_eight_race_averages()`` rolls into GridRival's eight-race average.
+
+FastF1 reads the official F1 timing data, so ``Position`` is the *classified*
+finishing position — DNF/DNS drivers keep the position they are classified in,
+matching GridRival's convention. Driver codes are FastF1's three-letter
+``Abbreviation`` values, which are the FIA codes used as ``driver_abbr`` in
+driver_data.csv (VER, RUS, ...).
+
+``fastf1`` is an optional dependency (``pip install fastf1``) and is imported
+lazily, so importing :mod:`gr_analytics` never requires it. Fetching a session
+needs network access; results are cached so repeat calls are offline-fast.
+
+Examples
+--------
+>>> from gr_analytics.get_positions import race_finishing_positions
+>>> race_finishing_positions(2026, 1)          # round 1 (season opener)
+driver_abbr
+RUS     1
+ANT     2
+...
+Name: finishing_position, dtype: int64
+
+>>> # Long-format rows for new rounds, shaped like driver_data's per-race data
+>>> from gr_analytics.get_positions import finishing_positions_frame
+>>> finishing_positions_frame(2026, [5, 6])
+"""
+
+from pathlib import Path
+
+import pandas as pd
+
+# Cache outside the repo so fetched timing data isn't committed or shipped.
+_DEFAULT_CACHE = Path.home() / ".cache" / "fastf1"
+
+
+def _enable_cache(cache_dir=None) -> None:
+    """Point FastF1 at a cache directory, creating it if needed."""
+    import fastf1
+
+    cache_dir = Path(cache_dir) if cache_dir is not None else _DEFAULT_CACHE
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    fastf1.Cache.enable_cache(str(cache_dir))
+
+
+def race_finishing_positions(year: int, rnd: int, cache_dir=None) -> pd.Series:
+    """
+    Classified finishing positions for a single race.
+
+    Parameters
+    ----------
+    year : int
+        Season, e.g. ``2026``.
+    rnd : int
+        Championship round number (1 = season opener).
+    cache_dir : path-like, optional
+        FastF1 cache location. Defaults to ``~/.cache/fastf1``.
+
+    Returns
+    -------
+    pandas.Series
+        Finishing position (int) indexed by three-letter ``driver_abbr``,
+        sorted by position. Drivers without a classified position (e.g. DNS
+        with no time) are dropped. Series name is ``finishing_position`` to
+        match driver_data.csv.
+    """
+    import fastf1
+
+    _enable_cache(cache_dir)
+
+    session = fastf1.get_session(year, rnd, "R")
+    # Results are always loaded; skip the heavy laps/telemetry/weather data.
+    session.load(laps=False, telemetry=False, weather=False, messages=False)
+
+    positions = (
+        session.results.set_index("Abbreviation")["Position"]
+        .dropna()
+        .astype(int)
+        .sort_values()
+    )
+    positions.index.name = "driver_abbr"
+    positions.name = "finishing_position"
+    return positions
+
+
+def finishing_positions_frame(year: int, rounds, cache_dir=None) -> pd.DataFrame:
+    """
+    Long-format finishing positions for one or more rounds.
+
+    Parameters
+    ----------
+    year : int
+        Season, e.g. ``2026``.
+    rounds : int or iterable of int
+        Round number(s) to fetch.
+    cache_dir : path-like, optional
+        FastF1 cache location. Defaults to ``~/.cache/fastf1``.
+
+    Returns
+    -------
+    pandas.DataFrame
+        Columns ``round``, ``driver_abbr``, ``finishing_position`` — the shape
+        of the per-race data recorded in driver_data.csv, handy for filling in
+        new rounds.
+    """
+    if isinstance(rounds, int):
+        rounds = [rounds]
+
+    frames = []
+    for rnd in rounds:
+        frame = race_finishing_positions(year, rnd, cache_dir=cache_dir).reset_index()
+        frame.insert(0, "round", rnd)
+        frames.append(frame)
+
+    return pd.concat(frames, ignore_index=True)

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/gr_analytics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gr_analytics
-Version: 0.3.2
+Version: 0.4.0
 Summary: Scoring and salary calculation for GridRival fantasy F1
 Author: nce8
 License-Expression: MIT
@@ -14,6 +14,8 @@ Description-Content-Type: text/markdown
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: numpy
+Provides-Extra: fastf1
+Requires-Dist: fastf1; extra == "fastf1"
 
 # gr_analytics
 
@@ -39,7 +41,8 @@ scenario = pd.read_csv("my_race.csv")
 # Score the event (defaults to the latest round in driver_data)
 result = score_event(scenario)
 
-# Or score a specific round
+# Or score a specific race: pass the round one less than the race
+# (round=1 is the post-race-1 state, so this scores race 2). See "Driver Data".
 result = score_event(scenario, round=1)
 
 # Score your specific team selection
@@ -135,19 +138,31 @@ Bundled driver data (`gr_analytics/data/driver_data.csv`) contains starting sala
 - `round=0` — pre-season (before Australia 2026)
 - `round=1` — post-Australia 2026
 
+Each `round=N` row holds the state **after** race N: the post-race salaries,
+the finishing position from race N, and the 8-race average including race N.
+
+**Round semantics for `score_event`:** the `round` argument is that
+post-race state, so `score_event(scenario, round=N)` scores the race that
+*follows* it. Pass the round **one less** than the race you're scoring:
+`round=0` scores race 1 (off the pre-season seeds), `round=1` scores race 2,
+and so on. Improvement points therefore compare each finish to the 8-race
+average *going into* that race (`calculate_eight_race_averages(through_round=round)`).
+
 ## Eight-Race Average
 
 GridRival's "8 race average" can be computed instead of entered by hand.
 GridRival seeds the season with 8 slots holding a hard-coded initial
 average (the `round=0` values in driver_data); each race replaces one
 slot with the driver's classified finishing position, and the displayed
-value is the **ceiling** of the slot mean. Race finishing positions live
-in `gr_analytics/data/race_results.csv`.
+value is the **ceiling** of the slot mean. Each driver's finishing
+position per race is recorded in the `finishing_position` column of
+`driver_data.csv` (the `round=N` row holds the finish from race N), so
+the average is derived entirely from `driver_data`.
 
 ```python
 from gr_analytics import calculate_eight_race_averages, eight_race_average
 
-# All drivers, after the latest round in race_results.csv
+# All drivers, after the latest round with recorded finishing positions
 calculate_eight_race_averages()
 
 # All drivers, after round 2
@@ -160,6 +175,12 @@ eight_race_average(1, [6, 16])
 This reproduces GridRival's displayed values exactly for all rounds so
 far (verified in `tests/test_eight_race_average.py`).
 
+`score_event` uses this computed average for improvement points (the value
+*going into* the race, i.e. `calculate_eight_race_averages(through_round=round)`)
+rather than the stored `eight_race_average` column. That column is kept only as
+GridRival's transcribed ground-truth/test oracle and may be blank for recent
+rounds; scoring no longer depends on it.
+
 ## Lineup Optimisation
 
 `optimal_lineup` uses mixed-integer linear programming (via `scipy.optimize.milp`) to find the best 5-driver + 1-constructor lineup within a salary budget.

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/gr_analytics.egg-info/SOURCES.txt

@@ -1,12 +1,12 @@
 README.md
 pyproject.toml
 gr_analytics/__init__.py
+gr_analytics/get_positions.py
 gr_analytics.egg-info/PKG-INFO
 gr_analytics.egg-info/SOURCES.txt
 gr_analytics.egg-info/dependency_links.txt
 gr_analytics.egg-info/requires.txt
 gr_analytics.egg-info/top_level.txt
 gr_analytics/data/driver_data.csv
-gr_analytics/data/race_results.csv
 tests/test_eight_race_average.py
 tests/test_scoring.py

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/gr_analytics.egg-info/requires.txt

@@ -1,3 +1,6 @@
 pandas
 scipy
 numpy
+
+[fastf1]
+fastf1

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/gr_analytics.egg-info/top_level.txt

@@ -1,3 +1 @@
-dist
 gr_analytics
-tests

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gr_analytics"
-version = "0.3.2"
+version = "0.4.0"
 description = "Scoring and salary calculation for GridRival fantasy F1"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -18,11 +18,16 @@ classifiers = [
 ]
 dependencies = ["pandas", "scipy", "numpy"]
 
+[project.optional-dependencies]
+# Only needed for gr_analytics.get_positions (fetching finishing positions).
+fastf1 = ["fastf1"]
+
 [project.urls]
 Homepage = "https://github.com/nce8/gr_analytics"
 
 [tool.setuptools.packages.find]
 where = ["."]
+include = ["gr_analytics*"]
 
 [tool.setuptools.package-data]
 gr_analytics = ["data/*.csv"]

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/tests/test_eight_race_average.py

@@ -13,7 +13,6 @@ from gr_analytics import (
     calculate_eight_race_averages,
     driver_data,
     eight_race_average,
-    race_results,
 )
 
 _TESTS_DIR = Path(__file__).parent
@@ -69,8 +68,8 @@ def _rounds_with_recorded_averages():
     """Rounds whose driver rows have GridRival eight_race_average values.
 
     Later rounds may be entered with only salary/points (eight_race_average
-    left blank until the corresponding race_results are added), so we only
-    check rounds where GridRival's own values exist to compare against.
+    left blank until the corresponding finishing positions are added), so we
+    only check rounds where GridRival's own values exist to compare against.
     """
     dd = driver_data()
     drivers = dd[dd["type"] == "driver"]
@@ -99,7 +98,11 @@ class TestAgreementWithGridRival:
         )
 
     def test_default_round_is_latest(self):
-        latest = race_results()["round"].max()
+        drivers = driver_data()
+        drivers = drivers[drivers["type"] == "driver"]
+        latest = int(
+            drivers.loc[drivers["finishing_position"].notna(), "round"].max()
+        )
         pd.testing.assert_series_equal(
             calculate_eight_race_averages(),
             calculate_eight_race_averages(through_round=latest),
@@ -107,25 +110,34 @@ class TestAgreementWithGridRival:
 
 
 # ---------------------------------------------------------------------------
-# race_results.csv data integrity
+# Recorded finishing-position data integrity (driver_data.csv)
 # ---------------------------------------------------------------------------
 
 
-class TestRaceResultsData:
-    def test_positions_complete_each_round(self):
-        rr = race_results()
-        for rnd, group in rr.groupby("round"):
-            positions = sorted(group["finishing_position"])
-            assert positions == list(range(1, len(group) + 1)), (
-                f"Round {rnd} positions are not a complete 1..n sequence"
-            )
+def _finishes_by_round():
+    """driver_data finishing positions, one frame per round that records them."""
+    drivers = driver_data()
+    drivers = drivers[(drivers["type"] == "driver") & drivers["finishing_position"].notna()]
+    return {rnd: group for rnd, group in drivers.groupby("round")}
+
+
+class TestFinishingPositionData:
+    @pytest.mark.parametrize("rnd", sorted(_finishes_by_round()))
+    def test_positions_complete_each_round(self, rnd):
+        group = _finishes_by_round()[rnd]
+        positions = sorted(group["finishing_position"].astype(int))
+        assert positions == list(range(1, len(group) + 1)), (
+            f"Round {rnd} finishing positions are not a complete 1..n sequence"
+        )
 
     def test_round_one_matches_australia_fixture(self):
         """Race 1 positions must agree with the Australia scenario fixture."""
         australia = pd.read_csv(_TESTS_DIR / "test_australia.csv").set_index(
             "driver_abbr"
         )
-        rr = race_results()
-        round_one = rr[rr["round"] == 1].set_index("driver_abbr")
+        drivers = driver_data()
+        round_one = drivers[
+            (drivers["type"] == "driver") & (drivers["round"] == 1)
+        ].set_index("driver_abbr")
         for abbr, expected in australia["finishing_position"].items():
             assert round_one.at[abbr, "finishing_position"] == expected

{gr_analytics-0.3.2 → gr_analytics-0.4.0}/tests/test_scoring.py

@@ -13,6 +13,8 @@ import pytest
 from gr_analytics import (
     _score_constructors,
     _score_drivers,
+    calculate_eight_race_averages,
+    driver_data,
     optimal_lineup,
     score_event,
 )
@@ -415,6 +417,59 @@ class TestAustraliaRound0:
         assert _get_row(australia_result, abbr)["salary_change"] == exp_change
 
 
+# ---------------------------------------------------------------------------
+# score_event derives the eight-race average from driver_data
+# ---------------------------------------------------------------------------
+
+
+class TestScoreEventEightRaceAverage:
+    """score_event computes the eight-race average from the recorded
+    finishing positions (calculate_eight_race_averages) rather than trusting
+    the hard-coded eight_race_average column. So it works for rounds whose
+    GridRival value was never transcribed (the column is blank), and uses the
+    average going *into* the race being scored (through_round == round)."""
+
+    @staticmethod
+    def _scenario_from_finishes(rnd):
+        d = driver_data()
+        d = d[(d["type"] == "driver") & (d["round"] == rnd)][
+            ["driver_abbr", "finishing_position"]
+        ].copy()
+        d["finishing_position"] = d["finishing_position"].astype(int)
+        return pd.DataFrame(
+            {
+                "driver_abbr": d["driver_abbr"],
+                "qualifying_position": d["finishing_position"],
+                "race_position": d["finishing_position"],
+            }
+        )
+
+    @pytest.mark.parametrize("rnd", [1, 2, 3, 4, 5, 6, 7])
+    def test_uses_average_through_round(self, rnd):
+        """The average score_event applies equals calculate_eight_race_averages
+        through that round — the state going into the race scored at `round`."""
+        result = score_event(self._scenario_from_finishes(rnd), round=rnd)
+        used = (
+            result[result["type"] == "driver"]
+            .set_index("driver_abbr")["eight_race_average"]
+            .astype(int)
+            .sort_index()
+        )
+        expected = (
+            calculate_eight_race_averages(through_round=rnd).astype(int).sort_index()
+        )
+        pd.testing.assert_series_equal(used, expected, check_names=False)
+
+    @pytest.mark.parametrize("rnd", [5, 6, 7])
+    def test_blank_column_rounds_score_finite(self, rnd):
+        """Rounds whose eight_race_average column is blank must still score —
+        before the average was computed, this raised on NaN improvement."""
+        result = score_event(self._scenario_from_finishes(rnd), round=rnd)
+        drivers = result[result["type"] == "driver"]
+        assert drivers["pts_improvement"].notna().all()
+        assert drivers["points_earned"].notna().all()
+
+
 # ---------------------------------------------------------------------------
 # optimal_lineup star_salary_cap tests
 # ---------------------------------------------------------------------------

gr_analytics-0.3.2/gr_analytics/data/driver_data.csv

@@ -1,232 +0,0 @@
-type,driver_abbr,driver_name,driver_team,round,starting_salary,eight_race_average,points_from_last_race
-driver,VER,M. Verstappen,RBR,0,30,1,
-driver,RUS,G. Russell,MER,0,28.7,2,
-driver,NOR,L. Norris,MCL,0,27.4,3,
-driver,PIA,O. Piastri,MCL,0,26.1,4,
-driver,ANT,K. Antonelli,MER,0,24.8,5,
-driver,LEC,C. Leclerc,FER,0,23.5,6,
-driver,ALO,F. Alonso,AMR,0,22.2,7,
-driver,HAM,L. Hamilton,FER,0,20.9,8,
-driver,HAD,I. Hadjar,RBR,0,19.6,9,
-driver,GAS,P. Gasly,ALP,0,18.3,10,
-driver,STR,L. Stroll,AMR,0,17,11,
-driver,SAI,C. Sainz Jr,WIL,0,15.7,12,
-driver,LAW,L. Lawson,RBS,0,14.4,13,
-driver,ALB,A. Albon,WIL,0,13.1,14,
-driver,HUL,N. Hulkenberg,AUD,0,11.8,15,
-driver,BOR,G. Bortoleto,AUD,0,10.5,16,
-driver,BEA,O. Bearman,HAS,0,9.2,17,
-driver,OCO,E. Ocon,HAS,0,7.9,18,
-driver,BOT,V. Bottas,CAD,0,4.7,19,
-driver,PER,S. Perez,CAD,0,4.7,19,
-driver,COL,F. Colapinto,ALP,0,4.7,19,
-driver,LIN,A. Lindblad,RBS,0,4.6,19,
-team,MER,MER,,0,28.5,1,
-team,MCL,MCL,,0,28.5,2,
-team,RBR,RBR,,0,25,3,
-team,FER,FER,,0,22.5,4,
-team,AMR,AMR,,0,20,5,
-team,WIL,WIL,,0,17.5,6,
-team,RBS,RBS,,0,15,7,
-team,ALP,ALP,,0,12.5,8,
-team,AUD,AUD,,0,10,9,
-team,CAD,CAD,,0,7.5,10,
-team,HAS,HAS,,0,5,11,
-driver,VER,M. Verstappen,RBR,1,28.2,2,
-driver,RUS,G. Russell,MER,1,29.6,2,
-driver,NOR,L. Norris,MCL,1,26.7,4,
-driver,PIA,O. Piastri,MCL,1,24.1,7,
-driver,ANT,K. Antonelli,MER,1,25.9,5,
-driver,LEC,C. Leclerc,FER,1,24.5,6,
-driver,ALO,F. Alonso,AMR,1,20.2,9,
-driver,HAM,L. Hamilton,FER,1,22.1,8,
-driver,HAD,I. Hadjar,RBR,1,17.6,11,
-driver,GAS,P. Gasly,ALP,1,18.3,10,
-driver,STR,L. Stroll,AMR,1,15,12,
-driver,SAI,C. Sainz Jr,WIL,1,13.9,13,
-driver,LAW,L. Lawson,RBS,1,14.5,13,
-driver,ALB,A. Albon,WIL,1,13.9,14,
-driver,HUL,N. Hulkenberg,AUD,1,9.8,16,
-driver,BOR,G. Bortoleto,AUD,1,12.5,16,
-driver,BEA,O. Bearman,HAS,1,11.2,16,
-driver,OCO,E. Ocon,HAS,1,9.9,18,
-driver,BOT,V. Bottas,CAD,1,4.5,19,
-driver,PER,S. Perez,CAD,1,6.4,19,
-driver,COL,F. Colapinto,ALP,1,6.7,19,
-driver,LIN,A. Lindblad,RBS,1,6.6,18,
-team,MER,MER,,1,28.8,,
-team,MCL,MCL,,1,25.7,,
-team,RBR,RBR,,1,22.4,,
-team,FER,FER,,1,23.7,,
-team,AMR,AMR,,1,17,,
-team,WIL,WIL,,1,16.1,,
-team,RBS,RBS,,1,17.4,,
-team,ALP,ALP,,1,14.2,,
-team,AUD,AUD,,1,9.8,,
-team,CAD,CAD,,1,7.3,,
-team,HAS,HAS,,1,8,,
-driver,RUS,G. Russell,MER,2,29.5,2,171
-driver,ANT,K. Antonelli,MER,2,27.5,5,174
-driver,VER,M. Verstappen,RBR,2,26.2,4,132
-driver,LEC,C. Leclerc,FER,2,24.8,6,164
-driver,NOR,L. Norris,MCL,2,24.7,6,107
-driver,HAM,L. Hamilton,FER,2,24.1,7,169
-driver,PIA,O. Piastri,MCL,2,22.1,8,50
-driver,GAS,P. Gasly,ALP,2,19.8,10,143
-driver,ALO,F. Alonso,AMR,2,18.2,10,78
-driver,HAD,I. Hadjar,RBR,2,18.1,11,118
-driver,LAW,L. Lawson,RBS,2,16.5,13,142
-driver,SAI,C. Sainz Jr,WIL,2,15.9,12,123
-driver,BEA,O. Bearman,HAS,2,13.2,15,186
-driver,STR,L. Stroll,AMR,2,13,13,75
-driver,ALB,A. Albon,WIL,2,11.9,15,68
-driver,HUL,N. Hulkenberg,AUD,2,11.8,16,81
-driver,OCO,E. Ocon,HAS,2,10.7,17,124
-driver,BOR,G. Bortoleto,AUD,2,10.5,16,90
-driver,COL,F. Colapinto,ALP,2,8.7,18,130
-driver,LIN,A. Lindblad,RBS,2,8.6,17,143
-driver,PER,S. Perez,CAD,2,7.3,19,102
-driver,BOT,V. Bottas,CAD,2,6.5,19,94
-team,MER,MER,,2,29.1,,177
-team,FER,FER,,2,24.6,,163
-team,MCL,MCL,,2,22.7,,77
-team,RBR,RBR,,2,21.7,,110
-team,RBS,RBS,,2,17.3,,123
-team,ALP,ALP,,2,16.8,,121
-team,AMR,AMR,,2,15.7,,72
-team,WIL,WIL,,2,13.8,,78
-team,HAS,HAS,,2,11,,125
-team,AUD,AUD,,2,9.7,,80
-team,CAD,CAD,,2,9,,83
-driver,RUS,G. Russell,MER,3,29.5,3,164
-driver,ANT,K. Antonelli,MER,3,28.7,4,173
-driver,LEC,C. Leclerc,FER,3,26.3,5,162
-driver,NOR,L. Norris,MCL,3,24.7,6,118
-driver,VER,M. Verstappen,RBR,3,24.6,5,133
-driver,PIA,O. Piastri,MCL,3,24.1,8,91
-driver,HAM,L. Hamilton,FER,3,23.4,7,158
-driver,GAS,P. Gasly,ALP,3,21.7,10,143
-driver,LAW,L. Lawson,RBS,3,18,12,140
-driver,HAD,I. Hadjar,RBR,3,17.7,11,117
-driver,ALO,F. Alonso,AMR,3,16.2,11,79
-driver,SAI,C. Sainz Jr,WIL,3,14.9,13,115
-driver,HUL,N. Hulkenberg,AUD,3,13.3,15,95
-driver,OCO,E. Ocon,HAS,3,12.7,16,130
-driver,BOR,G. Bortoleto,AUD,3,11.5,16,98
-driver,BEA,O. Bearman,HAS,3,11.2,15,142
-driver,STR,L. Stroll,AMR,3,11,14,69
-driver,ALB,A. Albon,WIL,3,9.9,16,70
-driver,LIN,A. Lindblad,RBS,3,9.7,17,131
-driver,COL,F. Colapinto,ALP,3,9,17,117
-driver,PER,S. Perez,CAD,3,7.5,18,97
-driver,BOT,V. Bottas,CAD,3,6.2,19,87
-team,MER,MER,,3,29.3,,175
-team,FER,FER,,3,24.6,,161
-team,MCL,MCL,,3,23.8,,106
-team,RBR,RBR,,3,21.8,,116
-team,ALP,ALP,,3,17.5,,120
-team,RBS,RBS,,3,17.3,,120
-team,AMR,AMR,,3,12.8,,69
-team,WIL,WIL,,3,12.7,,80
-team,HAS,HAS,,3,11.2,,114
-team,AUD,AUD,,3,10.8,,92
-team,CAD,CAD,,3,8.4,,80
-driver,ANT,K. Antonelli,MER,4,28.8,4,176
-driver,RUS,G. Russell,MER,4,28.7,3,165
-driver,NOR,L. Norris,MCL,4,26.7,6,136
-driver,LEC,C. Leclerc,FER,4,25.9,6,161
-driver,PIA,O. Piastri,MCL,4,25.7,8,114
-driver,VER,M. Verstappen,RBR,4,25.3,5,144
-driver,HAM,L. Hamilton,FER,4,23.3,7,157
-driver,GAS,P. Gasly,ALP,4,19.7,11,130
-driver,SAI,C. Sainz Jr,WIL,4,16.4,12,122
-driver,LAW,L. Lawson,RBS,4,16,13,126
-driver,HAD,I. Hadjar,RBR,4,15.7,13,100
-driver,ALO,F. Alonso,AMR,4,15.1,12,85
-driver,OCO,E. Ocon,HAS,4,13.2,15,127
-driver,BEA,O. Bearman,HAS,4,12.9,15,140
-driver,BOR,G. Bortoleto,AUD,4,12.7,15,105
-driver,ALB,A. Albon,WIL,4,11.9,15,87
-driver,HUL,N. Hulkenberg,AUD,4,11.3,16,91
-driver,COL,F. Colapinto,ALP,4,11,16,135
-driver,LIN,A. Lindblad,RBS,4,10.5,16,125
-driver,STR,L. Stroll,AMR,4,10.4,15,74
-driver,PER,S. Perez,CAD,4,8.1,18,98
-driver,BOT,V. Bottas,CAD,4,6,19,85
-team,MER,MER,,4,29.4,,174
-team,MCL,MCL,,4,24.7,,120
-team,FER,FER,,4,24.6,,158
-team,RBR,RBR,,4,20,,111
-team,ALP,ALP,,4,18,,118
-team,RBS,RBS,,4,15.3,,113
-team,WIL,WIL,,4,15,,90
-team,HAS,HAS,,4,12.6,,113
-team,AMR,AMR,,4,11.3,,74
-team,AUD,AUD,,4,11,,92
-team,CAD,CAD,,4,7.3,,80
-driver,ANT,K. Antonelli,MER,5,30.1,,180
-driver,RUS,G. Russell,MER,5,26.7,,156
-driver,VER,M. Verstappen,RBR,5,26.2,,150
-driver,LEC,C. Leclerc,FER,5,25.9,,163
-driver,HAM,L. Hamilton,FER,5,25.3,,163
-driver,NOR,L. Norris,MCL,5,24.7,,133
-driver,PIA,O. Piastri,MCL,5,24.6,,121
-driver,GAS,P. Gasly,ALP,5,19.3,,132
-driver,SAI,C. Sainz Jr,WIL,5,18,,128
-driver,LAW,L. Lawson,RBS,5,18,,135
-driver,HAD,I. Hadjar,RBR,5,17.7,,113
-driver,BEA,O. Bearman,HAS,5,14.5,,140
-driver,ALO,F. Alonso,AMR,5,13.1,,80
-driver,COL,F. Colapinto,ALP,5,13,,145
-driver,HUL,N. Hulkenberg,AUD,5,12.5,,98
-driver,BOR,G. Bortoleto,AUD,5,12.5,,107
-driver,OCO,E. Ocon,HAS,5,12.4,,124
-driver,STR,L. Stroll,AMR,5,9.9,,81
-driver,ALB,A. Albon,WIL,5,9.9,,81
-driver,LIN,A. Lindblad,RBS,5,8.5,,110
-driver,PER,S. Perez,CAD,5,7.4,,96
-driver,BOT,V. Bottas,CAD,5,6.2,,89
-team,MER,MER,,5,28.3,,168
-team,FER,FER,,5,25.9,,158
-team,MCL,MCL,,5,23.5,,120
-team,RBR,RBR,,5,21.8,,120
-team,ALP,ALP,,5,19,,121
-team,WIL,WIL,,5,14.2,,90
-team,RBS,RBS,,5,13.8,,108
-team,HAS,HAS,,5,13,,111
-team,AUD,AUD,,5,12.5,,96
-team,AMR,AMR,,5,9.5,,74
-team,CAD,CAD,,5,7.2,,79
-driver,ANT,K. Antonelli,MER,6,29.9,,179
-driver,HAM,L. Hamilton,FER,6,27,,165
-driver,PIA,O. Piastri,MCL,6,25.3,,130
-driver,RUS,G. Russell,MER,6,24.7,,150
-driver,VER,M. Verstappen,RBR,6,24.2,,139
-driver,LEC,C. Leclerc,FER,6,23.9,,153
-driver,NOR,L. Norris,MCL,6,22.7,,125
-driver,LAW,L. Lawson,RBS,6,20,,140
-driver,GAS,P. Gasly,ALP,6,19.7,,134
-driver,HAD,I. Hadjar,RBR,6,19.7,,126
-driver,SAI,C. Sainz Jr,WIL,6,16,,122
-driver,ALO,F. Alonso,AMR,6,14.7,,90
-driver,OCO,E. Ocon,HAS,6,14.4,,128
-driver,BOR,G. Bortoleto,AUD,6,13.8,,110
-driver,HUL,N. Hulkenberg,AUD,6,12.6,,99
-driver,BEA,O. Bearman,HAS,6,12.5,,127
-driver,COL,F. Colapinto,ALP,6,12.3,,137
-driver,ALB,A. Albon,WIL,6,11.9,,94
-driver,LIN,A. Lindblad,RBS,6,10.5,,121
-driver,PER,S. Perez,CAD,6,8.4,,97
-driver,STR,L. Stroll,AMR,6,8.4,,80
-driver,BOT,V. Bottas,CAD,6,4.8,,83
-team,MER,MER,,6,28.7,,165
-team,FER,FER,,6,26.2,,155
-team,MCL,MCL,,6,22.6,,121
-team,RBR,RBR,,6,21.9,,122
-team,ALP,ALP,,6,18.5,,121
-team,RBS,RBS,,6,16.5,,113
-team,WIL,WIL,,6,14.2,,94
-team,AUD,AUD,,6,12.4,,98
-team,HAS,HAS,,6,12.1,,108
-team,AMR,AMR,,6,8.8,,76
-team,CAD,CAD,,6,6.4,,79

gr_analytics-0.3.2/gr_analytics/data/race_results.csv

@@ -1,89 +0,0 @@
-round,driver_abbr,finishing_position
-1,RUS,1
-1,ANT,2
-1,LEC,3
-1,HAM,4
-1,NOR,5
-1,VER,6
-1,BEA,7
-1,LIN,8
-1,BOR,9
-1,GAS,10
-1,OCO,11
-1,ALB,12
-1,LAW,13
-1,COL,14
-1,SAI,15
-1,PER,16
-1,STR,17
-1,ALO,18
-1,BOT,19
-1,HAD,20
-1,PIA,21
-1,HUL,22
-2,ANT,1
-2,RUS,2
-2,HAM,3
-2,LEC,4
-2,BEA,5
-2,GAS,6
-2,LAW,7
-2,HAD,8
-2,SAI,9
-2,COL,10
-2,HUL,11
-2,LIN,12
-2,BOT,13
-2,OCO,14
-2,PER,15
-2,VER,16
-2,ALO,17
-2,STR,18
-2,PIA,19
-2,NOR,20
-2,BOR,21
-2,ALB,22
-3,ANT,1
-3,PIA,2
-3,LEC,3
-3,RUS,4
-3,NOR,5
-3,HAM,6
-3,GAS,7
-3,VER,8
-3,LAW,9
-3,OCO,10
-3,HUL,11
-3,HAD,12
-3,BOR,13
-3,LIN,14
-3,SAI,15
-3,COL,16
-3,PER,17
-3,ALO,18
-3,BOT,19
-3,ALB,20
-3,STR,21
-3,BEA,22
-4,ANT,1
-4,NOR,2
-4,PIA,3
-4,RUS,4
-4,VER,5
-4,HAM,6
-4,COL,7
-4,LEC,8
-4,SAI,9
-4,ALB,10
-4,BEA,11
-4,BOR,12
-4,OCO,13
-4,LIN,14
-4,ALO,15
-4,PER,16
-4,STR,17
-4,BOT,18
-4,HUL,19
-4,LAW,20
-4,GAS,21
-4,HAD,22