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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gr_analytics
-Version: 0.3.0
+Version: 0.3.2
 Summary: Scoring and salary calculation for GridRival fantasy F1
 Author: nce8
 License-Expression: MIT
@@ -135,6 +135,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
 
+## 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`.
+
+```python
+from gr_analytics import calculate_eight_race_averages, eight_race_average
+
+# All drivers, after the latest round in race_results.csv
+calculate_eight_race_averages()
+
+# All drivers, after round 2
+calculate_eight_race_averages(through_round=2)
+
+# Single driver from scratch: seed 1, finished P6 then P16
+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`).
+
 ## 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.0 → gr_analytics-0.3.2}/README.md

@@ -118,6 +118,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
 
+## 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`.
+
+```python
+from gr_analytics import calculate_eight_race_averages, eight_race_average
+
+# All drivers, after the latest round in race_results.csv
+calculate_eight_race_averages()
+
+# All drivers, after round 2
+calculate_eight_race_averages(through_round=2)
+
+# Single driver from scratch: seed 1, finished P6 then P16
+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`).
+
 ## 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.0 → gr_analytics-0.3.2}/gr_analytics/__init__.py

@@ -34,6 +34,16 @@ 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
 # ---------------------------------------------------------------------------
@@ -330,6 +340,75 @@ def _score_constructors(
 # ---------------------------------------------------------------------------
 
 
+def eight_race_average(initial_average: float, finishing_positions: list) -> int:
+    """
+    GridRival's eight-race average after a sequence of races.
+
+    GridRival seeds each driver's season with 8 "slots" holding a
+    hard-coded initial average. Each race replaces one slot with the
+    driver's official classified finishing position, so after 8 races the
+    initial average has fully rolled off and the value is a true rolling
+    average of the last 8 finishes. The displayed value is the ceiling of
+    the slot mean (verified against GridRival's displayed values for
+    rounds 1-4 of 2026).
+
+    Parameters
+    ----------
+    initial_average : float
+        The hard-coded season-start average (round 0 of driver_data).
+    finishing_positions : list of int
+        Classified finishing positions in every race so far, oldest first.
+
+    Returns
+    -------
+    int
+        The eight-race average as GridRival displays it.
+    """
+    slots = [initial_average] * 8 + [int(p) for p in finishing_positions]
+    return math.ceil(sum(slots[-8:]) / 8)
+
+
+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).
+
+    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.
+
+    Returns
+    -------
+    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"]
+    )
+
+    results = race_results()
+    if through_round is None:
+        through_round = results["round"].max()
+    results = results[results["round"] <= through_round].sort_values("round")
+
+    averages = {
+        abbr: eight_race_average(
+            seed,
+            results.loc[results["driver_abbr"] == abbr, "finishing_position"],
+        )
+        for abbr, seed in seeds.items()
+    }
+    return pd.Series(averages, name="eight_race_average").rename_axis("driver_abbr")
+
+
 def _validate_scenario(scenario: pd.DataFrame) -> None:
     """Check that qualifying and race positions are sequential and unique."""
     errors = []
@@ -722,4 +801,18 @@ def optimal_lineup(
             best_total = total
             best_full = full
 
+    # When balance == 0 the star bonus is zero so the loop picks
+    # arbitrarily.  Override to star the highest-points eligible driver.
+    if balance == 0.0:
+        best_full["star"] = 0
+        eligible = best_full[best_full["type"] == "driver"]
+        if star_salary_cap is not None:
+            eligible = eligible[eligible["starting_salary"] <= star_salary_cap]
+        if not eligible.empty:
+            best_full.loc[eligible["points_earned"].idxmax(), "star"] = 1
+
+    # Double points_earned for the starred driver so the returned
+    # DataFrame reflects actual fantasy points with star doubling.
+    best_full.loc[best_full["star"] == 1, "points_earned"] *= 2
+
     return best_full.drop(columns=["_locked"])

{gr_analytics-0.3.0 → gr_analytics-0.3.2}/gr_analytics/data/driver_data.csv

@@ -1,133 +1,232 @@
-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,20,
-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,6,
-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
+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

@@ -0,0 +1,89 @@
+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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gr_analytics
-Version: 0.3.0
+Version: 0.3.2
 Summary: Scoring and salary calculation for GridRival fantasy F1
 Author: nce8
 License-Expression: MIT
@@ -135,6 +135,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
 
+## 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`.
+
+```python
+from gr_analytics import calculate_eight_race_averages, eight_race_average
+
+# All drivers, after the latest round in race_results.csv
+calculate_eight_race_averages()
+
+# All drivers, after round 2
+calculate_eight_race_averages(through_round=2)
+
+# Single driver from scratch: seed 1, finished P6 then P16
+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`).
+
 ## 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.0 → gr_analytics-0.3.2}/gr_analytics.egg-info/SOURCES.txt

@@ -7,4 +7,6 @@ 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.0 → gr_analytics-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gr_analytics"
-version = "0.3.0"
+version = "0.3.2"
 description = "Scoring and salary calculation for GridRival fantasy F1"
 readme = "README.md"
 requires-python = ">=3.9"

gr_analytics-0.3.2/tests/test_eight_race_average.py

@@ -0,0 +1,131 @@
+"""
+Tests for GridRival eight-race average calculation.
+
+Run with:  pytest tests/test_eight_race_average.py -v
+"""
+
+from pathlib import Path
+
+import pandas as pd
+import pytest
+
+from gr_analytics import (
+    calculate_eight_race_averages,
+    driver_data,
+    eight_race_average,
+    race_results,
+)
+
+_TESTS_DIR = Path(__file__).parent
+
+
+# ---------------------------------------------------------------------------
+# Pure function tests (hand-calculated)
+# ---------------------------------------------------------------------------
+
+
+class TestEightRaceAverage:
+    def test_no_races_returns_seed(self):
+        assert eight_race_average(5, []) == 5
+
+    def test_one_race_hand_calculated(self):
+        # VER, Australia 2026: seed 1, finished P6
+        # (7*1 + 6) / 8 = 1.625 -> ceil -> 2
+        assert eight_race_average(1, [6]) == 2
+
+    def test_uses_ceiling_not_rounding(self):
+        # NOR, Australia 2026: seed 3, finished P5
+        # (7*3 + 5) / 8 = 3.25 -> ceil -> 4 (rounding would give 3)
+        assert eight_race_average(3, [5]) == 4
+
+    def test_exact_integer_unchanged(self):
+        # GAS, Australia 2026: seed 10, finished P10
+        # (7*10 + 10) / 8 = 10.0 exactly
+        assert eight_race_average(10, [10]) == 10
+
+    def test_two_races_hand_calculated(self):
+        # LIN, 2026: seed 19, finished P8 then P12
+        # (6*19 + 8 + 12) / 8 = 16.75 -> ceil -> 17
+        assert eight_race_average(19, [8, 12]) == 17
+
+    def test_seed_fully_rolls_off_after_eight_races(self):
+        # After 8 races the seed should not matter at all
+        positions = [1, 2, 3, 4, 5, 6, 7, 8]  # mean 4.5 -> ceil 5
+        assert eight_race_average(22, positions) == 5
+        assert eight_race_average(1, positions) == 5
+
+    def test_only_last_eight_races_count(self):
+        # First race (P22) falls out of the window on race 9
+        positions = [22] + [4] * 8
+        assert eight_race_average(10, positions) == 4
+
+
+# ---------------------------------------------------------------------------
+# Agreement with GridRival's displayed values (driver_data.csv)
+# ---------------------------------------------------------------------------
+
+
+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.
+    """
+    dd = driver_data()
+    drivers = dd[dd["type"] == "driver"]
+    have_values = drivers.groupby("round")["eight_race_average"].apply(
+        lambda s: s.notna().all()
+    )
+    return sorted(have_values[have_values].index)
+
+
+class TestAgreementWithGridRival:
+    @pytest.mark.parametrize("rnd", _rounds_with_recorded_averages())
+    def test_matches_driver_data_sheet(self, rnd):
+        """Computed averages must equal GridRival's values for every round."""
+        dd = driver_data()
+        sheet = (
+            dd[(dd["type"] == "driver") & (dd["round"] == rnd)]
+            .set_index("driver_abbr")["eight_race_average"]
+            .sort_index()
+        )
+        computed = calculate_eight_race_averages(through_round=rnd).sort_index()
+
+        mismatches = sheet[sheet != computed]
+        assert mismatches.empty, (
+            f"Round {rnd} mismatches (sheet vs computed):\n"
+            f"{pd.DataFrame({'sheet': mismatches, 'computed': computed[mismatches.index]})}"
+        )
+
+    def test_default_round_is_latest(self):
+        latest = race_results()["round"].max()
+        pd.testing.assert_series_equal(
+            calculate_eight_race_averages(),
+            calculate_eight_race_averages(through_round=latest),
+        )
+
+
+# ---------------------------------------------------------------------------
+# race_results.csv data integrity
+# ---------------------------------------------------------------------------
+
+
+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 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")
+        for abbr, expected in australia["finishing_position"].items():
+            assert round_one.at[abbr, "finishing_position"] == expected

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

@@ -647,17 +647,25 @@ class TestOptimizeForBalance:
         assert bal_abbrs == sal_abbrs
 
     def test_balance_star_assigned_when_balance_positive(self, balance_pool):
-        """When optimize_for is a positive float, a star driver should be assigned."""
+        """When optimize_for is a positive float, a star driver should be assigned
+        and their points_earned should be doubled."""
         result = optimal_lineup(balance_pool, optimize_for=0.5)
         assert (result["star"] == 1).sum() == 1
-
-    def test_balance_0_star_has_no_effect(self, balance_pool):
-        """When optimize_for=0.0, a star may be set but has no impact on lineup choice."""
-        result_sal = optimal_lineup(balance_pool, optimize_for="salary_change")
-        result_bal = optimal_lineup(balance_pool, optimize_for=0.0)
-        sal_abbrs = sorted(result_sal["driver_abbr"].dropna().tolist())
-        bal_abbrs = sorted(result_bal["driver_abbr"].dropna().tolist())
-        assert bal_abbrs == sal_abbrs
+        star_row = result[result["star"] == 1].iloc[0]
+        orig_pts = balance_pool.loc[
+            balance_pool["driver_abbr"] == star_row["driver_abbr"], "points_earned"
+        ].iloc[0]
+        assert star_row["points_earned"] == orig_pts * 2
+
+    def test_balance_0_star_assigned_to_highest_pts(self, balance_pool):
+        """When balance=0, the highest-points eligible driver is still starred
+        and their points_earned is doubled."""
+        result = optimal_lineup(balance_pool, optimize_for=0.0)
+        assert (result["star"] == 1).sum() == 1
+        star_row = result[result["star"] == 1].iloc[0]
+        # D1 has the highest points (200) in the pool
+        assert star_row["driver_abbr"] == "D1"
+        assert star_row["points_earned"] == 400.0
 
     def test_balance_out_of_range_raises(self, balance_pool):
         """optimize_for outside [0, 1] should raise ValueError."""