From 5bb349e46fbe9c63ad15379703e0d1371bae0081 Mon Sep 17 00:00:00 2001 From: Jacob Shimp Date: Fri, 14 Nov 2025 21:27:19 -0500 Subject: Bug fixes, potential implementation of playing in a league and league stats. Also, rounds playing during a league should be saved to individual statistics. --- src/main/java/design/model/ScrambleLeague.java | 6 ++++-- src/main/java/design/model/StrokeLeague.java | 6 ++++-- src/main/java/design/model/statistics/LeagueStats.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java index f5d17ee..adf2105 100644 --- a/src/main/java/design/model/ScrambleLeague.java +++ b/src/main/java/design/model/ScrambleLeague.java @@ -58,14 +58,16 @@ public class ScrambleLeague extends League { public String getType() { return "scramble"; } + @Override public void recordPlay(Golfer player, Match match, Round round){ if(!isPlayable()) return; Team team = player.getTeam(); if (team == null) return; - int strokes = round.getTotalSwings(); - team.addMemberRound(player, strokes); + int index = participants.indexOf(team); + team.addMemberRound(player, round.getTotalSwings()); match.addRound(round); + match.addRoundFor(index, round); } @Override diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java index 374a079..48889b7 100644 --- a/src/main/java/design/model/StrokeLeague.java +++ b/src/main/java/design/model/StrokeLeague.java @@ -49,11 +49,13 @@ public class StrokeLeague extends League { public String getType() { return "stroke"; } + public void recordPlay(Golfer player, Match match, Round round){ if(!isPlayable() || !participants.contains(player)) return; - int strokes = round.getTotalSwings(); - totalStrokes.merge(player, strokes, Integer::sum); + int index = participants.indexOf(player); + totalStrokes.merge(player, round.getTotalSwings(), Integer::sum); match.addRound(round); + match.addRoundFor(index, round); } @Override diff --git a/src/main/java/design/model/statistics/LeagueStats.java b/src/main/java/design/model/statistics/LeagueStats.java index a4e6950..c80df07 100644 --- a/src/main/java/design/model/statistics/LeagueStats.java +++ b/src/main/java/design/model/statistics/LeagueStats.java @@ -24,7 +24,7 @@ public class LeagueStats implements Statistics{ } public List> getStandings(){ - return league.getResults().entrySet().stream().sorted(Map.Entry.comparingByValue()).toList(); + return league.getResults().entrySet().stream().sorted(Map.Entry.comparingByValue()).>map(e -> e).toList(); } public List getWinners(){ -- cgit v1.2.3