Added HTML prize list, and test for mass-start runner finishing before the runner in the previous leg.

grahamkirby · grahamkirby · commit 0ccb5a62bebd · 2024-02-04T21:25:26.000Z
diff --git a/src/main/java/lap_race/OutputHTML.java b/src/main/java/lap_race/OutputHTML.java
@@ -8,6 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 
 public class OutputHTML extends Output {
 
@@ -16,9 +17,13 @@ public OutputHTML(final Results results) {
     }
 
     @Override
-    public void printPrizes() {
+    public void printPrizes() throws IOException {
 
-        throw new UnsupportedOperationException();
+        final OutputStream stream = Files.newOutputStream(output_directory_path.resolve(prizes_filename + ".html"));
+
+        try (final OutputStreamWriter html_writer = new OutputStreamWriter(stream)) {
+            printPrizes(html_writer);
+        }
     }
 
     @Override
@@ -58,6 +63,11 @@ public void printCombined() throws IOException {
 
             html_writer.append("""
                     <h3><strong>Results</strong></h3>
+                    """);
+
+            printPrizes(html_writer);
+
+            html_writer.append("""
                     <h4>Overall</h4>
                     """);
 
@@ -81,6 +91,38 @@ public void printCombined() throws IOException {
         }
     }
 
+    private void printPrizes(OutputStreamWriter html_writer) throws IOException {
+
+        html_writer.append("<h4>Prizes</h4>\n");
+
+        for (final Category category : CATEGORY_REPORT_ORDER)
+            printPrizes(category, html_writer);
+    }
+
+    private void printPrizes(final Category category, final OutputStreamWriter writer) throws IOException {
+
+        writer.append("<p><strong>").append(String.valueOf(category)).append("</strong></p>\n");
+        writer.append("<ol>\n");
+
+        final List<Team> category_prize_winners = results.prize_winners.get(category);
+
+        if (category_prize_winners.isEmpty())
+            writer.append("No results\n");
+
+        int position = 1;
+        for (final Team team : category_prize_winners) {
+
+            final OverallResult result = results.overall_results[results.findIndexOfTeamWithBibNumber(team.bib_number)];
+
+            writer.append("<li>").
+                    append(result.team.name).append(" (").
+                    append(result.team.category.toString()).append(") ").
+                    append(format(result.duration())).append("</li>\n");
+        }
+
+        writer.append("</ol>\n\n");
+    }
+
     private void printOverallResults(OutputStreamWriter html_writer) throws IOException {
 
         printOverallResultsHeader(html_writer);
diff --git a/src/main/java/lap_race/Results.java b/src/main/java/lap_race/Results.java
@@ -295,9 +295,9 @@ private void fillLegFinishTimes() {
 
                 final OverallResult result = overall_results[findIndexOfTeamWithBibNumber(bib_number)];
 
-                LegResult temp = result.leg_results[leg_index - 1];
-                result.leg_results[leg_index - 1] = result.leg_results[leg_index];
-                result.leg_results[leg_index] = temp;
+                final Duration temp = result.leg_results[leg_index - 1].finish_time;
+                result.leg_results[leg_index - 1].finish_time = result.leg_results[leg_index].finish_time;
+                result.leg_results[leg_index].finish_time = temp;
             }
         }
     }
@@ -459,6 +459,7 @@ private void printPrizes() throws IOException {
 
         output_text.printPrizes();
         output_PDF.printPrizes();
+        output_HTML.printPrizes();
     }
 
     private void printCombined() throws IOException {
diff --git a/src/test/java/lap_race/devils_burdens/ResultsTest.java b/src/test/java/lap_race/devils_burdens/ResultsTest.java
@@ -226,6 +226,12 @@ public void massStart_4_AllCompleted() throws Exception {
         processingCompletes("mass_start_4/all_completed");
     }
 
+    @Test
+    public void massStart_4_LegsSwapped() throws Exception {
+
+        processingCompletes("mass_start_4/legs_swapped");
+    }
+
     @Test
     public void massStart_4_DNFLeg1() throws Exception {
 
@@ -460,7 +466,7 @@ private void configureTest(String test_resource_root) throws IOException {
         // Swap these when debugging and you don't want the test results to be immediately deleted.
 
         temp_directory = Files.createTempDirectory(null);
-        // temp_directory = Paths.get("/Users/gnck/Desktop/temp");
+        //temp_directory = Paths.get("/Users/gnck/Desktop/temp");
 
         Path temp_input_sub_directory = Files.createDirectories(temp_directory.resolve("input"));
         temp_output_sub_directory = Files.createDirectories(temp_directory.resolve("output"));
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_detailed_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_detailed_2020.csv
@@ -0,0 +1,6 @@
+Pos,No,Team,Category,Runners 1,Leg 1,Split 1,Runners 2,Leg 2,Split 2,Runners 3,Leg 3,Split 3,Runners 4,Leg 4,Total
+1,1,Team 1,Women Senior,John Smith,00:42:43,00:42:43,Hailey Dickson:) & Alix Crawford,00:44:17,01:27:00,Rhys Müllar & Paige Thompson,01:08:05,02:35:05,Amé MacDonald,01:12:53,03:47:58
+2,2,Team 2,Open 50+,Bartosz Thomson,00:43:52,00:43:52,John Smith & Zuzanna Miller-Ford,00:59:16,01:43:08,Leo McKenzie & Henry Muir,00:52:26,02:35:34,Regan Millar,01:12:55,03:48:29
+3,4,Team 4,Women 50+,Sofia O'Connor,00:45:35,00:45:35,Philip O’Donohue & Hasan Robertson,01:01:48,01:47:23,Lena K. Maclean & Isabel Ritchie,02:02:29,03:49:52,Martha Gibson (M4),00:00:10,03:50:02
+4,5,Team 5,Open Senior,Clark O' Connor,00:45:43,00:45:43,Nina Joan Fiona Walker & Hope Christie,01:02:01,01:47:44,Cayla Duncan & Scott Kelly,00:49:35,02:37:19,Amelia Muir (M4),01:13:21,03:50:40
+5,3,Team 3,Open Senior,JackBruce,00:44:59,00:44:59,Martin King & Leland Donaldson,00:58:49,01:43:48,Neil MacDonald & Myles  Christie,00:52:11,02:35:59,Hubert Gray,01:24:01,04:00:00
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_1_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_1_2020.csv
@@ -0,0 +1,6 @@
+Pos,Runner,Time
+1,John Smith,00:42:43
+2,Bartosz Thomson,00:43:52
+3,JackBruce,00:44:59
+4,Sofia O'Connor,00:45:35
+5,Clark O' Connor,00:45:43
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_2_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_2_2020.csv
@@ -0,0 +1,6 @@
+Pos,Runners,Time
+1,Hailey Dickson:) & Alix Crawford,00:44:17
+2,Martin King & Leland Donaldson,00:58:49
+3,John Smith & Zuzanna Miller-Ford,00:59:16
+4,Philip O’Donohue & Hasan Robertson,01:01:48
+5,Nina Joan Fiona Walker & Hope Christie,01:02:01
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_3_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_3_2020.csv
@@ -0,0 +1,6 @@
+Pos,Runners,Time
+1,Cayla Duncan & Scott Kelly,00:49:35
+2,Neil MacDonald & Myles  Christie,00:52:11
+3,Leo McKenzie & Henry Muir,00:52:26
+4,Rhys Müllar & Paige Thompson,01:08:05
+5,Lena K. Maclean & Isabel Ritchie,02:02:29
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_4_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_leg_4_2020.csv
@@ -0,0 +1,6 @@
+Pos,Runner,Time
+1,Martha Gibson,00:00:10
+2,Amé MacDonald,01:12:53
+3,Regan Millar,01:12:55
+4,Amelia Muir,01:13:21
+5,Hubert Gray,01:24:01
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_overall_2020.csv b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_overall_2020.csv
@@ -0,0 +1,6 @@
+Pos,No,Team,Category,Total
+1,1,Team 1,Women Senior,03:47:58
+2,2,Team 2,Open 50+,03:48:29
+3,4,Team 4,Women 50+,03:50:02
+4,5,Team 5,Open Senior,03:50:40
+5,3,Team 3,Open Senior,04:00:00
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_prizes_2020.txt b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/expected/simple_prizes_2020.txt
@@ -0,0 +1,65 @@
+Devil's Burdens Results 2020
+============================
+
+Category: Women Senior
+----------------------
+
+1: Team 4 (Women 50+) 03:50:02
+
+
+Category: Open Senior
+---------------------
+
+1: Team 1 (Women Senior) 03:47:58
+2: Team 5 (Open Senior) 03:50:40
+3: Team 3 (Open Senior) 04:00:00
+
+
+Category: Women 40+
+-------------------
+
+No results
+
+
+Category: Open 40+
+------------------
+
+1: Team 2 (Open 50+) 03:48:29
+
+
+Category: Women 50+
+-------------------
+
+No results
+
+
+Category: Open 50+
+------------------
+
+No results
+
+
+Category: Women 60+
+-------------------
+
+No results
+
+
+Category: Open 60+
+------------------
+
+No results
+
+
+Category: Mixed Senior
+----------------------
+
+No results
+
+
+Category: Mixed 40+
+-------------------
+
+No results
+
+
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/input/entries.txt b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/input/entries.txt
@@ -0,0 +1,5 @@
+1	Team 1	Women Senior	John Smith	Hailey Dickson:) & Alix Crawford	Rhys Müllar & Paige Thompson	Amé MacDonald
+2	Team 2	Open 50+	Bartosz Thomson	John Smith & Zuzanna Miller-Ford	Leo McKenzie & Henry Muir	Regan Millar
+3	Team 3	Open Senior	JackBruce	Martin King & Leland Donaldson	Neil MacDonald & Myles  Christie	Hubert Gray
+4	Team 4	Women 50+	Sofia O'Connor	Philip O’Donohue & Hasan Robertson	Lena K. Maclean & Isabel Ritchie	Martha Gibson
+5	Team 5	Open Senior	Clark O' Connor	Nina Joan Fiona Walker & Hope Christie	Cayla Duncan & Scott Kelly	Amelia Muir
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/input/rawtimes.txt b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/input/rawtimes.txt
@@ -0,0 +1 @@
+1	42:432	43:523	44:594	45:355	45:431	1:27:002	1:43:083	1:43:484	1:47:235	1:47:441	2:35:052	2:35:343	2:35:594	2:36:105	2:37:191	3:47:582	3:48:295	3:49:214	3:49:523	4:0:0
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/master.xlsx b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/master.xlsx
diff --git a/src/test/resources/devils_burdens/mass_start_4/legs_swapped/race.config b/src/test/resources/devils_burdens/mass_start_4/legs_swapped/race.config
@@ -0,0 +1,19 @@
+ENTRIES_FILENAME = entries.txt
+RAW_RESULTS_FILENAME = rawtimes.txt
+YEAR = 2020
+NUMBER_OF_LEGS = 4
+PAIRED_LEGS = 2,3
+RACE_NAME_FOR_RESULTS = Devil's Burdens
+RACE_NAME_FOR_FILENAMES = simple
+
+# Elapsed duration from start of leg 1 to mass start time for each leg.
+# 23:59:59 indicates no mass start.
+MASS_START_ELAPSED_TIMES = 23:59:59,23:59:59,23:59:59,2:36:00
+
+# Comma-separated sequence of bib-number/leg-number for all legs that have a time
+# recorded but the runners DNF'd the leg.
+DNF_LEGS =
+
+# Comma-separated sequence bib-number/leg-number for all legs where the runner finished
+# before the runner on the previous leg.
+LEG_TIME_SWAPS = 4/4

Original file line number	Diff line number	Diff line change
`@@ -295,9 +295,9 @@ private void fillLegFinishTimes() {`
`295`	`295`
`296`	`296`	`final OverallResult result = overall_results[findIndexOfTeamWithBibNumber(bib_number)];`
`297`	`297`
`298`		`- LegResult temp = result.leg_results[leg_index - 1];`
`299`		`- result.leg_results[leg_index - 1] = result.leg_results[leg_index];`
`300`		`- result.leg_results[leg_index] = temp;`
	`298`	`+ final Duration temp = result.leg_results[leg_index - 1].finish_time;`
	`299`	`+ result.leg_results[leg_index - 1].finish_time = result.leg_results[leg_index].finish_time;`
	`300`	`+ result.leg_results[leg_index].finish_time = temp;`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`	`}`
`@@ -459,6 +459,7 @@ private void printPrizes() throws IOException {`
`459`	`459`
`460`	`460`	`output_text.printPrizes();`
`461`	`461`	`output_PDF.printPrizes();`
	`462`	`+ output_HTML.printPrizes();`
`462`	`463`	`}`
`463`	`464`
`464`	`465`	`private void printCombined() throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1 42:432 43:523 44:594 45:355 45:431 1:27:002 1:43:083 1:43:484 1:47:235 1:47:441 2:35:052 2:35:343 2:35:594 2:36:105 2:37:191 3:47:582 3:48:295 3:49:214 3:49:523 4:0:0`