Progress on updates to lap race, tests not passing.

Author: grahamkirby

src/main/java/common/Race.java

@@ -9,7 +9,6 @@
 
 public abstract class Race {
 
-
     protected static final String DUMMY_DURATION_STRING = "23:59:59";
     public static final Duration DUMMY_DURATION = parseTime(DUMMY_DURATION_STRING);
     protected static final String ZERO_TIME_STRING = "0:0:0";
@@ -73,7 +72,7 @@ protected String getPropertyWithDefault(final String property_key, final String
         return value == null || value.isBlank() ? default_value : value;
     }
 
-    protected static Duration parseTime(String element) {
+    public static Duration parseTime(String element) {
 
         element = element.strip();
 

src/main/java/common/RawResult.java

@@ -53,7 +53,8 @@ public String getComment() {
     }
 
     public void appendComment(String comment) {
-        this.comment = this.comment + comment;
+        if (!this.comment.isEmpty()) this.comment += " ";
+        this.comment += comment;
     }
 
     public Integer getLegNumber() {

src/main/java/lap_race/LapRace.java

@@ -142,10 +142,7 @@ private void interpolateMissingTimes() {
             raw_results[i].setRecordedFinishTime(raw_results[raw_result_index].getRecordedFinishTime());
             raw_results[i].setInterpolatedTime(true);
 
-            final String existing_comment = raw_results[i].getComment();
-            String comment = "";
-            if (!existing_comment.isEmpty()) comment = " ";
-            comment += "Time not recorded. No basis for interpolation so set to first recorded time.";
+            String comment = "Time not recorded. No basis for interpolation so set to first recorded time.";
             raw_results[i].appendComment(comment);
         }
 
@@ -168,10 +165,7 @@ private void interpolateMissingTimes() {
                     raw_results[i].setInterpolatedTime(true);
 
 
-                    final String existing_comment = raw_results[i].getComment();
-                    String comment = "";
-                    if (!existing_comment.isEmpty()) comment = " ";
-                    comment += "Time not recorded. Time interpolated.";
+                    String comment = "Time not recorded. Time interpolated.";
                     raw_results[i].appendComment(comment);
                 }
             }
@@ -180,11 +174,7 @@ private void interpolateMissingTimes() {
                     raw_results[i].setRecordedFinishTime(raw_results[previous_non_null_time_index].getRecordedFinishTime());
                     raw_results[i].setInterpolatedTime(true);
 
-
-                    final String existing_comment = raw_results[i].getComment();
-                    String comment = "";
-                    if (!existing_comment.isEmpty()) comment = " ";
-                    comment += "Time not recorded. No basis for interpolation so set to last recorded time.";
+                    String comment = "Time not recorded. No basis for interpolation so set to last recorded time.";
                     raw_results[i].appendComment(comment);
                 }
             }
@@ -195,31 +185,39 @@ private void guessMissingBibNumbers() {
 
         record TeamSummaryAtPosition(int team_number, int finishes_before, int finishes_after, Duration previous_finish, Duration next_finish) { }
 
-        int position_of_first_missing_bib_number = getPositionOfFirstMissingBibNumber();
-        while (position_of_first_missing_bib_number > 0) {
-
-            TeamSummaryAtPosition[] summaries = new TeamSummaryAtPosition[entries.length];
-            for (int i = 0; i < summaries.length; i++) {
+        if (raw_results.length != entries.length * number_of_legs) {
 
-                int bib_number = entries[i].bib_number;
-                int finishes_before = getNumberOfTeamFinishesBefore(position_of_first_missing_bib_number, bib_number);
-                int finishes_after = getNumberOfTeamFinishesAfter(position_of_first_missing_bib_number, bib_number);
-                Duration previous_finish_time = getPreviousTeamFinishTime(position_of_first_missing_bib_number, bib_number);
-                Duration next_finish_time = getNextTeamFinishTime(position_of_first_missing_bib_number, bib_number);
-                summaries[i] = new TeamSummaryAtPosition(bib_number, finishes_before, finishes_after, previous_finish_time, next_finish_time);
+            for (int i = 0; i < raw_results.length; i++) {
+                if (raw_results[i].getBibNumber() == null) raw_results[i].appendComment("Time but not bib number recorded electronically. Bib number not recorded on paper. Too many missing times to guess from DNF teams.");
             }
+        }
+        else {
 
-            Arrays.sort(summaries, Comparator.comparing(o -> o.previous_finish));
-            Arrays.sort(summaries, Comparator.comparing(o -> o.next_finish));
-            Arrays.sort(summaries, Comparator.comparingInt(o -> o.finishes_after));
-            Arrays.sort(summaries, Comparator.comparingInt(o -> o.finishes_before));
+            int position_of_first_missing_bib_number = getPositionOfFirstMissingBibNumber();
+            while (position_of_first_missing_bib_number > 0) {
 
-            raw_results[position_of_first_missing_bib_number - 1].setBibNumber(summaries[0].team_number);
-            raw_results[position_of_first_missing_bib_number - 1].appendComment("Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.");
+                TeamSummaryAtPosition[] summaries = new TeamSummaryAtPosition[entries.length];
+                for (int i = 0; i < summaries.length; i++) {
 
-            position_of_first_missing_bib_number = getPositionOfFirstMissingBibNumber();
-        }
+                    int bib_number = entries[i].bib_number;
+                    int finishes_before = getNumberOfTeamFinishesBefore(position_of_first_missing_bib_number, bib_number);
+                    int finishes_after = getNumberOfTeamFinishesAfter(position_of_first_missing_bib_number, bib_number);
+                    Duration previous_finish_time = getPreviousTeamFinishTime(position_of_first_missing_bib_number, bib_number);
+                    Duration next_finish_time = getNextTeamFinishTime(position_of_first_missing_bib_number, bib_number);
+                    summaries[i] = new TeamSummaryAtPosition(bib_number, finishes_before, finishes_after, previous_finish_time, next_finish_time);
+                }
+
+                Arrays.sort(summaries, Comparator.comparing(o -> o.previous_finish));
+                Arrays.sort(summaries, Comparator.comparing(o -> o.next_finish));
+                Arrays.sort(summaries, Comparator.comparingInt(o -> o.finishes_after));
+                Arrays.sort(summaries, Comparator.comparingInt(o -> o.finishes_before));
+
+                raw_results[position_of_first_missing_bib_number - 1].setBibNumber(summaries[0].team_number);
+                raw_results[position_of_first_missing_bib_number - 1].appendComment("Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.");
 
+                position_of_first_missing_bib_number = getPositionOfFirstMissingBibNumber();
+            }
+        }
     }
 
     private int getNumberOfTeamFinishesBefore(int position, int bib_number) {

src/main/java/lap_race/LapRaceInput.java

@@ -1,6 +1,6 @@
 package lap_race;
 
-import common.MissingTimeException;
+import common.Race;
 import common.RawResult;
 
 import java.io.IOException;
@@ -126,8 +126,8 @@ private static void loadRawResult(final List<RawResult> raw_results, String line
                 return;
             }
 
-            if (result.getBibNumber() == null && result.getRecordedFinishTime() != null)
-                result.appendComment("Time but not bib number recorded electronically.");
+//            if (result.getBibNumber() == null && result.getRecordedFinishTime() != null)
+//                result.appendComment("Time but not bib number recorded electronically.");
 
             final RawResult previous_result = !raw_results.isEmpty() ? raw_results.get(raw_results.size() - 1) : null;
 
@@ -144,19 +144,22 @@ public void loadTimeAnnotations(RawResult[] raw_results) throws IOException {
 
             List<String> lines = Files.readAllLines(annotations_path);
 
-            int index1 = lines.indexOf("Missing bib numbers:") + 2;
-            if (index1 > 1) {
-                while (index1 < lines.size() && !lines.get(index1).isEmpty()) {
-                    String[] elements = lines.get(index1).split("\t");
-                    int position = Integer.parseInt(elements[0]);
-                    int bib_number = Integer.parseInt(elements[1]);
-                    String comment = elements[2];
+            for (int line_index = 1; line_index < lines.size(); line_index++) {
 
+                String[] elements = lines.get(line_index).split("\t");
+
+                if (elements[0].equals("Update")) {
+
+                    final int position = Integer.parseInt(elements[1]);
                     RawResult raw_result = raw_results[position - 1];
-                    raw_result.setBibNumber(bib_number);
-                    raw_result.appendComment(comment);
 
-                    index1++;
+                    if (elements[2].equals("?")) raw_result.setBibNumber(null);
+                    else if (!elements[2].isEmpty()) raw_result.setBibNumber(Integer.parseInt(elements[2]));
+
+                    if (elements[3].equals("?")) raw_result.setRecordedFinishTime(null);
+                    else if (!elements[3].isEmpty()) raw_result.setRecordedFinishTime(Race.parseTime(elements[3]));
+
+                    if (!elements[4].isEmpty()) raw_result.appendComment(elements[4]);
                 }
             }
         }

src/main/java/lap_race/LapRaceOutputText.java

@@ -88,16 +88,11 @@ public void printCollatedTimes() throws IOException {
 
             for (int i = 0; i < race.getRawResults().length; i++) {
 
-                if (i == race.input.getNumberOfRawResults()) {
-                    writer.append("""
-
-                            // Remaining times from paper recording sheet only.
-
-                            """);
-                }
-
                 RawResult raw_result = race.getRawResults()[i];
 
+                if (i == race.input.getNumberOfRawResults() - 1)
+                    raw_result.appendComment("Remaining times from paper recording sheet only.");
+
                 final Integer bib_number = raw_result.getBibNumber();
                 final int legs_already_finished = leg_finished_count.getOrDefault(bib_number, 0);
 
@@ -110,7 +105,6 @@ public void printCollatedTimes() throws IOException {
                 if (raw_result.getLegNumber() > 0) {
                     writer.append("\t").append(String.valueOf(raw_result.getLegNumber()));
                     if (legs_already_finished >= raw_result.getLegNumber()) {
-                        if (!comment.isEmpty()) comment.append(" ");
                         comment.append("Leg ").
                                 append(raw_result.getLegNumber()).
                                 append(" finisher was runner ").

src/test/java/lap_race/devils_burdens/LapRaceTest.java

@@ -81,8 +81,13 @@ public void interpolatedRawTimes() throws Exception {
     }
 
     @Test
-    public void guessedMissingBibNumbers() throws Exception {
-        testExpectedCompletion("guessed_missing_bib_numbers");
+    public void guessedMissingBibNumbersA() throws Exception {
+        testExpectedCompletion("guessed_missing_bib_numbers_a");
+    }
+
+    @Test
+    public void guessedMissingBibNumbersB() throws Exception {
+        testExpectedCompletion("guessed_missing_bib_numbers_b");
     }
 
     @Test

src/test/resources/lap_race/devils_burdens/actual_2024/expected/times_collated.txt

@@ -52,22 +52,22 @@
 49	00:53:15
 72	00:53:19
 106	00:53:23
-64	00:53:24		// Time but not bib number recorded electronically. Recording sheet has 84 in this position but inconsistent with result 3 minutes earlier, so guessed bib number 64 from DNF teams.
-10	00:53:25		// Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
+79	00:53:24		# Recording sheet has 84 in this position but inconsistent with result 3 minutes earlier, so ignored. Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
+64	00:53:25		# Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
 11	00:53:28
 52	00:53:31
 19	00:54:03
 5	00:54:08
 35	00:54:10
-53	00:54:15		// Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
+53	00:54:15		# Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
 24	00:54:17
 83	00:54:21
 27	00:54:26
 15	00:55:27
 23	00:55:30
 33	00:55:32
 40	00:55:36
-79	00:55:37		// Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
+10	00:55:37		# Time but not bib number recorded electronically. Bib number not recorded on paper. Guessed bib number from DNF teams.
 91	00:55:39
 111	00:55:44
 77	00:55:57
@@ -212,8 +212,7 @@
 93	02:40:04
 76	02:40:23
 95	02:41:07
-75	?		// 75 recorded on paper in this position.
-14	02:41:10
+14	02:41:10		# 75 on recording sheet before 14, but no electronic record.
 37	02:42:04
 96	02:42:10
 10	02:43:03
@@ -382,20 +381,17 @@
 111	04:12:45
 30	04:12:47
 8	04:13:03
-44	04:13:06
-
-// Remaining times from paper recording sheet only.
-
-72	04:13:33	// Interpolated time.
-93	04:14:01	// Interpolated time.
-105	04:14:29	// Interpolated time.
-6	04:14:57	// Interpolated time.
+44	04:13:06		# Remaining times from paper recording sheet only.
+72	04:13:33		# Time not recorded. Time interpolated.
+93	04:14:01		# Time not recorded. Time interpolated.
+105	04:14:29		# Time not recorded. Time interpolated.
+6	04:14:57		# Time not recorded. Time interpolated.
 70	04:15:25
-2	04:15:32	// Interpolated time.
-5	04:15:39	// Interpolated time.
-23	04:15:46	// Interpolated time.
-3	04:15:53	// Interpolated time.
-41	04:16:00	// Interpolated time.
+2	04:15:32		# Time not recorded. Time interpolated.
+5	04:15:39		# Time not recorded. Time interpolated.
+23	04:15:46		# Time not recorded. Time interpolated.
+3	04:15:53		# Time not recorded. Time interpolated.
+41	04:16:00		# Time not recorded. Time interpolated.
 95	04:16:07
 70	04:16:25
 45	04:17:02
@@ -406,29 +402,28 @@
 69	04:18:05
 50	04:18:16
 51	04:18:16
-112	04:18:22	// Seems unlikely that this and following time are correct, so probably missing an earlier finish for 112.
-112	04:18:28	// Not recorded, time reverse engineered from submitted strava trace.
+112	04:18:22		# Seems unlikely that this and following time are correct, so probably missing an earlier finish for 112.
+112	04:18:28		# Time not recorded. Time reverse engineered from submitted Strava trace.
 76	04:18:30
-40	04:18:30	// Not recorded, time reverse engineered from submitted leg time.
-36	04:18:32	// Leg 4, not recorded, time reverse engineered from submitted leg time.
-11	04:18:40	// Only on recording sheet, looks like 110. Time interpolated.
-39	04:18:51	// Interpolated time.
+40	04:18:30		# Time not recorded. Time reverse engineered from submitted leg time.
+36	04:18:32
+11	04:18:40		# Only on recording sheet, looks like 110. Time interpolated.
+39	04:18:51		# Time not recorded. Time interpolated.
 28	04:19:01
 31	04:19:03	// Not recorded, time reverse engineered from submitted strava trace.
 95	04:19:08
-            // 104 on recording sheet in this position, but runner says their time was 49.30.
-10	04:19:30
+10	04:19:30		# 104 on recording sheet in this position, but runner says their time was 49.30.
 7	04:19:45
 38	04:20:06
 67	04:20:43
 26	04:21:50
-36	04:22:07	3	// Leg 3 finisher was runner 4 to finish for team.
-105	04:22:15	3	// Leg 3 finisher was runner 4 to finish for team.
+36	04:22:07	3	# Leg 3 finisher was runner 4 to finish for team.
+105	04:22:15	3	# Leg 3 finisher was runner 4 to finish for team.
 42	04:22:21
 56	04:22:35
 84	04:22:41
 2	04:22:49
-76	04:23:04	3	// Leg 3 finisher was runner 4 to finish for team.
+76	04:23:04	3	# Leg 3 finisher was runner 4 to finish for team.
 17	04:23:04
 8	04:23:35
 65	04:23:40
@@ -450,4 +445,4 @@
 113	04:35:20
 66	04:40:04
 26	04:49:54
-65	04:50:16	3	// Leg 3 finisher was runner 4 to finish for team.
+65	04:50:16	3	# Leg 3 finisher was runner 4 to finish for team.

src/test/resources/lap_race/devils_burdens/actual_2024/input/times_annotations.txt

@@ -1,6 +1,10 @@
-Missing bib numbers:
-Position	Bib Number	Comment
-55	64	Recording sheet has 84 in this position but inconsistent with result 3 minutes earlier, so guessed bib number 64 from DNF teams.
-56	10	Bib number not recorded on paper. Guessed bib number from DNF teams.
-62	53	Bib number not recorded on paper. Guessed bib number from DNF teams.
-70	79	Bib number not recorded on paper. Guessed bib number from DNF teams.
+Action	Position	Bib Number	Time	Comment
+Update	55			Recording sheet has 84 in this position but inconsistent with result 3 minutes earlier, so ignored.
+Update	215			75 on recording sheet before 14, but no electronic record.
+Update	405			Seems unlikely that this and following time are correct, so probably missing an earlier finish for 112.
+Update	406		04:18:28	Time not recorded. Time reverse engineered from submitted Strava trace.
+Update	408		04:18:30	Time not recorded. Time reverse engineered from submitted leg time.
+Update	410			Only on recording sheet, looks like 110.
+Update	413		04:19:03	Time not recorded. Time reverse engineered from submitted Strava trace.
+Update	415			104 on recording sheet in this position, but runner says their time was 49.30.
+Update	430		04:24:20	Time estimated based on runner's information.

src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers/expected/times_collated.txt src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers_a/expected/times_collated.txt

@@ -0,0 +1,20 @@
+1	00:42:43
+2	00:43:52
+3	00:44:59
+?	00:45:35		# Time but not bib number recorded electronically. Bib number not recorded on paper. Too many missing times to guess from DNF teams.
+5	00:45:43
+1	01:27:00
+2	01:43:08
+3	01:43:48
+?	01:47:23		# Time but not bib number recorded electronically. Bib number not recorded on paper. Too many missing times to guess from DNF teams.
+?	01:47:44		# Time but not bib number recorded electronically. Bib number not recorded on paper. Too many missing times to guess from DNF teams.
+1	02:35:05
+2	02:35:34
+3	02:35:59
+4	02:36:10
+5	02:37:19
+1	03:47:58
+2	03:48:22
+?	03:48:29		# Time but not bib number recorded electronically. Bib number not recorded on paper. Too many missing times to guess from DNF teams.
+4	03:49:21
+

src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers/input/config.txt src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers_a/input/config.txt

@@ -0,0 +1,15 @@
+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 =
+
+# 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 =

src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers/input/entries.txt src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers_a/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

src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers/input/rawtimes.txt src/test/resources/lap_race/devils_burdens/guessed_missing_bib_numbers_a/input/rawtimes.txt

@@ -0,0 +1 @@
+1	42:432	43:523	44:59?	45:355	45:431	1:27:002	1:43:083	1:43:48?	1:47:23?	1:47:441	2:35:052	2:35:343	2:35:594	2:36:105	2:37:191	3:47:582	3:48:22?	3:48:294	3:49:21