diff --git a/src/main/java/org/grahamkirby/race_timing/common/Race.java b/src/main/java/org/grahamkirby/race_timing/common/Race.java index 6f9f0f9d..d7000e72 100644 --- a/src/main/java/org/grahamkirby/race_timing/common/Race.java +++ b/src/main/java/org/grahamkirby/race_timing/common/Race.java @@ -34,9 +34,6 @@ public abstract class Race { - // TODO add support for Tour of Fife series. - // TODO add support for Junior Hill Running Champs. - public static final String COMMENT_SYMBOL = "#"; ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -75,19 +72,21 @@ public abstract class Race { // Series race. public static final String KEY_RACES = "RACES"; + public static final String KEY_NUMBER_OF_RACES_IN_SERIES = "NUMBER_OF_RACES_IN_SERIES"; + public static final String KEY_MINIMUM_NUMBER_OF_RACES = "MINIMUM_NUMBER_OF_RACES"; // Grand Prix race. public static final String KEY_RACE_CATEGORIES_PATH = "RACE_CATEGORIES_PATH"; public static final String KEY_QUALIFYING_CLUBS = "QUALIFYING_CLUBS"; // Midweek race. - public static final String KEY_MINIMUM_NUMBER_OF_RACES = "MINIMUM_NUMBER_OF_RACES"; public static final String KEY_SCORE_FOR_FIRST_PLACE = "SCORE_FOR_FIRST_PLACE"; // Minitour race. public static final String KEY_WAVE_START_OFFSETS = "WAVE_START_OFFSETS"; public static final String KEY_SECOND_WAVE_CATEGORIES = "SECOND_WAVE_CATEGORIES"; - public static final String KEY_TIME_TRIAL = "TIME_TRIAL"; + public static final String KEY_TIME_TRIAL_RACE = "TIME_TRIAL_RACE"; + public static final String KEY_TIME_TRIAL_STARTS = "TIME_TRIAL_STARTS"; public static final String KEY_SELF_TIMED = "SELF_TIMED"; ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -453,7 +452,7 @@ protected Comparator combineComparators(final List dnfOnly(final Comparator comparator) { - return (r1, r2) -> r1.shouldDisplayPosition() || r2.shouldDisplayPosition() ? 0 : comparator.compare(r1, r2); + return (r1, r2) -> r1.getCompletionStatus() != CompletionStatus.DNF || r2.getCompletionStatus() != CompletionStatus.DNF ? 0 : comparator.compare(r1, r2); } private List getPrizeCategoryGroups(final Path prize_categories_path) throws IOException { diff --git a/src/main/java/org/grahamkirby/race_timing/individual_race/IndividualRace.java b/src/main/java/org/grahamkirby/race_timing/individual_race/IndividualRace.java index 885d0d1c..595ce780 100644 --- a/src/main/java/org/grahamkirby/race_timing/individual_race/IndividualRace.java +++ b/src/main/java/org/grahamkirby/race_timing/individual_race/IndividualRace.java @@ -16,10 +16,7 @@ */ package org.grahamkirby.race_timing.individual_race; -import org.grahamkirby.race_timing.common.CompletionStatus; -import org.grahamkirby.race_timing.common.Normalisation; -import org.grahamkirby.race_timing.common.RaceInput; -import org.grahamkirby.race_timing.common.RaceResult; +import org.grahamkirby.race_timing.common.*; import org.grahamkirby.race_timing.common.categories.EntryCategory; import org.grahamkirby.race_timing.common.categories.PrizeCategory; import org.grahamkirby.race_timing.common.output.RaceOutputCSV; @@ -74,6 +71,39 @@ public EntryCategory findCategory(final int bib_number) { return getEntryWithBibNumber(bib_number).runner.category; } + public Duration getRunnerTime(final Runner runner) { + + final List results = getOverallResults(); + + for (final RaceResult result : results) { + + final IndividualRaceResult individual_result = (IndividualRaceResult) result; + if (individual_result.entry.runner.equals(runner)) + return individual_result.duration(); + } + + return null; + } + + public Duration getMedianTime() { + + if (median_time_string != null) return Normalisation.parseTime(median_time_string); + + final List results = getOverallResults(); + + if (results.size() % 2 == 0) { + + final IndividualRaceResult median_result1 = (IndividualRaceResult) results.get(results.size() / 2); + final IndividualRaceResult median_result2 = (IndividualRaceResult) results.get(results.size() / 2 + 1); + + return median_result1.finish_time.plus(median_result2.finish_time).dividedBy(2); + } + else { + final IndividualRaceResult median_result = (IndividualRaceResult) results.get(results.size() / 2); + return median_result.finish_time; + } + } + ////////////////////////////////////////////////////////////////////////////////////////////////// private int compareRecordedPosition(final RaceResult r1, final RaceResult r2) { @@ -101,8 +131,6 @@ protected void readProperties() throws IOException { super.readProperties(); - // Specifies all the bib numbers for runners who did have a finish - // time recorded but were declared DNF. median_time_string = getProperty(KEY_MEDIAN_TIME); } @@ -134,11 +162,10 @@ protected RaceOutputPDF getOutputPDF() { @Override protected void initialiseResults() { - if (entries != null) - entries.stream(). - map(entry -> (IndividualRaceEntry) entry). - map(entry -> new IndividualRaceResult(this, entry)). - forEachOrdered(overall_results::add); + entries.stream(). + map(entry -> (IndividualRaceEntry) entry). + map(entry -> new IndividualRaceResult(this, entry)). + forEachOrdered(overall_results::add); } @Override @@ -166,12 +193,11 @@ public List> getDNFComparators() { @Override protected boolean entryCategoryIsEligibleForPrizeCategoryByGender(final EntryCategory entry_category, final PrizeCategory prize_category) { - if (entry_category == null) return true; - return entry_category.getGender().equals(prize_category.getGender()); + return entry_category == null || entry_category.getGender().equals(prize_category.getGender()); } @Override - protected EntryCategory getEntryCategory(RaceResult result) { + protected EntryCategory getEntryCategory(final RaceResult result) { return ((IndividualRaceResult) result).entry.runner.category; } @@ -192,37 +218,17 @@ protected void fillDNF(final String dnf_string) { ////////////////////////////////////////////////////////////////////////////////////////////////// - public Duration getMedianTime() { - - if (median_time_string != null) return Normalisation.parseTime(median_time_string); - - final List results = getOverallResults(); - - if (results.size() % 2 == 0) { - - final IndividualRaceResult median_result1 = (IndividualRaceResult) results.get(results.size() / 2); - final IndividualRaceResult median_result2 = (IndividualRaceResult) results.get(results.size() / 2 + 1); - - return median_result1.finish_time.plus(median_result2.finish_time).dividedBy(2); - } - else { - final IndividualRaceResult median_result = (IndividualRaceResult) results.get(results.size() / 2); - return median_result.finish_time; - } - } - private void fillFinishTimes() { - if (raw_results != null) - raw_results.forEach(raw_result -> { + raw_results.forEach(raw_result -> { - final IndividualRaceResult result = getResultWithBibNumber(raw_result.getBibNumber()); - result.finish_time = raw_result.getRecordedFinishTime(); + final IndividualRaceResult result = getResultWithBibNumber(raw_result.getBibNumber()); + result.finish_time = raw_result.getRecordedFinishTime(); - // Provisionally this result is not DNF since a finish time was recorded. - // However, it might still be set to DNF in fillDNF() if the runner didn't complete the course. - result.completion_status = CompletionStatus.COMPLETED; - }); + // Provisionally this result is not DNF since a finish time was recorded. + // However, it might still be set to DNF in fillDNF() if the runner didn't complete the course. + result.completion_status = CompletionStatus.COMPLETED; + }); } private IndividualRaceResult getResultWithBibNumber(final int bib_number) { diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRace.java b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRace.java index 75d9ffac..0a0d7e96 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRace.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRace.java @@ -34,6 +34,7 @@ public abstract class SeriesRace extends Race { protected List races; + protected int number_of_races_in_series; protected int minimum_number_of_races; public SeriesRace(final Path config_file_path) throws IOException { @@ -95,6 +96,7 @@ protected void outputResults() throws IOException { @Override protected void readProperties() { + number_of_races_in_series = Integer.parseInt(getProperty(KEY_NUMBER_OF_RACES_IN_SERIES)); minimum_number_of_races = Integer.parseInt(getProperty(KEY_MINIMUM_NUMBER_OF_RACES)); } @@ -117,7 +119,7 @@ public List getRaces() { } public int getNumberOfRacesInSeries() { - return races.size(); + return number_of_races_in_series; } public int getMinimumNumberOfRaces() { diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceInput.java b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceInput.java index 6934052c..46c8c93e 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceInput.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceInput.java @@ -51,7 +51,8 @@ private IndividualRace getIndividualRace(int i) throws IOException { final String race_config_path = race_config_paths.get(i); - return race_config_path.isEmpty() ? null : getIndividualRace(race_config_path, i + 1); + return getIndividualRace(race_config_path, i + 1); +// return race_config_path.isEmpty() ? null : getIndividualRace(race_config_path, i + 1); } ////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceResult.java b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceResult.java index 71b56382..4b848bb4 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceResult.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/SeriesRaceResult.java @@ -59,10 +59,12 @@ public CompletionStatus getCompletionStatus() { public boolean completedSeries() { - return numberOfRacesCompleted() >= ((SeriesRace)race).getMinimumNumberOfRaces(); + int i = numberOfRacesCompleted(); + int minimumNumberOfRaces = ((SeriesRace) race).getMinimumNumberOfRaces(); + return i >= minimumNumberOfRaces; } - protected boolean canCompleteSeries() { + public boolean canCompleteSeries() { final SeriesRace series_race = (SeriesRace) race; final int number_of_races_remaining = series_race.getNumberOfRacesInSeries() - series_race.getNumberOfRacesTakenPlace(); diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRace.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRace.java index ff8db612..3bd49374 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRace.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRace.java @@ -27,6 +27,7 @@ import org.grahamkirby.race_timing.individual_race.IndividualRaceResult; import org.grahamkirby.race_timing.series_race.SeriesRace; import org.grahamkirby.race_timing.series_race.SeriesRaceInput; +import org.grahamkirby.race_timing.series_race.SeriesRaceResult; import java.io.IOException; import java.nio.file.Files; @@ -111,7 +112,8 @@ protected List> getComparators() { @Override protected List> getDNFComparators() { - return List.of(this::compareNumberOfRacesCompleted); + + return List.of(this::comparePossibleCompletion, this::compareNumberOfRacesCompleted); } @Override @@ -127,17 +129,17 @@ protected RaceResult getOverallResult(final Runner runner) { @Override protected Predicate getResultInclusionPredicate() { - return (result -> qualifying_clubs.contains(((IndividualRaceResult) result).entry.runner.club)); + return result -> qualifying_clubs.contains(((IndividualRaceResult) result).entry.runner.club); } public double calculateRaceScore(final IndividualRace individual_race, final Runner runner) { - final Duration runner_time = getResult(individual_race, runner); + final Duration runner_time = individual_race.getRunnerTime(runner); return runner_time != null ? divide(runner_time, individual_race.getMedianTime()) * SCORE_FOR_MEDIAN_POSITION : 0.0; } - public boolean hasCompletedCategory(GrandPrixRaceResult result, RaceCategory category) { + public boolean hasCompletedRaceCategory(GrandPrixRaceResult result, RaceCategory category) { return category.race_numbers().stream(). anyMatch(race_number -> race_number <= result.scores.size() && result.scores.get(race_number - 1) > 0.0); @@ -145,6 +147,11 @@ public boolean hasCompletedCategory(GrandPrixRaceResult result, RaceCategory cat ////////////////////////////////////////////////////////////////////////////////////////////////// + private int comparePossibleCompletion(final RaceResult r1, final RaceResult r2) { + + return Boolean.compare(((SeriesRaceResult)r2).canCompleteSeries(), ((SeriesRaceResult)r1).canCompleteSeries()); + } + private double divide(final Duration d1, final Duration d2) { return (double)d1.toMillis() / (double)d2.toMillis(); @@ -157,22 +164,23 @@ private int compareNumberOfRacesCompleted(RaceResult r1, RaceResult r2) { private void configureRaceCategories() throws IOException { - final String race_categories_path = getProperty(KEY_RACE_CATEGORIES_PATH); - race_categories = new ArrayList<>(); - Files.readAllLines(getPath(race_categories_path)).stream(). + Files.readAllLines(getPath(getProperty(KEY_RACE_CATEGORIES_PATH))).stream(). filter(line -> !line.startsWith(COMMENT_SYMBOL)). - forEachOrdered(line -> { - final String[] elements = line.split(","); + forEachOrdered(this::configureRaceCategory); + } - final String category_name = elements[0]; - final int minimum_number = Integer.parseInt(elements[1]); + private void configureRaceCategory(final String line) { - final List race_numbers = Arrays.stream(elements).skip(2).map(Integer::parseInt).toList(); + final String[] elements = line.split(","); - race_categories.add(new RaceCategory(category_name, minimum_number, race_numbers)); - }); + final String category_name = elements[0]; + final int minimum_number = Integer.parseInt(elements[1]); + + final List race_numbers = Arrays.stream(elements).skip(2).map(Integer::parseInt).toList(); + + race_categories.add(new RaceCategory(category_name, minimum_number, race_numbers)); } protected void processMultipleClubsForRunner(final String runner_name, final List clubs) { @@ -182,14 +190,4 @@ protected void processMultipleClubsForRunner(final String runner_name, final Lis else noteMultipleClubsForRunnerName(runner_name, clubs); } - - private Duration getResult(final IndividualRace individual_race, final Runner runner) { - - return individual_race.getOverallResults().stream(). - map(result -> ((IndividualRaceResult)result)). - filter(result -> runner.equals(result.entry.runner)). - map(IndividualRaceResult::duration). - findFirst(). - orElse(null); - } } diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputCSV.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputCSV.java index 48bd241b..62150288 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputCSV.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputCSV.java @@ -91,7 +91,7 @@ public void printResult(final RaceResult r) throws IOException { writer.append(STR.",\{result.getCompletionStatus() == CompletionStatus.COMPLETED ? Math.round(result.totalScore()) : "-"},\{result.getCompletionStatus() == CompletionStatus.COMPLETED ? "Y" : "N"}"); for (RaceCategory category : ((GrandPrixRace)race).race_categories) { - writer.append(",").append(grand_prix_race.hasCompletedCategory(result, category) ? "Y" : "N"); + writer.append(",").append(grand_prix_race.hasCompletedRaceCategory(result, category) ? "Y" : "N"); } writer.append("\n"); diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputHTML.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputHTML.java index 4774648f..f5ef0bad 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputHTML.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceOutputHTML.java @@ -122,7 +122,7 @@ public void printResult(final RaceResult r) throws IOException { """); for (RaceCategory category : ((GrandPrixRace)race).race_categories) { - writer.append("").append(grand_prix_race.hasCompletedCategory(result, category) ? "Y" : "N").append(""); + writer.append("").append(grand_prix_race.hasCompletedRaceCategory(result, category) ? "Y" : "N").append(""); } writer.append(""" diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceResult.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceResult.java index 19d5bcd1..62f0d15c 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceResult.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_grand_prix/GrandPrixRaceResult.java @@ -55,12 +55,14 @@ public boolean shouldBeDisplayedInResults() { @Override public boolean shouldDisplayPosition() { - return ((SeriesRace)race).seriesHasCompleted() ? completedSeries() : canCompleteSeries(); + return ((SeriesRace) race).seriesHasCompleted() ? completedSeries() : canCompleteSeries(); } protected double totalScore() { - final int number_of_counting_scores = Math.min(((GrandPrixRace) race).getMinimumNumberOfRaces(), numberOfRacesCompleted()); + final int minimum_number_of_races = ((GrandPrixRace) race).getMinimumNumberOfRaces(); + final int number_of_races_completed = numberOfRacesCompleted(); + final int number_of_counting_scores = Math.min(minimum_number_of_races, number_of_races_completed); return scores.stream(). sorted(). diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRace.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRace.java similarity index 67% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRace.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRace.java index 9e871af4..dc25bd27 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRace.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRace.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.RaceInput; import org.grahamkirby.race_timing.common.RaceResult; @@ -24,7 +24,6 @@ import org.grahamkirby.race_timing.common.output.RaceOutputPDF; import org.grahamkirby.race_timing.common.output.RaceOutputText; import org.grahamkirby.race_timing.individual_race.IndividualRace; -import org.grahamkirby.race_timing.individual_race.IndividualRaceResult; import org.grahamkirby.race_timing.series_race.SeriesRace; import java.io.IOException; @@ -33,15 +32,13 @@ import java.time.Duration; import java.util.Comparator; import java.util.List; -import java.util.Optional; import java.util.function.Predicate; -public class MinitourRace extends SeriesRace { +public class TourRace extends SeriesRace { - public MinitourRace(final Path config_file_path) throws IOException { + public TourRace(final Path config_file_path) throws IOException { super(config_file_path); - minimum_number_of_races = races.size(); } public static void main(final String[] args) throws IOException { @@ -51,55 +48,51 @@ public static void main(final String[] args) throws IOException { if (args.length < 1) System.out.println("usage: java MinitourRace "); else - new MinitourRace(Paths.get(args[0])).processResults(); + new TourRace(Paths.get(args[0])).processResults(); } ////////////////////////////////////////////////////////////////////////////////////////////////// public int compareCompletionSoFar(final RaceResult r1, final RaceResult r2) { - final boolean r1_completed_all_races_so_far = ((MinitourRaceResult) r1).completedAllRacesSoFar(); - final boolean r2_completed_all_races_so_far = ((MinitourRaceResult) r2).completedAllRacesSoFar(); + final boolean r1_completed_all_races_so_far = ((TourRaceResult) r1).completedAllRacesSoFar(); + final boolean r2_completed_all_races_so_far = ((TourRaceResult) r2).completedAllRacesSoFar(); return Boolean.compare(r2_completed_all_races_so_far, r1_completed_all_races_so_far); } ////////////////////////////////////////////////////////////////////////////////////////////////// - @Override - protected void readProperties() { - } - @Override protected RaceInput getInput() { - return new MinitourRaceInput(this); + return new TourRaceInput(this); } @Override protected RaceOutputCSV getOutputCSV() { - return new MinitourRaceOutputCSV(this); + return new TourRaceOutputCSV(this); } @Override protected RaceOutputHTML getOutputHTML() { - return new MinitourRaceOutputHTML(this); + return new TourRaceOutputHTML(this); } @Override protected RaceOutputText getOutputText() { - return new MinitourRaceOutputText(this); + return new TourRaceOutputText(this); } @Override protected RaceOutputPDF getOutputPDF() { - return new MinitourRaceOutputPDF(this); + return new TourRaceOutputPDF(this); } @Override protected void printCombined() throws IOException { output_HTML.printCombined(); - ((MinitourRaceOutputHTML) output_HTML).printIndividualRaces(); + ((TourRaceOutputHTML) output_HTML).printIndividualRaces(); } @Override @@ -113,15 +106,15 @@ protected List> getDNFComparators() { return List.of(); } - @Override protected RaceResult getOverallResult(final Runner runner) { final List times = races.stream(). - map(race -> getRaceTime(race, runner)). +// map(race -> getRaceTime(race, runner)). + map(race -> race == null ? null : ((IndividualRace)race).getRunnerTime(runner)). toList(); - return new MinitourRaceResult(runner, times, this); + return new TourRaceResult(runner, times, this); } @Override @@ -137,20 +130,4 @@ protected void processMultipleClubsForRunner(String ignore1, List ignore @Override protected void checkClubsForRunner(String ignore) { } - - ////////////////////////////////////////////////////////////////////////////////////////////////// - - private Duration getRaceTime(final IndividualRace individual_race, final Runner runner) { - - if (individual_race == null) return null; - - return individual_race.getOverallResults().stream(). - map(result -> (IndividualRaceResult)result). - filter(result -> result.entry.runner.equals(runner)). - map(IndividualRaceResult::duration). - map(Optional::ofNullable). - findFirst(). - orElseThrow(). - orElse(null); - } } diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceInput.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceInput.java similarity index 73% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceInput.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceInput.java index be6e9e56..c9053656 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceInput.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceInput.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.Normalisation; import org.grahamkirby.race_timing.common.Race; @@ -25,13 +25,15 @@ import java.time.Duration; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Function; import static org.grahamkirby.race_timing.common.Normalisation.parseTime; import static org.grahamkirby.race_timing.common.Race.*; -public class MinitourRaceInput extends SeriesRaceInput { +public class TourRaceInput extends SeriesRaceInput { private record SelfTimedRun(int bib_number, int race_number) {} @@ -44,10 +46,11 @@ private record SelfTimedRun(int bib_number, int race_number) {} private int time_trial_race_number; private int time_trial_runners_per_wave; private Duration time_trial_inter_wave_interval; + private Map time_trial_starts; ////////////////////////////////////////////////////////////////////////////////////////////////// - public MinitourRaceInput(final Race race) { + public TourRaceInput(final Race race) { super(race); } @@ -93,7 +96,10 @@ private List readSelfTimedRuns() { private List readSecondWaveCategories() { - final String[] second_wave_category_strings = race.getProperty(KEY_SECOND_WAVE_CATEGORIES).split(",", -1); + final String second_wave_categories_string = race.getProperty(KEY_SECOND_WAVE_CATEGORIES); + if (second_wave_categories_string == null) return List.of(); + + final String[] second_wave_category_strings = second_wave_categories_string.split(",", -1); return extractConfigFromPropertyStrings(second_wave_category_strings, race::lookupEntryCategory); } @@ -107,11 +113,26 @@ private List extractConfigFromPropertyStrings(final String[] strings, fin private void readTimeTrialProperties() { - final String[] parts = race.getProperty(KEY_TIME_TRIAL).split("/", -1); + time_trial_race_number = Integer.parseInt(race.getProperty(KEY_TIME_TRIAL_RACE)); + + final String[] parts = race.getProperty(KEY_TIME_TRIAL_STARTS).split(",", -1); + + if (parts.length == 2) { + time_trial_runners_per_wave = Integer.parseInt(parts[0]); + time_trial_inter_wave_interval = parseTime(parts[1]); + } + else + time_trial_starts = loadTimeTrialStarts(parts); + } + + private Map loadTimeTrialStarts(final String[] parts) { - time_trial_race_number = Integer.parseInt(parts[0]); - time_trial_runners_per_wave = Integer.parseInt(parts[1]); - time_trial_inter_wave_interval = parseTime(parts[2]); + Map starts = new HashMap<>(); + for (final String part: parts) { + final String[] split = part.split("/"); + starts.put(Integer.parseInt(split[0]), parseTime(split[1])); + } + return starts; } private void applyRunnerStartOffsets(final IndividualRace individual_race, final int race_number) { @@ -139,11 +160,17 @@ private Duration getRunnerStartOffset(final IndividualRace individual_race, fina private Duration getTimeTrialOffset(final int bib_number) { - // This assumes that time-trial runner_names are assigned to waves in order of bib number, + // The first option applies when time-trial runners are assigned to waves in order of bib number, // with incomplete waves if there are any gaps in bib numbers. + // The second option applies when start order is manually determined (e.g. to start current leaders first or last). + + if (time_trial_starts == null) { - final int wave_number = runnerIndexInBibOrder(bib_number) / time_trial_runners_per_wave; - return time_trial_inter_wave_interval.multipliedBy(wave_number); + final int wave_number = runnerIndexInBibOrder(bib_number) / time_trial_runners_per_wave; + return time_trial_inter_wave_interval.multipliedBy(wave_number); + } + else + return time_trial_starts.get(bib_number); } private int runnerIndexInBibOrder(final int bib_number) { @@ -156,10 +183,7 @@ private boolean raceIsTimeTrial(final int race_number) { private boolean runnerIsSelfTimed(final int race_number, final int bib_number) { - for (final SelfTimedRun self_timed_run : self_timed_runs) - if (self_timed_run.bib_number == bib_number && self_timed_run.race_number == race_number) return true; - - return false; + return self_timed_runs.stream().anyMatch(self_timed_run -> self_timed_run.race_number == race_number && self_timed_run.bib_number == bib_number); } private boolean runnerIsInSecondWave(final IndividualRace individual_race, final int bib_number) { @@ -168,6 +192,7 @@ private boolean runnerIsInSecondWave(final IndividualRace individual_race, final return second_wave_categories.stream(). map(second_wave_category -> second_wave_category.equalGenderAndAgeCategory(runner_entry_category)). - reduce(Boolean::logicalOr).orElseThrow(); + reduce(Boolean::logicalOr). + orElse(false); } } diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputCSV.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputCSV.java similarity index 91% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputCSV.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputCSV.java index aa1454dc..a3a36d45 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputCSV.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputCSV.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.Race; import org.grahamkirby.race_timing.common.RaceResult; @@ -29,9 +29,9 @@ import static org.grahamkirby.race_timing.common.Normalisation.format; -public class MinitourRaceOutputCSV extends SeriesRaceOutputCSV { +public class TourRaceOutputCSV extends SeriesRaceOutputCSV { - public MinitourRaceOutputCSV(final Race race) { + public TourRaceOutputCSV(final Race race) { super(race); } @@ -60,7 +60,7 @@ public OverallResultPrinter(final Race race, final OutputStreamWriter writer) { @Override public void printResult(final RaceResult r) throws IOException { - final MinitourRaceResult result = (MinitourRaceResult) r; + final TourRaceResult result = (TourRaceResult) r; final String position = result.shouldDisplayPosition() ? result.position_string : "-"; final Runner runner = result.runner; diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputHTML.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputHTML.java similarity index 95% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputHTML.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputHTML.java index 0c057cab..9af64d79 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputHTML.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputHTML.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.CompletionStatus; import org.grahamkirby.race_timing.common.Race; @@ -36,9 +36,9 @@ import static org.grahamkirby.race_timing.common.Normalisation.format; -public class MinitourRaceOutputHTML extends SeriesRaceOutputHTML { +public class TourRaceOutputHTML extends SeriesRaceOutputHTML { - public MinitourRaceOutputHTML(final Race race) { + public TourRaceOutputHTML(final Race race) { super(race); } @@ -123,8 +123,8 @@ public void printResultsHeader() throws IOException { @Override public void printResult(final RaceResult r) throws IOException { - final MinitourRaceResult result = (MinitourRaceResult)r; - final MinitourRace race = (MinitourRace) result.race; + final TourRaceResult result = (TourRaceResult)r; + final TourRace race = (TourRace) result.race; final List races = race.getRaces(); writer.append(STR.""" @@ -170,7 +170,7 @@ public void printResultsFooter(final boolean include_credit_link) throws IOExcep @Override public void printResult(final RaceResult r) throws IOException { - final MinitourRaceResult result = (MinitourRaceResult)r; + final TourRaceResult result = (TourRaceResult)r; writer.append(STR."
  • \{result.position_string} \{race.normalisation.htmlEncode(result.runner.name)} (\{result.runner.club}) \{format(result.duration())}
    • \n"); } diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputPDF.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputPDF.java similarity index 82% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputPDF.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputPDF.java index dc9bab61..72209b7e 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputPDF.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputPDF.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.RaceResult; import org.grahamkirby.race_timing.common.output.RaceOutputPDF; import static org.grahamkirby.race_timing.common.Normalisation.format; -public class MinitourRaceOutputPDF extends RaceOutputPDF { +public class TourRaceOutputPDF extends RaceOutputPDF { - public MinitourRaceOutputPDF(final MinitourRace race) { + public TourRaceOutputPDF(final TourRace race) { super(race); } @Override protected PrizeWinnerDetails getPrizeWinnerDetails(final RaceResult r) { - final MinitourRaceResult result = (MinitourRaceResult) r; + final TourRaceResult result = (TourRaceResult) r; return new PrizeWinnerDetails(result.position_string, result.runner.name, result.runner.club, format(result.duration())); } } diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputText.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputText.java similarity index 88% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputText.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputText.java index 4d749254..b31c67bb 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceOutputText.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceOutputText.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.Race; import org.grahamkirby.race_timing.common.RaceResult; @@ -27,9 +27,9 @@ import static org.grahamkirby.race_timing.common.Normalisation.format; -public class MinitourRaceOutputText extends RaceOutputText { +public class TourRaceOutputText extends RaceOutputText { - public MinitourRaceOutputText(final MinitourRace race) { + public TourRaceOutputText(final TourRace race) { super(race); } @@ -48,7 +48,7 @@ public PrizeResultPrinter(final Race race, final OutputStreamWriter writer) { @Override public void printResult(final RaceResult r) throws IOException { - final MinitourRaceResult result = (MinitourRaceResult) r; + final TourRaceResult result = (TourRaceResult) r; writer.append(result.position_string).append(": "). append(result.runner.name).append(" ("). diff --git a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceResult.java b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceResult.java similarity index 85% rename from src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceResult.java rename to src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceResult.java index 47f7834e..5e74a110 100644 --- a/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_minitour/MinitourRaceResult.java +++ b/src/main/java/org/grahamkirby/race_timing/series_race/fife_ac_tour/TourRaceResult.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with race-timing. If not, see * . */ -package org.grahamkirby.race_timing.series_race.fife_ac_minitour; +package org.grahamkirby.race_timing.series_race.fife_ac_tour; import org.grahamkirby.race_timing.common.RaceResult; import org.grahamkirby.race_timing.common.Runner; @@ -25,11 +25,11 @@ import java.util.List; import java.util.Objects; -public class MinitourRaceResult extends SeriesRaceResult { +public class TourRaceResult extends SeriesRaceResult { public final List times; - public MinitourRaceResult(final Runner runner, final List times, final MinitourRace race) { + public TourRaceResult(final Runner runner, final List times, final TourRace race) { super(runner, race); this.times = times; @@ -46,7 +46,7 @@ protected String getIndividualRunnerName() { public int comparePerformanceTo(final RaceResult other) { final Duration duration = duration(); - final Duration other_duration = ((MinitourRaceResult) other).duration(); + final Duration other_duration = ((TourRaceResult) other).duration(); return Comparator.nullsLast(Duration::compareTo).compare(duration, other_duration); } @@ -80,6 +80,6 @@ private boolean completedAnyRacesSoFar() { private List getTimesInRacesTakenPlace() { - return times.subList(0, ((MinitourRace) race).getNumberOfRacesTakenPlace()); + return times.subList(0, ((TourRace) race).getNumberOfRacesTakenPlace()); } } diff --git a/src/main/java/org/grahamkirby/race_timing/single_race/SingleRaceInput.java b/src/main/java/org/grahamkirby/race_timing/single_race/SingleRaceInput.java index a80e9063..633a23b1 100644 --- a/src/main/java/org/grahamkirby/race_timing/single_race/SingleRaceInput.java +++ b/src/main/java/org/grahamkirby/race_timing/single_race/SingleRaceInput.java @@ -34,11 +34,13 @@ public abstract class SingleRaceInput extends RaceInput { final Function race_entry_mapper = line -> makeRaceEntry(Arrays.stream(line.split("\t")).toList()); + final Function race_result_mapper = line -> makeRaceResult(new ArrayList<>(Arrays.stream(line.split("\t")).toList())); + + int next_fake_bib_number = 1; public SingleRaceInput(final Race race) { super(race); - readProperties(); } @@ -53,13 +55,12 @@ protected void readProperties() { protected List loadEntries() throws IOException { -// final Function race_entry_mapper = line -> makeRaceEntry(Arrays.stream(line.split("\t")).toList()); if (entries_path == null) return List.of(); final List entries = Files.readAllLines(race.getPath(entries_path)).stream(). - filter(line -> !line.isEmpty()). - map(race_entry_mapper). - toList(); + filter(line -> !line.isEmpty()). + map(race_entry_mapper). + toList(); checkForDuplicateBibNumbers(entries); checkForDuplicateEntries(entries); @@ -69,25 +70,24 @@ protected List loadEntries() throws IOException { protected List loadOverallResults() throws IOException { -// final Function race_entry_mapper = line -> makeRaceEntry(Arrays.stream(line.split("\t")).toList()); if (results_path == null) return new ArrayList<>(); return Files.readAllLines(race.getPath(results_path)).stream(). - filter(line -> !line.isEmpty()). - map(line -> makeRaceResult(new ArrayList<>(Arrays.stream(line.split("\t")).toList()))). - toList(); + filter(line -> !line.isEmpty()). + map(race_result_mapper). + toList(); } - int next_fake_bib_number = 1; - - private RaceResult makeRaceResult(List elements) { + private RaceResult makeRaceResult(final List elements) { elements.addFirst(String.valueOf(next_fake_bib_number++)); - IndividualRaceEntry entry = new IndividualRaceEntry(elements, race); - IndividualRaceResult result = new IndividualRaceResult((IndividualRace) race, entry); + final IndividualRaceEntry entry = new IndividualRaceEntry(elements, race); + final IndividualRaceResult result = new IndividualRaceResult((IndividualRace) race, entry); + result.finish_time = Normalisation.parseTime(elements.getLast()); result.completion_status = CompletionStatus.COMPLETED; + return result; } diff --git a/src/main/resources/configuration/capitalisation_stop_words.csv b/src/main/resources/configuration/capitalisation_stop_words.csv index a03c09f6..008b6c42 100644 --- a/src/main/resources/configuration/capitalisation_stop_words.csv +++ b/src/main/resources/configuration/capitalisation_stop_words.csv @@ -42,6 +42,7 @@ McCahill McCallum McCarron McCavana +McCheyne McClelland McClung McClure @@ -57,6 +58,7 @@ McDermott McDonald McDowall McEwan +McGeehan McGhie McGill McGowan diff --git a/src/test/java/org/grahamkirby/race_timing/MinitourTest.java b/src/test/java/org/grahamkirby/race_timing/MinitourTest.java index e06a3bb2..53db6cc2 100644 --- a/src/test/java/org/grahamkirby/race_timing/MinitourTest.java +++ b/src/test/java/org/grahamkirby/race_timing/MinitourTest.java @@ -17,7 +17,7 @@ package org.grahamkirby.race_timing; import org.grahamkirby.race_timing.common.Race; -import org.grahamkirby.race_timing.series_race.fife_ac_minitour.MinitourRace; +import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -27,7 +27,7 @@ public class MinitourTest extends RaceTest { @Override protected Race makeRace(final Path config_file_path) throws IOException { - return new MinitourRace(config_file_path); + return new TourRace(config_file_path); } @Test diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesIndividualTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesIndividualTest.java index b0f1315a..1f3535a0 100644 --- a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesIndividualTest.java +++ b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesIndividualTest.java @@ -80,4 +80,9 @@ public void strathBlebo2023() throws Exception { public void strathBlebo2024() throws Exception { testExpectedCompletion("actual_races/individual_race/strath_blebo/2024"); } + + @Test + public void juniorHillRaces2017() throws Exception { + testExpectedCompletion("actual_races/individual_race/junior_hill_races/2017"); + } } diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java index 29e9975c..d2ac841d 100644 --- a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java +++ b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesMinitourTest.java @@ -18,7 +18,7 @@ import org.grahamkirby.race_timing.RaceTest; import org.grahamkirby.race_timing.common.Race; -import org.grahamkirby.race_timing.series_race.fife_ac_minitour.MinitourRace; +import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -28,7 +28,7 @@ public class ActualRacesMinitourTest extends RaceTest { @Override protected Race makeRace(final Path config_file_path) throws IOException { - return new MinitourRace(config_file_path); + return new TourRace(config_file_path); } @Test diff --git a/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesTourTest.java b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesTourTest.java new file mode 100644 index 00000000..06e96f73 --- /dev/null +++ b/src/test/java/org/grahamkirby/race_timing/actual_races/ActualRacesTourTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2024 Graham Kirby: + * + * + * This file is part of the module race-timing. + * + * race-timing is free software: you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * race-timing is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with race-timing. If not, see + * . + */ +package org.grahamkirby.race_timing.actual_races; + +import org.grahamkirby.race_timing.RaceTest; +import org.grahamkirby.race_timing.common.Race; +import org.grahamkirby.race_timing.series_race.fife_ac_tour.TourRace; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Path; + +public class ActualRacesTourTest extends RaceTest { + + @Override + protected Race makeRace(final Path config_file_path) throws IOException { + return new TourRace(config_file_path); + } + + @Test + public void tour2017Completed3() throws Exception { + testExpectedCompletion("actual_races/series_race/tour/2017/completed_3"); + } + + @Test + public void tour2017Completed5() throws Exception { + testExpectedCompletion("actual_races/series_race/tour/2017/completed_5"); + } +} diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/combined.html b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/combined.html new file mode 100644 index 00000000..dced437d --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/combined.html @@ -0,0 +1,462 @@ +

    Results

    +

    Prizes

    +

    Female Under 15

    +
      +
    • 1 Anna Hedley (Fife AC) 00:16:00
      • +
    • 2 Anna Dalgleish (Fife AC) 00:17:45
      • +
    • 3 Hannah McGeehan (Inverclyde) 00:18:29
      • +
    + +

    Male Under 15

    +
      +
    • 1 Ben Cameron (Forres Harriers) 00:14:30
      • +
    • 2 James Connelly (Garscube Harriers) 00:15:16
      • +
    • 3 Struan Bennet (Fife AC) 00:15:32
      • +
    + +

    Female Under 17

    +
      +
    • 1 Lynn McKenna (Giffnock North) 00:33:12
      • +
    • 2 Zoe Nicholson (Pitreavie) 00:35:25
      • +
    • 3 Beth Hobbs (Moorfoots) 00:35:55
      • +
    + +

    Male Under 17

    +
      +
    • 1 Robert Sparks (Fife AC) 00:29:09
      • +
    • 2 Iain McWhinnie (Fife AC) 00:30:19
      • +
    • 3 Cameron Corrigan (Kilbarchan) 00:30:28
      • +
    + +

    Female Under 20

    +
      +
    • 1 Anisha Badial (Aberdeen AAC) 00:50:53
      • +
    • 2 Grace Whelan (Moray Road Runners) 00:52:48
      • +
    • 3 Mairi Wallace (Moorfoots) 01:00:32
      • +
    + +

    Male Under 20

    +
      +
    • 1 George Rees (Fife AC) 00:43:53
      • +
    • 2 Cody Stevenson (Garscube Harriers) 00:46:00
      • +
    • 3 Cameron Watson (Inverclyde) 00:48:42
      • +
    + +

    Overall

    + +

    U15 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    125Anna HedleyFife ACFU1500:16:00
    238Anna DalgleishFife ACFU1500:17:45
    336Hannah McGeehanInverclydeFU1500:18:29
    431Mia CrickmarFife ACFU1500:19:00
    537Libby SmithFife ACFU1500:19:27
    630Eilidh MooneyMoorfootsFU1500:19:29
    739Abby HammermanInverclydeFU1500:20:03
    826Esmee ThomsFife ACFU1500:20:20
    933Ailsa BennetFife ACFU1500:20:23
    1028Harriet WhelanMoray Road RunnersFU1500:21:19
    1134Orla McGeehanInverclydeFU1500:22:14
    + +

    U15 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    122Ben CameronForres HarriersMU1500:14:30
    221James ConnellyGarscube HarriersMU1500:15:16
    332Struan BennetFife ACMU1500:15:32
    427Finlay MuirCentral ACMU1500:15:41
    529Sam GriffinAberdeen ACMU1500:15:55
    623Andrew WinterInverclydeMU1500:17:59
    724James GrantStrathearn HarriersMU1500:18:18
    835Ross DavidsonInverclydeMU1500:19:09
    + +

    U17 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    159Lynn McKennaGiffnock NorthFU1700:33:12
    266Zoe NicholsonPitreavieFU1700:35:25
    362Beth HobbsMoorfootsFU1700:35:55
    460Cliona McCheyneInverclydeFU1700:37:03
    + +

    U17 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    164Robert SparksFife ACMU1700:29:09
    268Iain McWhinnieFife ACMU1700:30:19
    355Cameron CorriganKilbarchanMU1700:30:28
    463Levi SweeneyStrathearn HarriersMU1700:32:33
    556Jack TrainerGarscube HarriersMU1700:32:36
    665Owen KeddieFife ACMU1700:32:49
    769Colin McKieAnster HaddiesMU1700:32:55
    867Gavin McWhinnieFife ACMU1700:33:57
    961Ross WyseFife ACMU1700:34:10
    1057Luke NelsonGiffnock NorthMU1700:36:34
    + +

    U20 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    174Anisha BadialAberdeen AACFU2000:50:53
    272Grace WhelanMoray Road RunnersFU2000:52:48
    373Mairi WallaceMoorfootsFU2001:00:32
    + +

    U20 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    176George ReesFife ACMU2000:43:53
    270Cody StevensonGarscube HarriersMU2000:46:00
    371Cameron WatsonInverclydeMU2000:48:42
    475Craig MorrisFife ACMU2000:55:18
    +

    Results generated using race-timing.

    \ No newline at end of file diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.csv b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.csv new file mode 100644 index 00000000..c84eaa4c --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.csv @@ -0,0 +1,41 @@ +Pos,No,Runner,Club,Category,Time +1,25,Anna Hedley,Fife AC,FU15,00:16:00 +2,38,Anna Dalgleish,Fife AC,FU15,00:17:45 +3,36,Hannah McGeehan,Inverclyde,FU15,00:18:29 +4,31,Mia Crickmar,Fife AC,FU15,00:19:00 +5,37,Libby Smith,Fife AC,FU15,00:19:27 +6,30,Eilidh Mooney,Moorfoots,FU15,00:19:29 +7,39,Abby Hammerman,Inverclyde,FU15,00:20:03 +8,26,Esmee Thoms,Fife AC,FU15,00:20:20 +9,33,Ailsa Bennet,Fife AC,FU15,00:20:23 +10,28,Harriet Whelan,Moray Road Runners,FU15,00:21:19 +11,34,Orla McGeehan,Inverclyde,FU15,00:22:14 +1,22,Ben Cameron,Forres Harriers,MU15,00:14:30 +2,21,James Connelly,Garscube Harriers,MU15,00:15:16 +3,32,Struan Bennet,Fife AC,MU15,00:15:32 +4,27,Finlay Muir,Central AC,MU15,00:15:41 +5,29,Sam Griffin,Aberdeen AC,MU15,00:15:55 +6,23,Andrew Winter,Inverclyde,MU15,00:17:59 +7,24,James Grant,Strathearn Harriers,MU15,00:18:18 +8,35,Ross Davidson,Inverclyde,MU15,00:19:09 +1,59,Lynn McKenna,Giffnock North,FU17,00:33:12 +2,66,Zoe Nicholson,Pitreavie,FU17,00:35:25 +3,62,Beth Hobbs,Moorfoots,FU17,00:35:55 +4,60,Cliona McCheyne,Inverclyde,FU17,00:37:03 +1,64,Robert Sparks,Fife AC,MU17,00:29:09 +2,68,Iain McWhinnie,Fife AC,MU17,00:30:19 +3,55,Cameron Corrigan,Kilbarchan,MU17,00:30:28 +4,63,Levi Sweeney,Strathearn Harriers,MU17,00:32:33 +5,56,Jack Trainer,Garscube Harriers,MU17,00:32:36 +6,65,Owen Keddie,Fife AC,MU17,00:32:49 +7,69,Colin McKie,Anster Haddies,MU17,00:32:55 +8,67,Gavin McWhinnie,Fife AC,MU17,00:33:57 +9,61,Ross Wyse,Fife AC,MU17,00:34:10 +10,57,Luke Nelson,Giffnock North,MU17,00:36:34 +1,74,Anisha Badial,Aberdeen AAC,FU20,00:50:53 +2,72,Grace Whelan,Moray Road Runners,FU20,00:52:48 +3,73,Mairi Wallace,Moorfoots,FU20,01:00:32 +1,76,George Rees,Fife AC,MU20,00:43:53 +2,70,Cody Stevenson,Garscube Harriers,MU20,00:46:00 +3,71,Cameron Watson,Inverclyde,MU20,00:48:42 +4,75,Craig Morris,Fife AC,MU20,00:55:18 diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.html b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.html new file mode 100644 index 00000000..e96861d0 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_overall_2017.html @@ -0,0 +1,416 @@ + +

    U15 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    125Anna HedleyFife ACFU1500:16:00
    238Anna DalgleishFife ACFU1500:17:45
    336Hannah McGeehanInverclydeFU1500:18:29
    431Mia CrickmarFife ACFU1500:19:00
    537Libby SmithFife ACFU1500:19:27
    630Eilidh MooneyMoorfootsFU1500:19:29
    739Abby HammermanInverclydeFU1500:20:03
    826Esmee ThomsFife ACFU1500:20:20
    933Ailsa BennetFife ACFU1500:20:23
    1028Harriet WhelanMoray Road RunnersFU1500:21:19
    1134Orla McGeehanInverclydeFU1500:22:14
    + +

    U15 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    122Ben CameronForres HarriersMU1500:14:30
    221James ConnellyGarscube HarriersMU1500:15:16
    332Struan BennetFife ACMU1500:15:32
    427Finlay MuirCentral ACMU1500:15:41
    529Sam GriffinAberdeen ACMU1500:15:55
    623Andrew WinterInverclydeMU1500:17:59
    724James GrantStrathearn HarriersMU1500:18:18
    835Ross DavidsonInverclydeMU1500:19:09
    + +

    U17 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    159Lynn McKennaGiffnock NorthFU1700:33:12
    266Zoe NicholsonPitreavieFU1700:35:25
    362Beth HobbsMoorfootsFU1700:35:55
    460Cliona McCheyneInverclydeFU1700:37:03
    + +

    U17 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    164Robert SparksFife ACMU1700:29:09
    268Iain McWhinnieFife ACMU1700:30:19
    355Cameron CorriganKilbarchanMU1700:30:28
    463Levi SweeneyStrathearn HarriersMU1700:32:33
    556Jack TrainerGarscube HarriersMU1700:32:36
    665Owen KeddieFife ACMU1700:32:49
    769Colin McKieAnster HaddiesMU1700:32:55
    867Gavin McWhinnieFife ACMU1700:33:57
    961Ross WyseFife ACMU1700:34:10
    1057Luke NelsonGiffnock NorthMU1700:36:34
    + +

    U20 Females

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    174Anisha BadialAberdeen AACFU2000:50:53
    272Grace WhelanMoray Road RunnersFU2000:52:48
    373Mairi WallaceMoorfootsFU2001:00:32
    + +

    U20 Males

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerClubCatTime
    176George ReesFife ACMU2000:43:53
    270Cody StevensonGarscube HarriersMU2000:46:00
    371Cameron WatsonInverclydeMU2000:48:42
    475Craig MorrisFife ACMU2000:55:18
    diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.html b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.html new file mode 100644 index 00000000..5b413034 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.html @@ -0,0 +1,43 @@ +

    Prizes

    +

    Female Under 15

    +
      +
    • 1 Anna Hedley (Fife AC) 00:16:00
      • +
    • 2 Anna Dalgleish (Fife AC) 00:17:45
      • +
    • 3 Hannah McGeehan (Inverclyde) 00:18:29
      • +
    + +

    Male Under 15

    +
      +
    • 1 Ben Cameron (Forres Harriers) 00:14:30
      • +
    • 2 James Connelly (Garscube Harriers) 00:15:16
      • +
    • 3 Struan Bennet (Fife AC) 00:15:32
      • +
    + +

    Female Under 17

    +
      +
    • 1 Lynn McKenna (Giffnock North) 00:33:12
      • +
    • 2 Zoe Nicholson (Pitreavie) 00:35:25
      • +
    • 3 Beth Hobbs (Moorfoots) 00:35:55
      • +
    + +

    Male Under 17

    +
      +
    • 1 Robert Sparks (Fife AC) 00:29:09
      • +
    • 2 Iain McWhinnie (Fife AC) 00:30:19
      • +
    • 3 Cameron Corrigan (Kilbarchan) 00:30:28
      • +
    + +

    Female Under 20

    +
      +
    • 1 Anisha Badial (Aberdeen AAC) 00:50:53
      • +
    • 2 Grace Whelan (Moray Road Runners) 00:52:48
      • +
    • 3 Mairi Wallace (Moorfoots) 01:00:32
      • +
    + +

    Male Under 20

    +
      +
    • 1 George Rees (Fife AC) 00:43:53
      • +
    • 2 Cody Stevenson (Garscube Harriers) 00:46:00
      • +
    • 3 Cameron Watson (Inverclyde) 00:48:42
      • +
    + diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.pdf b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.pdf new file mode 100644 index 00000000..aab17261 Binary files /dev/null and b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.pdf differ diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.txt b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.txt new file mode 100644 index 00000000..90c8f248 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/junior_hill_prizes_2017.txt @@ -0,0 +1,51 @@ +Junior Hill Races Results 2017 +============================ + +Category: Female Under 15 +------------------------- + +1: Anna Hedley (Fife AC) 00:16:00 +2: Anna Dalgleish (Fife AC) 00:17:45 +3: Hannah McGeehan (Inverclyde) 00:18:29 + + +Category: Male Under 15 +----------------------- + +1: Ben Cameron (Forres Harriers) 00:14:30 +2: James Connelly (Garscube Harriers) 00:15:16 +3: Struan Bennet (Fife AC) 00:15:32 + + +Category: Female Under 17 +------------------------- + +1: Lynn McKenna (Giffnock North) 00:33:12 +2: Zoe Nicholson (Pitreavie) 00:35:25 +3: Beth Hobbs (Moorfoots) 00:35:55 + + +Category: Male Under 17 +----------------------- + +1: Robert Sparks (Fife AC) 00:29:09 +2: Iain McWhinnie (Fife AC) 00:30:19 +3: Cameron Corrigan (Kilbarchan) 00:30:28 + + +Category: Female Under 20 +------------------------- + +1: Anisha Badial (Aberdeen AAC) 00:50:53 +2: Grace Whelan (Moray Road Runners) 00:52:48 +3: Mairi Wallace (Moorfoots) 01:00:32 + + +Category: Male Under 20 +----------------------- + +1: George Rees (Fife AC) 00:43:53 +2: Cody Stevenson (Garscube Harriers) 00:46:00 +3: Cameron Watson (Inverclyde) 00:48:42 + + diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/processing_notes.txt b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/expected/processing_notes.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_entry_individual_junior.csv b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_entry_individual_junior.csv new file mode 100644 index 00000000..ffb3fdf2 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_entry_individual_junior.csv @@ -0,0 +1,6 @@ +Female Under 15,FU15,Female,13,14 +Male Under 15,MU15,Male,13,14 +Female Under 17,FU17,Female,15,16 +Male Under 17,MU17,Male,15,16 +Female Under 20,FU20,Female,17,19 +Male Under 20,MU20,Male,17,19 diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_prize_individual_junior.csv b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_prize_individual_junior.csv new file mode 100644 index 00000000..4864b268 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/categories_prize_individual_junior.csv @@ -0,0 +1,6 @@ +Female Under 15,FU15,Female,13,14,U15 Females,3 +Male Under 15,MU15,Male,13,14,U15 Males,3 +Female Under 17,FU17,Female,15,16,U17 Females,3 +Male Under 17,MU17,Male,15,16,U17 Males,3 +Female Under 20,FU20,Female,17,19,U20 Females,3 +Male Under 20,MU20,Male,17,19,U20 Males,3 diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/config.txt b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/config.txt new file mode 100644 index 00000000..31563875 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/config.txt @@ -0,0 +1,10 @@ +YEAR = 2017 +RACE_NAME_FOR_RESULTS = Junior Hill Races +RACE_NAME_FOR_FILENAMES = junior_hill + +# Relative to directory containing configuration file. +ENTRIES_PATH = entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = categories_entry_individual_junior.csv +CATEGORIES_PRIZE_PATH = categories_prize_individual_junior.csv diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/entries.txt b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/entries.txt new file mode 100644 index 00000000..5002a443 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/entries.txt @@ -0,0 +1,41 @@ +21 James Connelly Garscube Harriers MU15 +22 Ben Cameron Forres Harriers MU15 +23 Andrew Winter Inverclyde MU15 +24 James Grant Strathearn Harriers MU15 +25 Anna Hedley Fife AC FU15 +26 Esmee Thoms Fife AC FU15 +27 Finlay Muir Central AC MU15 +28 Harriet Whelan Moray Road Runners FU15 +29 Sam Griffin Aberdeen AC MU15 +30 Eilidh Mooney Moorfoots FU15 +31 Mia Crickmar Fife AC FU15 +32 Struan Bennet Fife AC MU15 +33 Ailsa Bennet Fife AC FU15 +34 Orla McGeehan Inverclyde FU15 +35 Ross Davidson Inverclyde MU15 +36 Hannah McGeehan Inverclyde FU15 +37 Libby Smith Fife AC FU15 +38 Anna Dalgleish Fife AC FU15 +39 Abby Hammerman Inverclyde FU15 +55 Cameron Corrigan Kilbarchan MU17 +56 Jack Trainer Garscube Harriers MU17 +57 Luke Nelson Giffnock North MU17 +58 Charlotte McKenna Giffnock North FU17 +59 Lynn McKenna Giffnock North FU17 +60 Cliona McCheyne Inverclyde FU17 +61 Ross Wyse Fife AC MU17 +62 Beth Hobbs Moorfoots FU17 +63 Levi Sweeney Strathearn Harriers MU17 +64 Robert Sparks Fife AC MU17 +65 Owen Keddie Fife AC MU17 +66 Zoe Nicholson Pitreavie FU17 +67 Gavin McWhinnie Fife AC MU17 +68 Iain McWhinnie Fife AC MU17 +69 Colin McKie Anster Haddies MU17 +70 Cody Stevenson Garscube Harriers MU20 +71 Cameron Watson Inverclyde MU20 +72 Grace Whelan Moray Road Runners FU20 +73 Mairi Wallace Moorfoots FU20 +74 Anisha Badial Aberdeen AAC FU20 +75 Craig Morris Fife AC MU20 +76 George Rees Fife AC MU20 diff --git a/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/rawtimes.txt b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/rawtimes.txt new file mode 100644 index 00000000..b224fd31 --- /dev/null +++ b/src/test/resources/actual_races/individual_race/junior_hill_races/2017/input/rawtimes.txt @@ -0,0 +1,40 @@ +22 00:14:30 +21 00:15:16 +32 00:15:32 +27 00:15:41 +29 00:15:55 +25 00:16:00 +38 00:17:45 +23 00:17:59 +24 00:18:18 +36 00:18:29 +31 00:19:00 +35 00:19:09 +37 00:19:27 +30 00:19:29 +39 00:20:03 +26 00:20:20 +33 00:20:23 +28 00:21:19 +34 00:22:14 +64 00:29:09 +68 00:30:19 +55 00:30:28 +63 00:32:33 +56 00:32:36 +65 00:32:49 +69 00:32:55 +59 00:33:12 +67 00:33:57 +61 00:34:10 +66 00:35:25 +62 00:35:55 +57 00:36:34 +60 00:37:03 +76 00:43:53 +70 00:46:00 +71 00:48:42 +74 00:50:53 +72 00:52:48 +75 00:55:18 +73 01:00:32 diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/combined.html b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/combined.html index 13582f5d..6caeda38 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/combined.html +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/combined.html @@ -68,7 +68,7 @@

    Overall

    Y YYY - + 3 Neil Millar M40 946 @@ -85,7 +85,7 @@

    Overall

    N YYY - + 4 David Norrie M60 1012 @@ -102,7 +102,7 @@

    Overall

    N YYN - + 5 Derek Adamson M40 - @@ -119,7 +119,7 @@

    Overall

    N YYY - + 6 Sue Whisler F50 1291 @@ -136,7 +136,7 @@

    Overall

    N YYN - + 7 Graham Bennison M60 1361 @@ -153,7 +153,7 @@

    Overall

    N YYY - + 8 Daniel Newman M40 - @@ -170,7 +170,7 @@

    Overall

    N YYY - + 9 Rick Booth M40 870 @@ -187,7 +187,7 @@

    Overall

    N YYY - + 10 Jennifer Cruickshanks FS - @@ -204,7 +204,7 @@

    Overall

    N YYY - + 11 David Sleigh M50 - @@ -221,7 +221,7 @@

    Overall

    N YYN - + 12 Margaret Martin F50 - @@ -238,7 +238,7 @@

    Overall

    N YYY - + 13 Jocelyn Scott F50 - @@ -255,7 +255,7 @@

    Overall

    N YYY - + 14 Tom Scott M60 1393 diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.csv b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.csv index 5fcfbf8c..d6baae35 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.csv +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.csv @@ -1,18 +1,18 @@ Pos,Runner,Category,Norman's Law,Kinnoull,Largo,Lomonds,Kinross,Stirling,Black Rock,Sandy Slither,Falkland Trail,Gateside,Total,Qualified,Hill?,Road?,Trail? 1,Brian R Smith,M50,-,1018,1028,1189,1001,-,-,992,1067,943,6050,Y,Y,Y,Y 2,Innes Bracegirdle,F60,1026,1010,-,-,-,984,-,1011,1095,1003,6129,Y,Y,Y,Y -,Neil Millar,M40,946,-,-,-,873,-,820,-,987,848,-,N,Y,Y,Y -,David Norrie,M60,1012,1024,-,-,950,973,-,962,-,-,-,N,Y,Y,N -,Derek Adamson,M40,-,1253,-,-,1073,1112,-,-,1291,1146,-,N,Y,Y,Y -,Sue Whisler,F50,1291,1211,1224,-,-,1071,-,1189,-,-,-,N,Y,Y,N -,Graham Bennison,M60,1361,-,-,-,1248,-,-,1260,1387,1238,-,N,Y,Y,Y -,Daniel Newman,M40,-,-,-,997,-,877,-,-,805,834,-,N,Y,Y,Y -,Rick Booth,M40,870,-,876,-,-,-,-,857,969,-,-,N,Y,Y,Y -,Jennifer Cruickshanks,FS,-,-,919,-,-,907,-,930,-,853,-,N,Y,Y,Y -,David Sleigh,M50,-,916,947,-,-,921,-,914,-,-,-,N,Y,Y,N -,Margaret Martin,F50,-,1061,-,1128,998,-,-,-,1110,-,-,N,Y,Y,Y -,Jocelyn Scott,F50,-,1078,-,1019,-,-,-,1087,1155,-,-,N,Y,Y,Y -,Tom Scott,M60,1393,984,-,-,-,-,-,957,1009,-,-,N,Y,Y,Y +3,Neil Millar,M40,946,-,-,-,873,-,820,-,987,848,-,N,Y,Y,Y +4,David Norrie,M60,1012,1024,-,-,950,973,-,962,-,-,-,N,Y,Y,N +5,Derek Adamson,M40,-,1253,-,-,1073,1112,-,-,1291,1146,-,N,Y,Y,Y +6,Sue Whisler,F50,1291,1211,1224,-,-,1071,-,1189,-,-,-,N,Y,Y,N +7,Graham Bennison,M60,1361,-,-,-,1248,-,-,1260,1387,1238,-,N,Y,Y,Y +8,Daniel Newman,M40,-,-,-,997,-,877,-,-,805,834,-,N,Y,Y,Y +9,Rick Booth,M40,870,-,876,-,-,-,-,857,969,-,-,N,Y,Y,Y +10,Jennifer Cruickshanks,FS,-,-,919,-,-,907,-,930,-,853,-,N,Y,Y,Y +11,David Sleigh,M50,-,916,947,-,-,921,-,914,-,-,-,N,Y,Y,N +12,Margaret Martin,F50,-,1061,-,1128,998,-,-,-,1110,-,-,N,Y,Y,Y +13,Jocelyn Scott,F50,-,1078,-,1019,-,-,-,1087,1155,-,-,N,Y,Y,Y +14,Tom Scott,M60,1393,984,-,-,-,-,-,957,1009,-,-,N,Y,Y,Y ,John Keenlyside,M50,-,1104,-,-,988,-,-,-,-,1044,-,N,Y,Y,Y ,Eddie Sanders,MS,-,-,1096,-,-,1037,-,1062,-,-,-,N,Y,Y,N ,Alastair Robertson,M70,-,-,-,-,-,-,-,1506,1615,1483,-,N,N,Y,Y diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.html b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.html index 59a25cfd..0fd13f1a 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.html +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/expected/grand_prix_overall_2016.html @@ -55,7 +55,7 @@ Y YYY - + 3 Neil Millar M40 946 @@ -72,7 +72,7 @@ N YYY - + 4 David Norrie M60 1012 @@ -89,7 +89,7 @@ N YYN - + 5 Derek Adamson M40 - @@ -106,7 +106,7 @@ N YYY - + 6 Sue Whisler F50 1291 @@ -123,7 +123,7 @@ N YYN - + 7 Graham Bennison M60 1361 @@ -140,7 +140,7 @@ N YYY - + 8 Daniel Newman M40 - @@ -157,7 +157,7 @@ N YYY - + 9 Rick Booth M40 870 @@ -174,7 +174,7 @@ N YYY - + 10 Jennifer Cruickshanks FS - @@ -191,7 +191,7 @@ N YYY - + 11 David Sleigh M50 - @@ -208,7 +208,7 @@ N YYN - + 12 Margaret Martin F50 - @@ -225,7 +225,7 @@ N YYY - + 13 Jocelyn Scott F50 - @@ -242,7 +242,7 @@ N YYY - + 14 Tom Scott M60 1393 diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/input/config.txt b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/input/config.txt index 4600f728..6d1d08ef 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/input/config.txt +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_10/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Grand Prix RACE_NAME_FOR_FILENAMES = grand_prix RACES = normans_law/input/config.txt,kinnoull/input/config.txt,largo/input/config.txt,lomonds/input/config.txt,kinross_10k/input/config.txt,stirling_10k/input/config.txt,black_rock/input/config.txt,sandy_slither/input/config.txt,trail_champs/input/config.txt,gateside_gallop/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 12 MINIMUM_NUMBER_OF_RACES = 6 QUALIFYING_CLUBS = Fife AC,Kirkcaldy Wizards diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_12/input/config.txt b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_12/input/config.txt index 0196d4ef..ba540f8a 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_12/input/config.txt +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_12/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Grand Prix RACE_NAME_FOR_FILENAMES = grand_prix RACES = normans_law/input/config.txt,kinnoull/input/config.txt,largo/input/config.txt,lomonds/input/config.txt,kinross_10k/input/config.txt,stirling_10k/input/config.txt,east_neuk_10k/input/config.txt,giffordtown_5k/input/config.txt,black_rock/input/config.txt,sandy_slither/input/config.txt,trail_champs/input/config.txt,gateside_gallop/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 12 MINIMUM_NUMBER_OF_RACES = 6 QUALIFYING_CLUBS = Fife AC,Kirkcaldy Wizards diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/combined.html b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/combined.html index 11cdd0c6..0207aaa6 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/combined.html +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/combined.html @@ -20,7 +20,7 @@

    Overall

    - + 1 David Norrie M60 1012 @@ -33,7 +33,7 @@

    Overall

    N YYN - + 2 Brian R Smith M50 - @@ -46,7 +46,7 @@

    Overall

    N YYN - + 3 Sue Whisler F50 1291 @@ -59,7 +59,7 @@

    Overall

    N YYN - + 4 Rick Booth M40 870 @@ -72,7 +72,7 @@

    Overall

    N YYN - + 5 Neil Millar M40 946 @@ -85,7 +85,7 @@

    Overall

    N YYN - + 6 David Sleigh M50 - @@ -98,7 +98,7 @@

    Overall

    N YYN - + 7 Innes Bracegirdle F60 1026 @@ -111,7 +111,7 @@

    Overall

    N YYN - + 8 Tom Scott M60 1393 @@ -124,7 +124,7 @@

    Overall

    N YYN - + 9 Graham Bennison M60 1361 @@ -137,7 +137,7 @@

    Overall

    N YYN - + 10 Jimmy McIntyre M40 873 @@ -150,7 +150,7 @@

    Overall

    N YNN - + 11 Gary Barker M50 904 @@ -163,7 +163,7 @@

    Overall

    N YYN - + 12 Jennifer Cruickshanks FS - @@ -176,7 +176,7 @@

    Overall

    N YYN - + 13 Margaret Martin F50 - @@ -189,7 +189,7 @@

    Overall

    N YNN - + 14 John Keenlyside M50 - @@ -202,7 +202,7 @@

    Overall

    N YNN - + 15 Eddie Sanders MS - @@ -215,7 +215,7 @@

    Overall

    N YYN - + 16 Jocelyn Scott F50 - @@ -228,7 +228,7 @@

    Overall

    N YYN - + 17 Stewart Davidson M50 - @@ -241,7 +241,7 @@

    Overall

    N YNN - + 18 Derek Adamson M40 - @@ -254,7 +254,7 @@

    Overall

    N YNN - + 19 Harvey Rankin MS - @@ -267,7 +267,7 @@

    Overall

    N YNN - + 20 Alex Louden MS - @@ -280,7 +280,7 @@

    Overall

    N YNN - + 21 Halina Rees FS 804 @@ -293,7 +293,7 @@

    Overall

    N YNN - + 22 Alexander Louden MS 808 @@ -306,7 +306,7 @@

    Overall

    N YNN - + 23 Fergus Ingledew MS - @@ -319,7 +319,7 @@

    Overall

    N NYN - + 24 Alison McGill FS - @@ -332,7 +332,7 @@

    Overall

    N NYN - + 25 David Cowan M50 886 @@ -345,7 +345,7 @@

    Overall

    N YNN - + 26 Clive Roberts M50 898 @@ -358,7 +358,7 @@

    Overall

    N YNN - + 27 Andy Milne M40 916 @@ -371,7 +371,7 @@

    Overall

    N YNN - + 28 Simon Fox M50 923 @@ -384,7 +384,7 @@

    Overall

    N YNN - + 29 Katie Jones FS - @@ -397,7 +397,7 @@

    Overall

    N NYN - + 30 Neil Mitchell M40 947 @@ -410,7 +410,7 @@

    Overall

    N YNN - + 31 Alasdair Hood M50 - @@ -423,7 +423,7 @@

    Overall

    N NYN - + 32 Eva Groeneveld FS 998 @@ -436,7 +436,7 @@

    Overall

    N YNN - + 33 Graham Barker MS 1007 @@ -449,7 +449,7 @@

    Overall

    N YNN - + 34 Peter Darbyshire M50 1010 @@ -462,7 +462,7 @@

    Overall

    N YNN - + 35 Roy McLachlan M60 - @@ -475,7 +475,7 @@

    Overall

    N NYN - + 36 Jim McWhinnie MS - @@ -488,7 +488,7 @@

    Overall

    N YNN - + 37 Innnes Petrie M50 - @@ -501,7 +501,7 @@

    Overall

    N NYN - + 38 Pete Caulton M40 - @@ -514,7 +514,7 @@

    Overall

    N NYN - + 39 Grace Booth FS - @@ -527,7 +527,7 @@

    Overall

    N YNN - + 40 Donna Morgan F40 1226 @@ -540,7 +540,7 @@

    Overall

    N YNN - + 41 Carole Melville F70 1230 @@ -553,7 +553,7 @@

    Overall

    N YNN - + 42 Ally McAdam-Smith F50 - @@ -566,7 +566,7 @@

    Overall

    N NYN - + 43 Anne Whiteford F50 1243 @@ -579,7 +579,7 @@

    Overall

    N YNN - + 44 Robert Thornton M50 - @@ -592,7 +592,7 @@

    Overall

    N YNN - + 45 Eliza McLachlan F60 - @@ -605,7 +605,7 @@

    Overall

    N NYN - + 46 Alastair Robertson M70 - @@ -618,7 +618,7 @@

    Overall

    N NYN - + 47 Jane Askey F70 - diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.csv b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.csv index d9625608..8b594e50 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.csv +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.csv @@ -1,48 +1,48 @@ Pos,Runner,Category,Norman's Law,Kinnoull,Largo,Kinross,Black Rock,Sandy Slither,Total,Qualified,Hill?,Road?,Trail? -,David Norrie,M60,1012,1024,-,950,-,962,-,N,Y,Y,N -,Brian R Smith,M50,-,1018,1028,1001,-,992,-,N,Y,Y,N -,Sue Whisler,F50,1291,1211,1224,-,-,1189,-,N,Y,Y,N -,Rick Booth,M40,870,-,876,-,-,857,-,N,Y,Y,N -,Neil Millar,M40,946,-,-,873,820,-,-,N,Y,Y,N -,David Sleigh,M50,-,916,947,-,-,914,-,N,Y,Y,N -,Innes Bracegirdle,F60,1026,1010,-,-,-,1011,-,N,Y,Y,N -,Tom Scott,M60,1393,984,-,-,-,957,-,N,Y,Y,N -,Graham Bennison,M60,1361,-,-,1248,-,1260,-,N,Y,Y,N -,Jimmy McIntyre,M40,873,-,-,834,-,-,-,N,Y,N,N -,Gary Barker,M50,904,-,-,-,835,-,-,N,Y,Y,N -,Jennifer Cruickshanks,FS,-,-,919,-,-,930,-,N,Y,Y,N -,Margaret Martin,F50,-,1061,-,998,-,-,-,N,Y,N,N -,John Keenlyside,M50,-,1104,-,988,-,-,-,N,Y,N,N -,Eddie Sanders,MS,-,-,1096,-,-,1062,-,N,Y,Y,N -,Jocelyn Scott,F50,-,1078,-,-,-,1087,-,N,Y,Y,N -,Stewart Davidson,M50,-,1109,-,1121,-,-,-,N,Y,N,N -,Derek Adamson,M40,-,1253,-,1073,-,-,-,N,Y,N,N -,Harvey Rankin,MS,-,-,764,-,-,-,-,N,Y,N,N -,Alex Louden,MS,-,-,796,-,-,-,-,N,Y,N,N -,Halina Rees,FS,804,-,-,-,-,-,-,N,Y,N,N -,Alexander Louden,MS,808,-,-,-,-,-,-,N,Y,N,N -,Fergus Ingledew,MS,-,-,-,-,-,831,-,N,N,Y,N -,Alison McGill,FS,-,-,-,-,-,864,-,N,N,Y,N -,David Cowan,M50,886,-,-,-,-,-,-,N,Y,N,N -,Clive Roberts,M50,898,-,-,-,-,-,-,N,Y,N,N -,Andy Milne,M40,916,-,-,-,-,-,-,N,Y,N,N -,Simon Fox,M50,923,-,-,-,-,-,-,N,Y,N,N -,Katie Jones,FS,-,-,-,-,-,937,-,N,N,Y,N -,Neil Mitchell,M40,947,-,-,-,-,-,-,N,Y,N,N -,Alasdair Hood,M50,-,-,-,-,-,956,-,N,N,Y,N -,Eva Groeneveld,FS,998,-,-,-,-,-,-,N,Y,N,N -,Graham Barker,MS,1007,-,-,-,-,-,-,N,Y,N,N -,Peter Darbyshire,M50,1010,-,-,-,-,-,-,N,Y,N,N -,Roy McLachlan,M60,-,-,-,-,-,1021,-,N,N,Y,N -,Jim McWhinnie,MS,-,-,1023,-,-,-,-,N,Y,N,N -,Innnes Petrie,M50,-,-,-,-,-,1071,-,N,N,Y,N -,Pete Caulton,M40,-,-,-,-,-,1100,-,N,N,Y,N -,Grace Booth,FS,-,-,1201,-,-,-,-,N,Y,N,N -,Donna Morgan,F40,1226,-,-,-,-,-,-,N,Y,N,N -,Carole Melville,F70,1230,-,-,-,-,-,-,N,Y,N,N -,Ally McAdam-Smith,F50,-,-,-,-,-,1231,-,N,N,Y,N -,Anne Whiteford,F50,1243,-,-,-,-,-,-,N,Y,N,N -,Robert Thornton,M50,-,1272,-,-,-,-,-,N,Y,N,N -,Eliza McLachlan,F60,-,-,-,-,-,1339,-,N,N,Y,N -,Alastair Robertson,M70,-,-,-,-,-,1506,-,N,N,Y,N -,Jane Askey,F70,-,-,-,-,-,1534,-,N,N,Y,N +1,David Norrie,M60,1012,1024,-,950,-,962,-,N,Y,Y,N +2,Brian R Smith,M50,-,1018,1028,1001,-,992,-,N,Y,Y,N +3,Sue Whisler,F50,1291,1211,1224,-,-,1189,-,N,Y,Y,N +4,Rick Booth,M40,870,-,876,-,-,857,-,N,Y,Y,N +5,Neil Millar,M40,946,-,-,873,820,-,-,N,Y,Y,N +6,David Sleigh,M50,-,916,947,-,-,914,-,N,Y,Y,N +7,Innes Bracegirdle,F60,1026,1010,-,-,-,1011,-,N,Y,Y,N +8,Tom Scott,M60,1393,984,-,-,-,957,-,N,Y,Y,N +9,Graham Bennison,M60,1361,-,-,1248,-,1260,-,N,Y,Y,N +10,Jimmy McIntyre,M40,873,-,-,834,-,-,-,N,Y,N,N +11,Gary Barker,M50,904,-,-,-,835,-,-,N,Y,Y,N +12,Jennifer Cruickshanks,FS,-,-,919,-,-,930,-,N,Y,Y,N +13,Margaret Martin,F50,-,1061,-,998,-,-,-,N,Y,N,N +14,John Keenlyside,M50,-,1104,-,988,-,-,-,N,Y,N,N +15,Eddie Sanders,MS,-,-,1096,-,-,1062,-,N,Y,Y,N +16,Jocelyn Scott,F50,-,1078,-,-,-,1087,-,N,Y,Y,N +17,Stewart Davidson,M50,-,1109,-,1121,-,-,-,N,Y,N,N +18,Derek Adamson,M40,-,1253,-,1073,-,-,-,N,Y,N,N +19,Harvey Rankin,MS,-,-,764,-,-,-,-,N,Y,N,N +20,Alex Louden,MS,-,-,796,-,-,-,-,N,Y,N,N +21,Halina Rees,FS,804,-,-,-,-,-,-,N,Y,N,N +22,Alexander Louden,MS,808,-,-,-,-,-,-,N,Y,N,N +23,Fergus Ingledew,MS,-,-,-,-,-,831,-,N,N,Y,N +24,Alison McGill,FS,-,-,-,-,-,864,-,N,N,Y,N +25,David Cowan,M50,886,-,-,-,-,-,-,N,Y,N,N +26,Clive Roberts,M50,898,-,-,-,-,-,-,N,Y,N,N +27,Andy Milne,M40,916,-,-,-,-,-,-,N,Y,N,N +28,Simon Fox,M50,923,-,-,-,-,-,-,N,Y,N,N +29,Katie Jones,FS,-,-,-,-,-,937,-,N,N,Y,N +30,Neil Mitchell,M40,947,-,-,-,-,-,-,N,Y,N,N +31,Alasdair Hood,M50,-,-,-,-,-,956,-,N,N,Y,N +32,Eva Groeneveld,FS,998,-,-,-,-,-,-,N,Y,N,N +33,Graham Barker,MS,1007,-,-,-,-,-,-,N,Y,N,N +34,Peter Darbyshire,M50,1010,-,-,-,-,-,-,N,Y,N,N +35,Roy McLachlan,M60,-,-,-,-,-,1021,-,N,N,Y,N +36,Jim McWhinnie,MS,-,-,1023,-,-,-,-,N,Y,N,N +37,Innnes Petrie,M50,-,-,-,-,-,1071,-,N,N,Y,N +38,Pete Caulton,M40,-,-,-,-,-,1100,-,N,N,Y,N +39,Grace Booth,FS,-,-,1201,-,-,-,-,N,Y,N,N +40,Donna Morgan,F40,1226,-,-,-,-,-,-,N,Y,N,N +41,Carole Melville,F70,1230,-,-,-,-,-,-,N,Y,N,N +42,Ally McAdam-Smith,F50,-,-,-,-,-,1231,-,N,N,Y,N +43,Anne Whiteford,F50,1243,-,-,-,-,-,-,N,Y,N,N +44,Robert Thornton,M50,-,1272,-,-,-,-,-,N,Y,N,N +45,Eliza McLachlan,F60,-,-,-,-,-,1339,-,N,N,Y,N +46,Alastair Robertson,M70,-,-,-,-,-,1506,-,N,N,Y,N +47,Jane Askey,F70,-,-,-,-,-,1534,-,N,N,Y,N diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.html b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.html index 1f4e76bb..116cfe28 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.html +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/expected/grand_prix_overall_2016.html @@ -17,7 +17,7 @@ - + 1 David Norrie M60 1012 @@ -30,7 +30,7 @@ N YYN - + 2 Brian R Smith M50 - @@ -43,7 +43,7 @@ N YYN - + 3 Sue Whisler F50 1291 @@ -56,7 +56,7 @@ N YYN - + 4 Rick Booth M40 870 @@ -69,7 +69,7 @@ N YYN - + 5 Neil Millar M40 946 @@ -82,7 +82,7 @@ N YYN - + 6 David Sleigh M50 - @@ -95,7 +95,7 @@ N YYN - + 7 Innes Bracegirdle F60 1026 @@ -108,7 +108,7 @@ N YYN - + 8 Tom Scott M60 1393 @@ -121,7 +121,7 @@ N YYN - + 9 Graham Bennison M60 1361 @@ -134,7 +134,7 @@ N YYN - + 10 Jimmy McIntyre M40 873 @@ -147,7 +147,7 @@ N YNN - + 11 Gary Barker M50 904 @@ -160,7 +160,7 @@ N YYN - + 12 Jennifer Cruickshanks FS - @@ -173,7 +173,7 @@ N YYN - + 13 Margaret Martin F50 - @@ -186,7 +186,7 @@ N YNN - + 14 John Keenlyside M50 - @@ -199,7 +199,7 @@ N YNN - + 15 Eddie Sanders MS - @@ -212,7 +212,7 @@ N YYN - + 16 Jocelyn Scott F50 - @@ -225,7 +225,7 @@ N YYN - + 17 Stewart Davidson M50 - @@ -238,7 +238,7 @@ N YNN - + 18 Derek Adamson M40 - @@ -251,7 +251,7 @@ N YNN - + 19 Harvey Rankin MS - @@ -264,7 +264,7 @@ N YNN - + 20 Alex Louden MS - @@ -277,7 +277,7 @@ N YNN - + 21 Halina Rees FS 804 @@ -290,7 +290,7 @@ N YNN - + 22 Alexander Louden MS 808 @@ -303,7 +303,7 @@ N YNN - + 23 Fergus Ingledew MS - @@ -316,7 +316,7 @@ N NYN - + 24 Alison McGill FS - @@ -329,7 +329,7 @@ N NYN - + 25 David Cowan M50 886 @@ -342,7 +342,7 @@ N YNN - + 26 Clive Roberts M50 898 @@ -355,7 +355,7 @@ N YNN - + 27 Andy Milne M40 916 @@ -368,7 +368,7 @@ N YNN - + 28 Simon Fox M50 923 @@ -381,7 +381,7 @@ N YNN - + 29 Katie Jones FS - @@ -394,7 +394,7 @@ N NYN - + 30 Neil Mitchell M40 947 @@ -407,7 +407,7 @@ N YNN - + 31 Alasdair Hood M50 - @@ -420,7 +420,7 @@ N NYN - + 32 Eva Groeneveld FS 998 @@ -433,7 +433,7 @@ N YNN - + 33 Graham Barker MS 1007 @@ -446,7 +446,7 @@ N YNN - + 34 Peter Darbyshire M50 1010 @@ -459,7 +459,7 @@ N YNN - + 35 Roy McLachlan M60 - @@ -472,7 +472,7 @@ N NYN - + 36 Jim McWhinnie MS - @@ -485,7 +485,7 @@ N YNN - + 37 Innnes Petrie M50 - @@ -498,7 +498,7 @@ N NYN - + 38 Pete Caulton M40 - @@ -511,7 +511,7 @@ N NYN - + 39 Grace Booth FS - @@ -524,7 +524,7 @@ N YNN - + 40 Donna Morgan F40 1226 @@ -537,7 +537,7 @@ N YNN - + 41 Carole Melville F70 1230 @@ -550,7 +550,7 @@ N YNN - + 42 Ally McAdam-Smith F50 - @@ -563,7 +563,7 @@ N NYN - + 43 Anne Whiteford F50 1243 @@ -576,7 +576,7 @@ N YNN - + 44 Robert Thornton M50 - @@ -589,7 +589,7 @@ N YNN - + 45 Eliza McLachlan F60 - @@ -602,7 +602,7 @@ N NYN - + 46 Alastair Robertson M70 - @@ -615,7 +615,7 @@ N NYN - + 47 Jane Askey F70 - diff --git a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/input/config.txt b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/input/config.txt index 478f702d..65be154a 100644 --- a/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/input/config.txt +++ b/src/test/resources/actual_races/series_race/grand_prix/2016/completed_6/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Grand Prix RACE_NAME_FOR_FILENAMES = grand_prix RACES = normans_law/input/config.txt,kinnoull/input/config.txt,largo/input/config.txt,kinross_10k/input/config.txt,black_rock/input/config.txt,sandy_slither/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 12 MINIMUM_NUMBER_OF_RACES = 6 QUALIFYING_CLUBS = Fife AC,Kirkcaldy Wizards diff --git a/src/test/resources/actual_races/series_race/midweek/2023/completed_1/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2023/completed_1/input/config.txt index 9dc3abef..338e4ac9 100644 --- a/src/test/resources/actual_races/series_race/midweek/2023/completed_1/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2023/completed_1/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,,,, +RACES = st_andrews/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/midweek/2023/completed_2/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2023/completed_2/input/config.txt index 46a2f2e4..3ecb5b8d 100644 --- a/src/test/resources/actual_races/series_race/midweek/2023/completed_2/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2023/completed_2/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,,, +RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/midweek/2023/completed_3/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2023/completed_3/input/config.txt index 23bb615b..a90e169f 100644 --- a/src/test/resources/actual_races/series_race/midweek/2023/completed_3/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2023/completed_3/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt,, +RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/midweek/2023/completed_4/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2023/completed_4/input/config.txt index c6f4f638..f50f81ac 100644 --- a/src/test/resources/actual_races/series_race/midweek/2023/completed_4/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2023/completed_4/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt,dunnikier/input/config.txt, +RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt,dunnikier/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/midweek/2023/completed_5/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2023/completed_5/input/config.txt index 9fdfef84..64049a7c 100644 --- a/src/test/resources/actual_races/series_race/midweek/2023/completed_5/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2023/completed_5/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt,dunnikier/input/config.txt,balmullo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/midweek/2024/input/config.txt b/src/test/resources/actual_races/series_race/midweek/2024/input/config.txt index 481285ae..10454cbb 100644 --- a/src/test/resources/actual_races/series_race/midweek/2024/input/config.txt +++ b/src/test/resources/actual_races/series_race/midweek/2024/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,hill_of_tarvit/input/config.txt,dunnikier/input/config.txt,balmullo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_1/expected/minitour_overall_2023.csv b/src/test/resources/actual_races/series_race/minitour/2023/completed_1/expected/minitour_overall_2023.csv index fcbdb0f3..468c1459 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_1/expected/minitour_overall_2023.csv +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_1/expected/minitour_overall_2023.csv @@ -1,72 +1,72 @@ Pos,Runner,Club,Category,Race 1,Total -1,Angus Logan,Unatt.,MU9,00:08:02,-,-,-,-,00:08:02 -2,Arthur Broadhurst,Unatt.,MU9,00:10:28,-,-,-,-,00:10:28 -3,Amelie Wild,Unatt.,FU9,00:10:37,-,-,-,-,00:10:37 -4,Heather Graham,Ceres Primary School,FU9,00:10:42,-,-,-,-,00:10:42 -5,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,-,-,-,00:11:35 -6,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,-,-,-,-,00:12:04 -7,Noah Stone,Unatt.,MU9,00:12:47,-,-,-,-,00:12:47 -8,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,-,-,-,00:12:59 -9,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,-,-,-,-,00:18:38 -1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,-,-,-,-,00:07:20 -2,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,-,-,-,-,00:07:54 -3,Atholl Reid,Unatt.,MU11,00:08:01,-,-,-,-,00:08:01 -4,Amelia Stephen,Fife AC,FU11,00:08:15,-,-,-,-,00:08:15 -5,Murray Kinnaird,Fife AC,MU11,00:08:20,-,-,-,-,00:08:20 -6,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,-,-,-,-,00:08:21 -7,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,-,-,-,-,00:08:25 -8,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,-,-,-,-,00:08:46 -9,Vienna Kitching,Letham Primary School,FU11,00:09:09,-,-,-,-,00:09:09 -10,Fergus Broadhurst,Unatt.,MU11,00:09:16,-,-,-,-,00:09:16 -11,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,-,-,-,-,00:09:17 -12,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,-,-,-,00:09:18 -13,Fraser Whittingham,Fife AC,MU11,00:09:20,-,-,-,-,00:09:20 -14,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,-,-,-,-,00:09:26 -15,Anna Purves,Fife AC,FU11,00:10:21,-,-,-,-,00:10:21 -16,Declan Greer,Unatt.,MU11,00:10:22,-,-,-,-,00:10:22 -17,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,-,-,-,00:10:32 -18,Jack Milne-Akermo,Unatt.,MU11,00:11:06,-,-,-,-,00:11:06 -19,Ruaridh Stone,Unatt.,MU11,00:11:44,-,-,-,-,00:11:44 -20,Sam Reynolds,Unatt.,MU11,00:11:51,-,-,-,-,00:11:51 -21,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,-,-,-,-,00:11:53 -22,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,-,-,-,-,00:14:35 -23,Arya McIntyre,Fife AC,FU11,00:15:20,-,-,-,-,00:15:20 -1,Luca Anderson,Anster Haddies,MU13,00:14:27,-,-,-,-,00:14:27 -2,Joey Smith,Unatt.,MU13,00:14:48,-,-,-,-,00:14:48 -3,Cillian Sweeney,Unatt.,MU13,00:14:52,-,-,-,-,00:14:52 -4,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,-,-,-,-,00:15:01 -5,Adam Harvie,Bell Baxter School,MU13,00:15:02,-,-,-,-,00:15:02 -6,Euan Patrick,Unatt.,MU13,00:16:21,-,-,-,-,00:16:21 -7,Jasper Torkington,Fife AC,MU13,00:16:29,-,-,-,-,00:16:29 -8,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,-,-,-,-,00:16:46 -9,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,-,-,-,-,00:16:49 -10,Lewis Laws,Unatt.,MU13,00:17:02,-,-,-,-,00:17:02 -11,Eden Hislop,Unatt.,MU13,00:17:24,-,-,-,-,00:17:24 -12,Frida Young,East Fife Triathlon Club,FU13,00:17:34,-,-,-,-,00:17:34 -13,Jaden Mackay,PH Racing,MU13,00:17:35,-,-,-,-,00:17:35 -14,Lewis Dickson,Unatt.,MU13,00:17:50,-,-,-,-,00:17:50 -15,Isla Kinnaird,Fife AC,FU13,00:18:01,-,-,-,-,00:18:01 -16,Theo Milne-Akermo,Unatt.,MU13,00:18:25,-,-,-,-,00:18:25 -17,Anna Torrance,Unatt.,FU13,00:18:27,-,-,-,-,00:18:27 -18,Hannah Graham,Unatt.,FU13,00:19:46,-,-,-,-,00:19:46 -19,Robbie Bunch,Unatt.,MU13,00:20:53,-,-,-,-,00:20:53 -20,Finlay Torkington,Fife AC,MU13,00:24:15,-,-,-,-,00:24:15 -1,Logan Graham,Fife AC,MU15,00:22:38,-,-,-,-,00:22:38 -2,Logan Reilly,Anster Haddies,MU15,00:22:54,-,-,-,-,00:22:54 -3,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,-,-,00:23:16 -4,Nellie Luxford,Unatt.,FU15,00:24:03,-,-,-,-,00:24:03 -5,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,-,-,-,-,00:25:04 -6,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,-,-,-,-,00:26:43 -7,Lewis Whittingham,Fife AC,MU15,00:27:06,-,-,-,-,00:27:06 -8,Tori Graham,Wormit Runners,FU15,00:27:08,-,-,-,-,00:27:08 -9,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,-,-,-,-,00:28:22 -10,Edward Cooper,Bell Baxter School,MU15,00:28:47,-,-,-,-,00:28:47 -11,Orla Gage,Anster Haddies,FU15,00:29:07,-,-,-,-,00:29:07 -12,Elle Greer,Unatt.,FU15,00:29:51,-,-,-,-,00:29:51 -1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,-,-,-,-,00:20:27 -2,Eliza König,Fife AC,FU18,00:22:38,-,-,-,-,00:22:38 -3,Oliver Cooper,Unatt.,MU18,00:24:32,-,-,-,-,00:24:32 -4,Richard Laws,Unatt.,MU18,00:24:57,-,-,-,-,00:24:57 -5,Steven Laws,Unatt.,MU18,00:26:29,-,-,-,-,00:26:29 -6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,-,-,-,-,00:29:40 -7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,-,-,-,-,00:31:16 +1,Angus Logan,Unatt.,MU9,00:08:02,00:08:02 +2,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:10:28 +3,Amelie Wild,Unatt.,FU9,00:10:37,00:10:37 +4,Heather Graham,Ceres Primary School,FU9,00:10:42,00:10:42 +5,Leonie Helena Metayer,Unatt.,FU9,00:11:35,00:11:35 +6,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:12:04 +7,Noah Stone,Unatt.,MU9,00:12:47,00:12:47 +8,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,00:12:59 +9,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:18:38 +1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:07:20 +2,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:07:54 +3,Atholl Reid,Unatt.,MU11,00:08:01,00:08:01 +4,Amelia Stephen,Fife AC,FU11,00:08:15,00:08:15 +5,Murray Kinnaird,Fife AC,MU11,00:08:20,00:08:20 +6,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:08:21 +7,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:08:25 +8,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:08:46 +9,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:09:09 +10,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:09:16 +11,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:09:17 +12,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,00:09:18 +13,Fraser Whittingham,Fife AC,MU11,00:09:20,00:09:20 +14,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:09:26 +15,Anna Purves,Fife AC,FU11,00:10:21,00:10:21 +16,Declan Greer,Unatt.,MU11,00:10:22,00:10:22 +17,Alice Sophie Metayer,Unatt.,FU11,00:10:32,00:10:32 +18,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:11:06 +19,Ruaridh Stone,Unatt.,MU11,00:11:44,00:11:44 +20,Sam Reynolds,Unatt.,MU11,00:11:51,00:11:51 +21,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:11:53 +22,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:14:35 +23,Arya McIntyre,Fife AC,FU11,00:15:20,00:15:20 +1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:14:27 +2,Joey Smith,Unatt.,MU13,00:14:48,00:14:48 +3,Cillian Sweeney,Unatt.,MU13,00:14:52,00:14:52 +4,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:15:01 +5,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:15:02 +6,Euan Patrick,Unatt.,MU13,00:16:21,00:16:21 +7,Jasper Torkington,Fife AC,MU13,00:16:29,00:16:29 +8,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:16:46 +9,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:16:49 +10,Lewis Laws,Unatt.,MU13,00:17:02,00:17:02 +11,Eden Hislop,Unatt.,MU13,00:17:24,00:17:24 +12,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:17:34 +13,Jaden Mackay,PH Racing,MU13,00:17:35,00:17:35 +14,Lewis Dickson,Unatt.,MU13,00:17:50,00:17:50 +15,Isla Kinnaird,Fife AC,FU13,00:18:01,00:18:01 +16,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:18:25 +17,Anna Torrance,Unatt.,FU13,00:18:27,00:18:27 +18,Hannah Graham,Unatt.,FU13,00:19:46,00:19:46 +19,Robbie Bunch,Unatt.,MU13,00:20:53,00:20:53 +20,Finlay Torkington,Fife AC,MU13,00:24:15,00:24:15 +1,Logan Graham,Fife AC,MU15,00:22:38,00:22:38 +2,Logan Reilly,Anster Haddies,MU15,00:22:54,00:22:54 +3,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,00:23:16 +4,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:03 +5,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:25:04 +6,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:26:43 +7,Lewis Whittingham,Fife AC,MU15,00:27:06,00:27:06 +8,Tori Graham,Wormit Runners,FU15,00:27:08,00:27:08 +9,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:28:22 +10,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:28:47 +11,Orla Gage,Anster Haddies,FU15,00:29:07,00:29:07 +12,Elle Greer,Unatt.,FU15,00:29:51,00:29:51 +1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:20:27 +2,Eliza König,Fife AC,FU18,00:22:38,00:22:38 +3,Oliver Cooper,Unatt.,MU18,00:24:32,00:24:32 +4,Richard Laws,Unatt.,MU18,00:24:57,00:24:57 +5,Steven Laws,Unatt.,MU18,00:26:29,00:26:29 +6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:29:40 +7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:31:16 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_1/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2023/completed_1/input/config.txt index 409f817a..514a5e61 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_1/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_1/input/config.txt @@ -2,7 +2,9 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour -RACES = race1/input/config.txt,,,, +RACES = race1/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,6 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 23/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 - +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_2/expected/minitour_overall_2023.csv b/src/test/resources/actual_races/series_race/minitour/2023/completed_2/expected/minitour_overall_2023.csv index 9caaa64d..9a9412f8 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_2/expected/minitour_overall_2023.csv +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_2/expected/minitour_overall_2023.csv @@ -1,74 +1,74 @@ Pos,Runner,Club,Category,Race 1,Race 2,Total -1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,-,-,-,00:20:40 -2,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,-,-,-,00:26:33 -3,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,-,-,-,00:27:10 -4,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,-,-,-,00:27:13 -5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,-,-,-,00:30:53 -6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,-,-,-,00:35:22 -7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,-,-,-,00:37:11 --,Iona Hislop,Unatt.,FU9,-,00:16:58,-,-,-,- --,Nico Kitching,Letham Primary School,MU9,-,00:15:59,-,-,-,- --,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,-,-,-,- --,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,-,-,-,- -1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,-,-,-,00:18:42 -2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,-,-,-,00:20:17 -3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,-,-,-,00:20:28 -4,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,-,-,-,00:21:29 -5,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,-,-,-,00:21:40 -6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,-,-,-,00:22:32 -7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,-,-,-,00:23:02 -8,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,-,-,-,00:23:42 -9,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,-,-,-,00:23:47 -10,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,-,-,-,00:23:53 -11,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,-,-,-,00:23:54 -12,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,-,-,-,00:25:01 -13,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,-,-,-,00:26:28 -14,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,-,-,-,00:26:29 -15,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,-,-,-,00:27:35 -16,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,-,-,-,00:29:01 -17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,-,-,-,00:30:56 -18,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,-,-,-,00:33:37 -19,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,-,-,-,00:34:16 -20,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,-,-,-,00:37:53 -21,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,-,-,-,00:42:19 --,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,-,-,-,- --,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,-,-,-,- -1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,-,-,-,00:36:19 -2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,-,-,-,00:36:57 -3=,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,-,-,-,00:38:57 -3=,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,-,-,-,00:38:57 -5,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,-,-,-,00:39:13 -6,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,-,-,-,00:41:05 -7,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,-,-,-,00:41:39 -8,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,-,-,-,00:43:27 -9,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,-,-,-,00:45:18 -10,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,-,-,-,00:45:44 -11,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,-,-,-,00:45:46 -12,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,-,-,-,00:45:57 -13,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,-,-,-,00:46:57 -14,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,-,-,-,00:46:59 -15,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,-,-,-,00:47:14 -16,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,-,-,-,00:47:37 -17,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,-,-,-,00:52:23 -18,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,-,-,-,00:54:07 -19,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,-,-,-,00:59:50 --,Joey Smith,Unatt.,MU13,00:14:48,-,-,-,-,- -1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,-,-,-,00:45:08 -2,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,-,-,-,00:47:51 -3,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,-,-,-,00:48:46 -4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,-,-,-,00:52:22 -5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,-,-,-,00:52:36 -6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,-,-,-,00:55:29 -7,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,-,-,-,00:59:06 -8,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,-,-,-,01:00:57 -9,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,-,-,-,01:01:50 -10,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,-,-,-,01:03:58 --,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,-,-,- --,Logan Reilly,Anster Haddies,MU15,00:22:54,-,-,-,-,- -1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,-,-,-,00:38:38 -2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,-,-,-,00:42:26 -3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,-,-,-,00:47:00 -4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,-,-,-,00:50:03 -5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,-,-,-,00:53:25 -6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,-,-,-,00:56:26 -7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,-,-,-,00:57:54 +1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,00:20:40 +2,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,00:26:33 +3,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,00:27:10 +4,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,00:27:13 +5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,00:30:53 +6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,00:35:22 +7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,00:37:11 +-,Iona Hislop,Unatt.,FU9,-,00:16:58,- +-,Nico Kitching,Letham Primary School,MU9,-,00:15:59,- +-,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,- +-,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,- +1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,00:18:42 +2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,00:20:17 +3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,00:20:28 +4,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,00:21:29 +5,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,00:21:40 +6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,00:22:32 +7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,00:23:02 +8,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,00:23:42 +9,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,00:23:47 +10,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,00:23:53 +11,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,00:23:54 +12,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,00:25:01 +13,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,00:26:28 +14,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,00:26:29 +15,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,00:27:35 +16,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,00:29:01 +17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,00:30:56 +18,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,00:33:37 +19,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,00:34:16 +20,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,00:37:53 +21,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,00:42:19 +-,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,- +-,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,- +1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,00:36:19 +2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,00:36:57 +3=,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,00:38:57 +3=,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,00:38:57 +5,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,00:39:13 +6,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,00:41:05 +7,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,00:41:39 +8,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,00:43:27 +9,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,00:45:18 +10,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,00:45:44 +11,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,00:45:46 +12,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,00:45:57 +13,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,00:46:57 +14,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,00:46:59 +15,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,00:47:14 +16,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,00:47:37 +17,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,00:52:23 +18,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,00:54:07 +19,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,00:59:50 +-,Joey Smith,Unatt.,MU13,00:14:48,-,- +1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,00:45:08 +2,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,00:47:51 +3,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,00:48:46 +4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,00:52:22 +5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,00:52:36 +6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,00:55:29 +7,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,00:59:06 +8,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,01:00:57 +9,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,01:01:50 +10,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,01:03:58 +-,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,- +-,Logan Reilly,Anster Haddies,MU15,00:22:54,-,- +1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,00:38:38 +2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,00:42:26 +3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,00:47:00 +4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,00:50:03 +5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,00:53:25 +6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,00:56:26 +7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,00:57:54 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_2/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2023/completed_2/input/config.txt index cbacd29a..efaa7142 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_2/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_2/input/config.txt @@ -2,7 +2,9 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour -RACES = race1/input/config.txt,race2/input/config.txt,,, +RACES = race1/input/config.txt,race2/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 23/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_3/expected/minitour_overall_2023.csv b/src/test/resources/actual_races/series_race/minitour/2023/completed_3/expected/minitour_overall_2023.csv index 5f98529f..ee378f84 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_3/expected/minitour_overall_2023.csv +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_3/expected/minitour_overall_2023.csv @@ -1,76 +1,76 @@ Pos,Runner,Club,Category,Race 1,Race 2,Race 3,Total -1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,00:06:18,-,-,00:26:58 -2,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,00:07:38,-,-,00:34:51 -3,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,00:08:53,-,-,00:35:26 -4,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,00:08:27,-,-,00:35:37 -5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,00:07:53,-,-,00:38:46 -6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,00:09:02,-,-,00:44:24 -7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,00:09:25,-,-,00:46:36 --,Iona Hislop,Unatt.,FU9,-,00:16:58,00:07:52,-,-,- --,Nico Kitching,Letham Primary School,MU9,-,00:15:59,00:07:28,-,-,- --,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,00:09:02,-,-,- --,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,00:08:52,-,-,- -1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,00:06:00,-,-,00:24:42 -2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,00:06:15,-,-,00:26:32 -3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,00:06:14,-,-,00:26:42 -4,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,00:06:39,-,-,00:28:08 -5,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,00:06:38,-,-,00:28:18 -6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,00:06:27,-,-,00:28:59 -7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,00:06:36,-,-,00:29:38 -8,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,00:06:19,-,-,00:30:06 -9,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,00:06:59,-,-,00:30:41 -10,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,00:07:20,-,-,00:31:13 -11,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,00:07:24,-,-,00:31:18 -12,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,00:07:26,-,-,00:32:27 -13,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,00:07:36,-,-,00:34:04 -14,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,00:08:10,-,-,00:34:39 -15,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,00:08:21,-,-,00:35:56 -16,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,00:08:58,-,-,00:37:59 -17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,00:09:19,-,-,00:40:15 -18,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,00:06:58,-,-,00:41:14 -19,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,00:08:50,-,-,00:42:27 -20,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,00:08:53,-,-,00:46:46 -21,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,00:10:00,-,-,00:52:19 --,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,00:07:04,-,-,- --,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,00:07:24,-,-,- -1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,00:10:53,-,-,00:47:12 -2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,00:11:29,-,-,00:48:26 -3,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,00:12:09,-,-,00:51:06 -4,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,00:12:16,-,-,00:51:13 -5,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,00:12:33,-,-,00:53:38 -6,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,00:13:07,-,-,00:56:34 -7,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,00:12:47,-,-,00:58:05 -8,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,00:13:05,-,-,00:58:51 -9,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,00:13:21,-,-,00:59:05 -10,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,00:13:41,-,-,00:59:38 -11,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,00:13:32,-,-,01:00:29 -12,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,00:12:54,-,-,01:00:31 -13,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,00:14:12,-,-,01:01:26 -14,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,00:15:10,-,-,01:02:09 -15,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,00:15:26,-,-,01:09:33 -16,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,00:17:02,-,-,01:16:52 --,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,-,-,-,- --,Rowan O’Hare,Letham Primary School,MU13,-,-,00:14:10,-,-,- --,Joey Smith,Unatt.,MU13,00:14:48,-,-,-,-,- --,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,-,-,-,- --,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,-,-,-,- -1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,00:16:29,-,-,01:01:37 -2,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,00:18:33,-,-,01:06:24 -3,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,00:17:39,-,-,01:06:25 -4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,00:18:50,-,-,01:11:12 -5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,00:19:34,-,-,01:12:10 -6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,00:21:15,-,-,01:16:44 -7,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,00:20:40,-,-,01:21:37 -8,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,00:23:45,-,-,01:22:51 -9,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,00:20:49,-,-,01:24:47 -10,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,00:23:50,-,-,01:25:40 --,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,-,-,- --,Logan Reilly,Anster Haddies,MU15,00:22:54,-,00:17:01,-,-,- -1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,00:14:44,-,-,00:53:22 -2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,00:15:44,-,-,00:58:10 -3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,00:18:10,-,-,01:05:10 -4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,00:18:28,-,-,01:08:31 -5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,00:19:13,-,-,01:12:38 -6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,00:19:30,-,-,01:15:56 -7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,00:18:55,-,-,01:16:49 --,Ronan Emmerson,Unatt.,MU18,-,-,00:22:00,-,-,- +1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,00:06:18,00:26:58 +2,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,00:07:38,00:34:51 +3,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,00:08:53,00:35:26 +4,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,00:08:27,00:35:37 +5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,00:07:53,00:38:46 +6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,00:09:02,00:44:24 +7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,00:09:25,00:46:36 +-,Iona Hislop,Unatt.,FU9,-,00:16:58,00:07:52,- +-,Nico Kitching,Letham Primary School,MU9,-,00:15:59,00:07:28,- +-,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,00:09:02,- +-,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,00:08:52,- +1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,00:06:00,00:24:42 +2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,00:06:15,00:26:32 +3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,00:06:14,00:26:42 +4,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,00:06:39,00:28:08 +5,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,00:06:38,00:28:18 +6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,00:06:27,00:28:59 +7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,00:06:36,00:29:38 +8,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,00:06:19,00:30:06 +9,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,00:06:59,00:30:41 +10,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,00:07:20,00:31:13 +11,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,00:07:24,00:31:18 +12,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,00:07:26,00:32:27 +13,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,00:07:36,00:34:04 +14,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,00:08:10,00:34:39 +15,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,00:08:21,00:35:56 +16,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,00:08:58,00:37:59 +17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,00:09:19,00:40:15 +18,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,00:06:58,00:41:14 +19,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,00:08:50,00:42:27 +20,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,00:08:53,00:46:46 +21,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,00:10:00,00:52:19 +-,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,00:07:04,- +-,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,00:07:24,- +1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,00:10:53,00:47:12 +2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,00:11:29,00:48:26 +3,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,00:12:09,00:51:06 +4,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,00:12:16,00:51:13 +5,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,00:12:33,00:53:38 +6,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,00:13:07,00:56:34 +7,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,00:12:47,00:58:05 +8,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,00:13:05,00:58:51 +9,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,00:13:21,00:59:05 +10,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,00:13:41,00:59:38 +11,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,00:13:32,01:00:29 +12,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,00:12:54,01:00:31 +13,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,00:14:12,01:01:26 +14,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,00:15:10,01:02:09 +15,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,00:15:26,01:09:33 +16,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,00:17:02,01:16:52 +-,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,-,- +-,Rowan O’Hare,Letham Primary School,MU13,-,-,00:14:10,- +-,Joey Smith,Unatt.,MU13,00:14:48,-,-,- +-,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,-,- +-,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,-,- +1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,00:16:29,01:01:37 +2,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,00:18:33,01:06:24 +3,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,00:17:39,01:06:25 +4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,00:18:50,01:11:12 +5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,00:19:34,01:12:10 +6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,00:21:15,01:16:44 +7,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,00:20:40,01:21:37 +8,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,00:23:45,01:22:51 +9,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,00:20:49,01:24:47 +10,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,00:23:50,01:25:40 +-,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,- +-,Logan Reilly,Anster Haddies,MU15,00:22:54,-,00:17:01,- +1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,00:14:44,00:53:22 +2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,00:15:44,00:58:10 +3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,00:18:10,01:05:10 +4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,00:18:28,01:08:31 +5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,00:19:13,01:12:38 +6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,00:19:30,01:15:56 +7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,00:18:55,01:16:49 +-,Ronan Emmerson,Unatt.,MU18,-,-,00:22:00,- diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_3/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2023/completed_3/input/config.txt index 92e95fd9..c8c62e68 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_3/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_3/input/config.txt @@ -2,7 +2,9 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour -RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,, +RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 23/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_4/expected/minitour_overall_2023.csv b/src/test/resources/actual_races/series_race/minitour/2023/completed_4/expected/minitour_overall_2023.csv index d89de659..6ff6c1d7 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_4/expected/minitour_overall_2023.csv +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_4/expected/minitour_overall_2023.csv @@ -1,78 +1,78 @@ Pos,Runner,Club,Category,Race 1,Race 2,Race 3,Race 4,Total -1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,00:06:18,00:09:04,-,00:36:02 -2,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,00:07:38,00:11:11,-,00:46:02 -3,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,00:08:27,00:11:51,-,00:47:28 -4,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,00:08:53,00:12:04,-,00:47:30 -5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,00:07:53,00:10:58,-,00:49:44 -6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,00:09:02,00:12:45,-,00:57:09 -7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,00:09:25,00:13:53,-,01:00:29 --,Iona Hislop,Unatt.,FU9,-,00:16:58,00:07:52,-,-,- --,Nico Kitching,Letham Primary School,MU9,-,00:15:59,00:07:28,00:10:51,-,- --,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,00:09:02,00:11:54,-,- --,Cameron Milne,Unatt.,MU9,-,-,-,00:14:21,-,- --,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,00:08:52,-,-,- -1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,00:06:00,00:08:37,-,00:33:19 -2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,00:06:15,00:09:05,-,00:35:37 -3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,00:06:14,00:09:24,-,00:36:06 -4,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,00:06:38,00:09:19,-,00:37:37 -5,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,00:06:39,00:09:31,-,00:37:39 -6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,00:06:27,00:09:27,-,00:38:26 -7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,00:06:36,00:09:54,-,00:39:32 -8,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,00:06:19,00:09:36,-,00:39:42 -9,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,00:06:59,00:09:45,-,00:40:26 -10,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,00:07:24,00:10:49,-,00:42:07 -11,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,00:07:26,00:10:53,-,00:43:20 -12,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,00:07:36,00:10:58,-,00:45:02 -13,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,00:08:10,00:11:08,-,00:45:47 -14,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,00:08:21,00:12:09,-,00:48:05 -15,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,00:08:58,00:12:33,-,00:50:32 -16,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,00:06:58,00:10:06,-,00:51:20 -17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,00:09:19,00:13:00,-,00:53:15 -18,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,00:08:50,00:13:30,-,00:55:57 -19,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,00:08:53,00:12:38,-,00:59:24 -20,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,00:10:00,00:15:34,-,01:07:53 --,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,00:07:04,00:10:41,-,- --,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,00:07:24,00:11:06,-,- --,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,00:07:20,-,-,- -1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,00:10:53,00:08:07,-,00:55:19 -2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,00:11:29,00:08:15,-,00:56:41 -3,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,00:12:09,00:09:02,-,01:00:08 -4,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,00:12:16,00:09:01,-,01:00:14 -5,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,00:12:33,00:09:05,-,01:02:43 -6,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,00:13:07,00:09:51,-,01:06:25 -7,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,00:13:21,00:08:49,-,01:07:54 -8,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,00:13:05,00:09:47,-,01:08:38 -9,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,00:13:41,00:09:21,-,01:08:59 -10,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,00:12:54,00:09:23,-,01:09:54 -11,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,00:13:32,00:10:20,-,01:10:49 -12,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,00:14:12,00:10:06,-,01:11:32 -13,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,00:15:10,00:11:13,-,01:13:22 -14,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,00:15:26,00:11:38,-,01:21:11 -15,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,00:17:02,00:12:40,-,01:29:32 --,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,-,00:10:23,-,- --,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,00:12:47,-,-,- --,Fearne Jarrett,Dundee Hawkhill Harriers,FU13,-,-,-,00:08:22,-,- --,Rowan O’Hare,Letham Primary School,MU13,-,-,00:14:10,00:10:50,-,- --,Joey Smith,Unatt.,MU13,00:14:48,-,-,00:08:37,-,- --,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,-,-,-,- --,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,-,00:09:12,-,- -1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,00:16:29,00:08:10,-,01:09:47 -2,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,00:17:39,00:08:33,-,01:14:58 -3,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,00:18:33,00:08:41,-,01:15:05 -4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,00:18:50,00:08:56,-,01:20:08 -5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,00:19:34,00:09:34,-,01:21:44 -6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,00:21:15,00:10:12,-,01:26:56 -7,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,00:20:40,00:09:43,-,01:31:20 -8,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,00:23:45,00:09:36,-,01:32:27 -9,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,00:20:49,00:10:02,-,01:34:49 -10,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,00:23:50,00:10:42,-,01:36:22 --,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,00:08:23,-,- --,Logan Reilly,Anster Haddies,MU15,00:22:54,-,00:17:01,00:08:08,-,- -1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,00:14:44,00:07:01,-,01:00:23 -2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,00:15:44,00:07:44,-,01:05:54 -3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,00:18:10,00:08:33,-,01:13:43 -4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,00:18:28,00:08:47,-,01:17:18 -5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,00:19:13,00:09:06,-,01:21:44 -6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,00:19:30,00:09:42,-,01:25:38 -7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,00:18:55,00:09:10,-,01:25:59 --,Ronan Emmerson,Unatt.,MU18,-,-,00:22:00,00:10:19,-,- +1,Angus Logan,Unatt.,MU9,00:08:02,00:12:38,00:06:18,00:09:04,00:36:02 +2,Heather Graham,Ceres Primary School,FU9,00:10:42,00:16:31,00:07:38,00:11:11,00:46:02 +3,Amelie Wild,Unatt.,FU9,00:10:37,00:16:33,00:08:27,00:11:51,00:47:28 +4,Arthur Broadhurst,Unatt.,MU9,00:10:28,00:16:05,00:08:53,00:12:04,00:47:30 +5,Noah Stone,Unatt.,MU9,00:12:47,00:18:06,00:07:53,00:10:58,00:49:44 +6,Lola Rowan Bowditch,Strathkinness Primary School,FU9,00:18:38,00:16:44,00:09:02,00:12:45,00:57:09 +7,Arwen McKelvie,East Fife Triathlon Club,FU9,00:12:04,00:25:07,00:09:25,00:13:53,01:00:29 +-,Iona Hislop,Unatt.,FU9,-,00:16:58,00:07:52,-,- +-,Nico Kitching,Letham Primary School,MU9,-,00:15:59,00:07:28,00:10:51,- +-,Leonie Helena Metayer,Unatt.,FU9,00:11:35,-,00:09:02,00:11:54,- +-,Cameron Milne,Unatt.,MU9,-,-,-,00:14:21,- +-,Ruairi Seeley,East Fife Triathlon Club,MU9,00:12:59,-,00:08:52,-,- +1,William Mifsud,East Fife Triathlon Club,MU11,00:07:20,00:11:22,00:06:00,00:08:37,00:33:19 +2,Atholl Reid,Unatt.,MU11,00:08:01,00:12:16,00:06:15,00:09:05,00:35:37 +3,Rob Anderson,East Fife Triathlon Club,MU11,00:07:54,00:12:34,00:06:14,00:09:24,00:36:06 +4,Francesca Jarrett,Dundee Hawkhill Harriers,FU11,00:08:25,00:13:15,00:06:38,00:09:19,00:37:37 +5,Amelia Stephen,Fife AC,FU11,00:08:15,00:13:14,00:06:39,00:09:31,00:37:39 +6,Murray Kinnaird,Fife AC,MU11,00:08:20,00:14:12,00:06:27,00:09:27,00:38:26 +7,Gabriella Jarrett,Dundee Hawkhill Harriers,FU11,00:08:46,00:14:16,00:06:36,00:09:54,00:39:32 +8,Alfie Edwards,East Fife Triathlon Club,MU11,00:08:21,00:15:26,00:06:19,00:09:36,00:39:42 +9,Fraser Whittingham,Fife AC,MU11,00:09:20,00:14:22,00:06:59,00:09:45,00:40:26 +10,Fergus Broadhurst,Unatt.,MU11,00:09:16,00:14:38,00:07:24,00:10:49,00:42:07 +11,Vienna Kitching,Letham Primary School,FU11,00:09:09,00:15:52,00:07:26,00:10:53,00:43:20 +12,Anna Purves,Fife AC,FU11,00:10:21,00:16:07,00:07:36,00:10:58,00:45:02 +13,Declan Greer,Unatt.,MU11,00:10:22,00:16:07,00:08:10,00:11:08,00:45:47 +14,Jack Milne-Akermo,Unatt.,MU11,00:11:06,00:16:29,00:08:21,00:12:09,00:48:05 +15,Ruaridh Stone,Unatt.,MU11,00:11:44,00:17:17,00:08:58,00:12:33,00:50:32 +16,Fynn Ingram,Castlehill Primary School,MU11,00:09:26,00:24:50,00:06:58,00:10:06,00:51:20 +17,Rachel Coggle,Craigrothie Primary School,FU11,00:11:53,00:19:03,00:09:19,00:13:00,00:53:15 +18,Sam Reynolds,Unatt.,MU11,00:11:51,00:21:46,00:08:50,00:13:30,00:55:57 +19,Lewis McKelvie,East Fife Triathlon Club,MU11,00:14:35,00:23:18,00:08:53,00:12:38,00:59:24 +20,Arya McIntyre,Fife AC,FU11,00:15:20,00:26:59,00:10:00,00:15:34,01:07:53 +-,Poppy Lyra Bowditch,Strathkinness Primary School,FU11,00:09:18,-,00:07:04,00:10:41,- +-,Alice Sophie Metayer,Unatt.,FU11,00:10:32,-,00:07:24,00:11:06,- +-,Cameron Seeley,East Fife Triathlon Club,MU11,00:09:17,00:14:36,00:07:20,-,- +1,Luca Anderson,Anster Haddies,MU13,00:14:27,00:21:52,00:10:53,00:08:07,00:55:19 +2,Harriet Reid,East Fife Triathlon Club,FU13,00:15:01,00:21:56,00:11:29,00:08:15,00:56:41 +3,Euan Patrick,Unatt.,MU13,00:16:21,00:22:36,00:12:09,00:09:02,01:00:08 +4,Bertran Penacchio Torres,Fife AC,MU13,00:16:49,00:22:08,00:12:16,00:09:01,01:00:14 +5,Phoebe Fleetham,St Leonards Running Club,FU13,00:16:46,00:24:19,00:12:33,00:09:05,01:02:43 +6,Lewis Dickson,Unatt.,MU13,00:17:50,00:25:37,00:13:07,00:09:51,01:06:25 +7,Lewis Laws,Unatt.,MU13,00:17:02,00:28:42,00:13:21,00:08:49,01:07:54 +8,Isla Kinnaird,Fife AC,FU13,00:18:01,00:27:45,00:13:05,00:09:47,01:08:38 +9,Jaden Mackay,PH Racing,MU13,00:17:35,00:28:22,00:13:41,00:09:21,01:08:59 +10,Frida Young,East Fife Triathlon Club,FU13,00:17:34,00:30:03,00:12:54,00:09:23,01:09:54 +11,Anna Torrance,Unatt.,FU13,00:18:27,00:28:30,00:13:32,00:10:20,01:10:49 +12,Theo Milne-Akermo,Unatt.,MU13,00:18:25,00:28:49,00:14:12,00:10:06,01:11:32 +13,Adam Harvie,Bell Baxter School,MU13,00:15:02,00:31:57,00:15:10,00:11:13,01:13:22 +14,Hannah Graham,Unatt.,FU13,00:19:46,00:34:21,00:15:26,00:11:38,01:21:11 +15,Finlay Torkington,Fife AC,MU13,00:24:15,00:35:35,00:17:02,00:12:40,01:29:32 +-,Robbie Bunch,Unatt.,MU13,00:20:53,00:31:30,-,00:10:23,- +-,Eden Hislop,Unatt.,MU13,00:17:24,00:27:54,00:12:47,-,- +-,Fearne Jarrett,Dundee Hawkhill Harriers,FU13,-,-,-,00:08:22,- +-,Rowan O’Hare,Letham Primary School,MU13,-,-,00:14:10,00:10:50,- +-,Joey Smith,Unatt.,MU13,00:14:48,-,-,00:08:37,- +-,Cillian Sweeney,Unatt.,MU13,00:14:52,00:24:21,-,-,- +-,Jasper Torkington,Fife AC,MU13,00:16:29,00:25:10,-,00:09:12,- +1,Logan Graham,Fife AC,MU15,00:22:38,00:22:30,00:16:29,00:08:10,01:09:47 +2,Nellie Luxford,Unatt.,FU15,00:24:03,00:24:43,00:17:39,00:08:33,01:14:58 +3,Beinn Anderson,East Fife Triathlon Club,MU15,00:25:04,00:22:47,00:18:33,00:08:41,01:15:05 +4,Edward Mifsud,East Fife Triathlon Club,MU15,00:26:43,00:25:39,00:18:50,00:08:56,01:20:08 +5,Lewis Whittingham,Fife AC,MU15,00:27:06,00:25:30,00:19:34,00:09:34,01:21:44 +6,Edward Cooper,Bell Baxter School,MU15,00:28:47,00:26:42,00:21:15,00:10:12,01:26:56 +7,Bella Rodden,East Fife Triathlon Club,FU15,00:28:22,00:32:35,00:20:40,00:09:43,01:31:20 +8,Tori Graham,Wormit Runners,FU15,00:27:08,00:31:58,00:23:45,00:09:36,01:32:27 +9,Orla Gage,Anster Haddies,FU15,00:29:07,00:34:51,00:20:49,00:10:02,01:34:49 +10,Elle Greer,Unatt.,FU15,00:29:51,00:31:59,00:23:50,00:10:42,01:36:22 +-,Imogen Jarrett,Dundee Hawkhill Harriers,FU15,00:23:16,-,-,00:08:23,- +-,Logan Reilly,Anster Haddies,MU15,00:22:54,-,00:17:01,00:08:08,- +1,Thomas Robertson,East Fife Triathlon Club,MU18,00:20:27,00:18:11,00:14:44,00:07:01,01:00:23 +2,Eliza König,Fife AC,FU18,00:22:38,00:19:48,00:15:44,00:07:44,01:05:54 +3,Oliver Cooper,Unatt.,MU18,00:24:32,00:22:28,00:18:10,00:08:33,01:13:43 +4,Richard Laws,Unatt.,MU18,00:24:57,00:25:06,00:18:28,00:08:47,01:17:18 +5,Steven Laws,Unatt.,MU18,00:26:29,00:26:56,00:19:13,00:09:06,01:21:44 +6,Tom Mifsud,East Fife Triathlon Club,MU18,00:29:40,00:26:46,00:19:30,00:09:42,01:25:38 +7,Liam Black,Cupar and District Swimming Club,MU18,00:31:16,00:26:38,00:18:55,00:09:10,01:25:59 +-,Ronan Emmerson,Unatt.,MU18,-,-,00:22:00,00:10:19,- diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_4/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2023/completed_4/input/config.txt index de4c0bcd..7467eb4d 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_4/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_4/input/config.txt @@ -2,7 +2,9 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour -RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt, +RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 23/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/minitour/2023/completed_5/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2023/completed_5/input/config.txt index 2357bac2..971f5856 100644 --- a/src/test/resources/actual_races/series_race/minitour/2023/completed_5/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2023/completed_5/input/config.txt @@ -3,6 +3,8 @@ RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt,race5/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 23/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/minitour/2024/input/config.txt b/src/test/resources/actual_races/series_race/minitour/2024/input/config.txt index 1da73c5b..68236674 100644 --- a/src/test/resources/actual_races/series_race/minitour/2024/input/config.txt +++ b/src/test/resources/actual_races/series_race/minitour/2024/input/config.txt @@ -3,6 +3,8 @@ RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt,race5/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 62/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/combined.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/combined.html new file mode 100644 index 00000000..a60af4ba --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/combined.html @@ -0,0 +1,1260 @@ +

    Results

    +

    Prizes

    +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosRunnerCatClubRace 1Race 2Race 3Total
    1Ben HukinsMSCambuslang H00:24:0300:27:3800:04:3500:56:16
    2Christopher O'BrienMSCorstorphine AAC00:24:3800:30:3900:04:4301:00:00
    3Robbie DunlopMSDundee Rr AC00:24:4300:30:4100:04:4701:00:11
    4Akira O'ConnorMSFife AC00:24:4500:32:2600:04:5401:02:05
    5Andrew LeechMSDundee Hawkhill Harriers00:24:4900:32:5300:05:0201:02:44
    6Oliver LeverMSLomond Hill Runners00:25:0800:32:4300:05:0101:02:52
    7Daniel HaleMSUniversity of St. Andrews Ccc00:25:0300:32:4700:05:0601:02:56
    8Bryan McLarenMSLeven Las Vagas00:24:5500:33:3300:04:5801:03:26
    9James BowdenMSHunters Bog T00:26:0500:33:2100:05:1101:04:37
    10Jonny LoganMSFife AC00:25:2300:34:5100:05:1801:05:32
    11=Kevin GreigM40Dundee Rr AC00:26:3100:34:0300:05:3301:06:07
    11=Matthew LowMSDundee Rr AC00:28:0200:32:5100:05:1401:06:07
    13Hendrik Van RensburgM40U/n00:26:1600:34:2800:05:2901:06:13
    14Iain WallaceM40Leven Las Vegas RC00:26:0100:34:4100:05:3601:06:18
    15Maya StoneFSFife AC00:27:2300:33:4500:05:2501:06:33
    16Christopher McKiddieMSWesterlands Ccc00:26:4400:34:2500:05:3001:06:39
    17Bryan InnesMSFalkland Trail Runners00:26:2100:35:1700:05:2101:06:59
    18Scott LoveMSPH Racing00:26:1400:35:3000:05:1701:07:01
    19Alan CameronM40Corstorphine AAC00:26:2700:35:1300:05:2401:07:04
    20Willie RennieM40Carnegie Harriers00:26:3600:35:0500:05:2501:07:06
    21Claire HoustonFSCentral AC00:26:4800:35:0300:05:2301:07:14
    22Kenny GormanMSFife AC00:25:3000:37:1800:05:0201:07:50
    23Kristin LownieFSCarnegie Harriers00:26:5800:35:2500:05:3001:07:53
    24Brian LeesM50Lothian RC00:25:5500:36:2900:05:3401:07:58
    25Jonathan MillarMSCarnegie Harriers00:26:5800:35:3100:05:3601:08:05
    26Jennifer CruickshanksFSFife AC00:27:1400:36:0700:05:2801:08:49
    27Elaine OmandFSDundee Rr AC00:27:0500:36:1100:05:3501:08:51
    28Lee O'ConnorM40Dundee Rr AC00:26:5900:36:2300:05:3401:08:56
    29Colin McwilliamMSFife AC00:26:4600:37:2000:05:3601:09:42
    30Arnaud RichardMSDundee Rr AC00:27:3700:36:1700:05:5001:09:44
    31Simon KnoxM50Dundee Rr AC00:27:2700:36:4400:05:5101:10:02
    32Susan RidleyF50Edinburgh AC00:28:0400:36:2100:06:0501:10:30
    33Joanne McevoyFSCalderglen H00:27:0800:38:0200:05:5401:11:04
    34Mike MurdochM40Falkland Trail Runners00:27:1600:38:3100:05:1801:11:05
    35Jim MortonM50Dundee Rr AC00:28:1500:36:5000:06:0201:11:07
    36Louise AndrewFSDundee and Angus Cani-Cross00:27:0300:38:2300:05:5301:11:19
    37Duncan EdwardMSDundee Rr AC00:27:1000:38:5400:05:4301:11:47
    38Gary BarkerM60Fife AC00:28:2200:37:3000:06:0001:11:52
    39Simon FoxM50Fife AC00:28:1300:37:5900:05:5201:12:04
    40Derek GrantM40Dundee and Angus Cani-Cross00:27:1200:39:1500:05:3801:12:05
    41Dave MortonMSMorton Running Company00:27:5400:38:5900:05:4201:12:35
    42John McintyreMSFife AC00:28:4300:38:2900:05:3801:12:50
    43Andrew StavertM50Portobello RC00:28:5900:37:4300:06:1401:12:56
    44Stewart DillonM50Fife AC00:28:4600:38:1600:06:0101:13:03
    45Isobel BurnettF60Carnegie Harriers00:27:2900:39:3400:06:0301:13:06
    46Jan-Bert van Den BergM50Corstorphine AAC00:28:1800:39:1800:06:0101:13:37
    47CJ MacphailFSAnster Haddies00:29:3400:38:2000:05:5501:13:49
    48Tom ScottM60Fife AC00:28:3000:39:2600:06:0301:13:59
    49Rhona Van RensburgF40Fife AC00:27:3100:40:3300:05:5701:14:01
    50Paul ReedM40Dundee Rr AC00:29:1100:39:0200:06:0001:14:13
    51David DunleaveyM50Dundee Rr AC00:28:5500:39:5600:06:0101:14:52
    52Jennifer MassieFSDundee Rr AC00:28:0600:41:2600:05:5101:15:23
    53Brian R SmithM50Fife AC00:29:3000:39:4800:06:0701:15:25
    54Gary OvenstoneM40STAART00:29:1900:40:1900:06:0601:15:44
    55Fiona CallaghanFSDundee Rr AC00:29:5100:39:5700:05:5901:15:47
    56Gary HoweM40Fife AC00:29:5400:40:2300:06:1401:16:31
    57David NorrieM60Fife AC00:29:4800:40:4000:06:0601:16:34
    58Neill PorterfieldM40Corstorphine AAC00:29:3200:41:2300:05:5601:16:51
    59Gillian SmithF40Fife AC00:30:1800:40:2400:06:1201:16:54
    60Susanne LumsdenF40Falkland Trail Runners00:30:1500:41:0300:06:3101:17:49
    61Tam Nicol'SM50Stilton Striders00:29:1600:43:0000:05:5901:18:15
    62Merce TorresF40Fife AC00:30:1200:41:3400:06:3501:18:21
    63Fiona CruickshanksFSAnster Haddies00:30:5300:41:3700:06:0701:18:37
    64Alison McNeillyF40Dundee Rr AC00:29:2500:42:5400:06:2901:18:48
    65Innes BracegirdleF60Fife AC00:30:0100:42:1000:06:5301:19:04
    66Michael BissetM40Carnegie Harriers00:29:4300:44:3800:05:4401:20:05
    67David HendersonM50Corstorphine AAC00:30:0000:44:1900:06:2001:20:39
    68Jazmin HayFSAnster Haddies00:31:0400:43:3100:06:3401:21:09
    69Jason GrantMSDundee and Angus Cani-Cross00:31:2400:44:1400:05:5801:21:36
    70Pamela CruickshanksF50Anster Haddies00:32:0700:43:0800:06:3701:21:52
    71Ewan CameronM50Anster Haddies00:32:1500:42:4700:06:5101:21:53
    72Catherine LeonardF50Fife AC00:30:1700:45:0200:06:4001:21:59
    73Kieran MorganM50Carnegie Harriers00:31:4400:44:0700:06:2601:22:17
    74Gordon SomervilleM60Carnegie Harriers00:30:3600:45:2900:06:2701:22:32
    75Phil SmithardM60Carnegie Harriers00:30:4100:45:4900:06:3601:23:06
    76Robyn MorroccoFSCarnegie Harriers00:30:3800:47:2100:06:1801:24:17
    77Alice HallF50Anster Haddies00:32:4500:45:1300:07:0601:25:04
    78George StewartM50Calderglen H00:32:3800:46:0800:06:2201:25:08
    79Innes PetrieM50Fife AC00:32:2300:46:0000:06:4701:25:10
    80Jocelyn ScottF60Fife AC00:33:4500:43:5600:07:3901:25:20
    81Bill DuffM60Falkland Trail Runners00:33:5500:44:1100:07:2201:25:28
    82Maneesh KuruvillaMSU/n00:32:4800:46:1800:06:2801:25:34
    83Christina GrantFSDundee and Angus Cani-Cross00:29:3800:50:0900:05:5401:25:41
    84John HendersonM40Fife AC00:32:2100:46:5600:06:2501:25:42
    85Sharon BrownFSAnster Haddies00:34:3100:44:4100:06:4901:26:01
    86Fiona PlainFSDundee Rr AC00:31:5500:47:5200:06:2601:26:13
    87Morna FlemingF60Pitreavie AAC00:32:5200:47:3600:06:4401:27:12
    88David NuttallM40Anster Haddies00:35:1200:46:3200:07:1501:28:59
    89Zuleika BrettFSCarnegie Harriers00:34:1900:47:3200:07:1801:29:09
    90Brian StewartMSDundee Rr AC00:34:5900:47:2500:06:5601:29:20
    91Nick BrianM60Fife AC00:33:1500:49:0800:06:5801:29:21
    92Bob WylieMSLeven Las Vegas RC00:34:1000:48:2700:06:5001:29:27
    93Bill GillanM60Falkland Trail Runners00:33:2200:49:2300:07:1001:29:55
    94Steve CromarM70Dundee Hawkhill Harriers00:34:1800:48:5900:07:5001:31:07
    95Rosemary LeeF50Fife AC00:35:0600:48:3700:07:3001:31:13
    96Paul McglynnM50Fife AC00:33:1900:50:4300:07:1501:31:17
    97Malcolm MactavishM60Falkland Trail Runners00:35:4800:51:1800:07:2401:34:30
    98Robert ThorntonM60Fife AC00:34:2900:53:2100:07:0301:34:53
    99Pauline SmithFSDundee Rr AC00:35:3300:52:1500:07:1401:35:02
    100Claire DuncanF40Beacon Runners00:33:5800:54:3400:07:3301:36:05
    101Ross JohnstonM50Leven Las Vegas RC00:35:0400:54:4400:07:3101:37:19
    102Derek AdamsonM40Fife AC00:35:0800:55:5800:07:3401:38:40
    103Wendy WylieFSLeven Las Vegas RC00:34:3300:57:2400:07:1501:39:12
    104Big George HayM50Anster Haddies00:37:4400:55:3300:07:5701:41:14
    105Peter Rieu-ClarkeM70Leven Las Vegas RC00:38:2200:56:0900:07:3501:42:06
    106Ruth LethamFSFife AC00:37:2200:57:3000:07:4101:42:33
    107Josh McKayMSDundee Rr AC00:37:5200:57:5700:06:4601:42:35
    108Debz Way HayF50Anster Haddies00:40:2600:54:3700:08:2601:43:29
    109John LeeM50Falkland Trail Runners00:40:1500:54:3900:08:3901:43:33
    110Jacqueline CookF40Falkland Trail Runners00:37:3000:58:4100:07:5401:44:05
    111Steph BarlowF50Stilton Striders00:38:3900:58:5100:07:5801:45:28
    112Kara ChristineF40Run Mummy Run00:39:0800:59:0900:08:1601:46:33
    113Gary ScottM40Anster Allsorts00:38:4401:04:1200:06:2901:49:25
    114Hannah AllumFSAnster Allsorts00:38:4601:04:1400:07:5301:50:53
    115Angela JohnstonF50Leven Las Vegas RC00:41:1201:00:5600:08:4601:50:54
    116Karen SpenceF40Falkland Trail Runners00:53:1701:16:4300:10:5902:20:59
    -Heather AndersonFSFife AC-00:35:23--
    -William ArnotM50Anster Haddies-00:45:33--
    -Jane AskeyF70Fife AC00:50:44---
    -Joanne ClancyFSDundee Rr AC00:30:3400:46:47--
    -Peter ConnollyM50Dundee Rr AC00:30:4600:47:19--
    -Keith CoplandM40Corstorphine AAC00:31:0700:42:28--
    -Stuart FraserMSPerth Road Runners00:26:58---
    -Cyndi SveeF50U/n--00:08:40-
    +

    Results generated using race-timing.

    \ No newline at end of file diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/processing_notes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/processing_notes.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race1.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race1.html new file mode 100644 index 00000000..13aadcad --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race1.html @@ -0,0 +1,862 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:24:03
    285Christopher O'BrienMS00:24:38
    378Robbie DunlopMS00:24:43
    430Akira O'ConnorMS00:24:45
    5139Andrew LeechMS00:24:49
    686Bryan McLarenMS00:24:55
    7127Daniel HaleMS00:25:03
    8151Oliver LeverMS00:25:08
    988Jonny LoganMS00:25:23
    10111Kenny GormanMS00:25:30
    1123Brian LeesM5000:25:55
    1232Iain WallaceM4000:26:01
    13133James BowdenMS00:26:05
    143Scott LoveMS00:26:14
    1559Hendrik Van RensburgM4000:26:16
    16114Bryan InnesMS00:26:21
    1725Alan CameronM4000:26:27
    1863Kevin GreigM4000:26:31
    19123Willie RennieM4000:26:36
    2034Christopher McKiddieMS00:26:44
    21130Colin McwilliamMS00:26:46
    2289Claire HoustonFS00:26:48
    2374Jonathan MillarMS00:26:58
    24135Stuart FraserMS00:26:58
    25117Kristin LownieFS00:26:58
    2697Lee O'ConnorM4000:26:59
    2752Louise AndrewFS00:27:03
    2850Elaine OmandFS00:27:05
    2967Joanne McevoyFS00:27:08
    3031Duncan EdwardMS00:27:10
    3126Derek GrantM4000:27:12
    3229Jennifer CruickshanksFS00:27:14
    3343Mike MurdochM4000:27:16
    34129Maya StoneFS00:27:23
    3596Simon KnoxM5000:27:27
    3680Isobel BurnettF6000:27:29
    3758Rhona Van RensburgF4000:27:31
    3816Arnaud RichardMS00:27:37
    391Dave MortonMS00:27:54
    4091Matthew LowMS00:28:02
    41145Susan RidleyF5000:28:04
    425Jennifer MassieFS00:28:06
    4381Simon FoxM5000:28:13
    4490Jim MortonM5000:28:15
    4582Jan-Bert van Den BergM5000:28:18
    46148Gary BarkerM6000:28:22
    4749Tom ScottM6000:28:30
    48132John McintyreMS00:28:43
    4922Stewart DillonM5000:28:46
    50101David DunleaveyM5000:28:55
    5183Andrew StavertM5000:28:59
    5257Paul ReedM4000:29:11
    53110Tam Nicol'SM5000:29:16
    5456Gary OvenstoneM4000:29:19
    5510Alison McNeillyF4000:29:25
    5677Brian R SmithM5000:29:30
    5715Neill PorterfieldM4000:29:32
    5819CJ MacphailFS00:29:34
    59113Christina GrantFS00:29:38
    606Michael BissetM4000:29:43
    61126David NorrieM6000:29:48
    6293Fiona CallaghanFS00:29:51
    63144Gary HoweM4000:29:54
    64107David HendersonM5000:30:00
    6521Innes BracegirdleF6000:30:01
    6662Merce TorresF4000:30:12
    6741Susanne LumsdenF4000:30:15
    68131Catherine LeonardF5000:30:17
    6928Gillian SmithF4000:30:18
    70100Joanne ClancyFS00:30:34
    71109Gordon SomervilleM6000:30:36
    72105Robyn MorroccoFS00:30:38
    73116Phil SmithardM6000:30:41
    7494Peter ConnollyM5000:30:46
    7546Fiona CruickshanksFS00:30:53
    7617Jazmin HayFS00:31:04
    77149Keith CoplandM4000:31:07
    7892Jason GrantMS00:31:24
    79115Kieran MorganM5000:31:44
    80147Fiona PlainFS00:31:55
    8145Pamela CruickshanksF5000:32:07
    829Ewan CameronM5000:32:15
    8370John HendersonM4000:32:21
    84128Innes PetrieM5000:32:23
    8565George StewartM5000:32:38
    8648Alice HallF5000:32:45
    8736Maneesh KuruvillaMS00:32:48
    8842Morna FlemingF6000:32:52
    8975Nick BrianM6000:33:15
    9011Paul McglynnM5000:33:19
    91121Bill GillanM6000:33:22
    9240Jocelyn ScottF6000:33:45
    9354Bill DuffM6000:33:55
    9473Claire DuncanF4000:33:58
    9571Bob WylieMS00:34:10
    9655Steve CromarM7000:34:18
    9769Zuleika BrettFS00:34:19
    9898Robert ThorntonM6000:34:29
    99134Sharon BrownFS00:34:31
    10072Wendy WylieFS00:34:33
    101103Brian StewartMS00:34:59
    10260Ross JohnstonM5000:35:04
    1034Rosemary LeeF5000:35:06
    10466Derek AdamsonM4000:35:08
    10547David NuttallM4000:35:12
    106141Pauline SmithFS00:35:33
    107104Malcolm MactavishM6000:35:48
    10837Ruth LethamFS00:37:22
    10995Jacqueline CookF4000:37:30
    11038Big George HayM5000:37:44
    11113Josh McKayMS00:37:52
    11227Peter Rieu-ClarkeM7000:38:22
    113112Steph BarlowF5000:38:39
    114143Gary ScottM4000:38:44
    115142Hannah AllumFS00:38:46
    116120Kara ChristineF4000:39:08
    11712John LeeM5000:40:15
    11833Debz Way HayF5000:40:26
    11961Angela JohnstonF5000:41:12
    120136Jane AskeyF7000:50:44
    12139Karen SpenceF4000:53:17
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race2.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race2.html new file mode 100644 index 00000000..c39335da --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race2.html @@ -0,0 +1,862 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:27:38
    285Christopher O'BrienMS00:30:39
    378Robbie DunlopMS00:30:41
    430Akira O'ConnorMS00:32:26
    5151Oliver LeverMS00:32:43
    6127Daniel HaleMS00:32:47
    791Matthew LowMS00:32:51
    8139Andrew LeechMS00:32:53
    9133James BowdenMS00:33:21
    1086Bryan McLarenMS00:33:33
    11129Maya StoneFS00:33:45
    1263Kevin GreigM4000:34:03
    1334Christopher McKiddieMS00:34:25
    1459Hendrik Van RensburgM4000:34:28
    1532Iain WallaceM4000:34:41
    1688Jonny LoganMS00:34:51
    1789Claire HoustonFS00:35:03
    18123Willie RennieM4000:35:05
    1925Alan CameronM4000:35:13
    20114Bryan InnesMS00:35:17
    2135Heather AndersonFS00:35:23
    22117Kristin LownieFS00:35:25
    233Scott LoveMS00:35:30
    2474Jonathan MillarMS00:35:31
    2529Jennifer CruickshanksFS00:36:07
    2650Elaine OmandFS00:36:11
    2716Arnaud RichardMS00:36:17
    28145Susan RidleyF5000:36:21
    2997Lee O'ConnorM4000:36:23
    3023Brian LeesM5000:36:29
    3196Simon KnoxM5000:36:44
    3290Jim MortonM5000:36:50
    33111Kenny GormanMS00:37:18
    34130Colin McwilliamMS00:37:20
    35148Gary BarkerM6000:37:30
    3683Andrew StavertM5000:37:43
    3781Simon FoxM5000:37:59
    3867Joanne McevoyFS00:38:02
    3922Stewart DillonM5000:38:16
    4019CJ MacphailFS00:38:20
    4152Louise AndrewFS00:38:23
    42132John McintyreMS00:38:29
    4343Mike MurdochM4000:38:31
    4431Duncan EdwardMS00:38:54
    451Dave MortonMS00:38:59
    4657Paul ReedM4000:39:02
    4726Derek GrantM4000:39:15
    4882Jan-Bert van Den BergM5000:39:18
    4949Tom ScottM6000:39:26
    5080Isobel BurnettF6000:39:34
    5177Brian R SmithM5000:39:48
    52101David DunleaveyM5000:39:56
    5393Fiona CallaghanFS00:39:57
    5456Gary OvenstoneM4000:40:19
    55144Gary HoweM4000:40:23
    5628Gillian SmithF4000:40:24
    5758Rhona Van RensburgF4000:40:33
    58126David NorrieM6000:40:40
    5941Susanne LumsdenF4000:41:03
    6015Neill PorterfieldM4000:41:23
    615Jennifer MassieFS00:41:26
    6262Merce TorresF4000:41:34
    6346Fiona CruickshanksFS00:41:37
    6421Innes BracegirdleF6000:42:10
    65149Keith CoplandM4000:42:28
    669Ewan CameronM5000:42:47
    6710Alison McNeillyF4000:42:54
    68110Tam Nicol'SM5000:43:00
    6945Pamela CruickshanksF5000:43:08
    7017Jazmin HayFS00:43:31
    7140Jocelyn ScottF6000:43:56
    72115Kieran MorganM5000:44:07
    7354Bill DuffM6000:44:11
    7492Jason GrantMS00:44:14
    75107David HendersonM5000:44:19
    766Michael BissetM4000:44:38
    77134Sharon BrownFS00:44:41
    78131Catherine LeonardF5000:45:02
    7948Alice HallF5000:45:13
    80109Gordon SomervilleM6000:45:29
    8187William ArnotM5000:45:33
    82116Phil SmithardM6000:45:49
    83128Innes PetrieM5000:46:00
    8465George StewartM5000:46:08
    8536Maneesh KuruvillaMS00:46:18
    8647David NuttallM4000:46:32
    87100Joanne ClancyFS00:46:47
    8870John HendersonM4000:46:56
    8994Peter ConnollyM5000:47:19
    90105Robyn MorroccoFS00:47:21
    91103Brian StewartMS00:47:25
    9269Zuleika BrettFS00:47:32
    9342Morna FlemingF6000:47:36
    94147Fiona PlainFS00:47:52
    9571Bob WylieMS00:48:27
    964Rosemary LeeF5000:48:37
    9755Steve CromarM7000:48:59
    9875Nick BrianM6000:49:08
    99121Bill GillanM6000:49:23
    100113Christina GrantFS00:50:09
    10111Paul McglynnM5000:50:43
    102104Malcolm MactavishM6000:51:18
    103141Pauline SmithFS00:52:15
    10498Robert ThorntonM6000:53:21
    10573Claire DuncanF4000:54:34
    10633Debz Way HayF5000:54:37
    10712John LeeM5000:54:39
    10860Ross JohnstonM5000:54:44
    10938Big George HayM5000:55:33
    11066Derek AdamsonM4000:55:58
    11127Peter Rieu-ClarkeM7000:56:09
    11272Wendy WylieFS00:57:24
    11337Ruth LethamFS00:57:30
    11413Josh McKayMS00:57:57
    11595Jacqueline CookF4000:58:41
    116112Steph BarlowF5000:58:51
    117120Kara ChristineF4000:59:09
    11861Angela JohnstonF5001:00:56
    119143Gary ScottM4001:04:12
    120142Hannah AllumFS01:04:14
    12139Karen SpenceF4001:16:43
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race3.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race3.html new file mode 100644 index 00000000..17d0e1c7 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/race3.html @@ -0,0 +1,834 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:04:35
    285Christopher O'BrienMS00:04:43
    378Robbie DunlopMS00:04:47
    430Akira O'ConnorMS00:04:54
    586Bryan McLarenMS00:04:58
    6151Oliver LeverMS00:05:01
    7139Andrew LeechMS00:05:02
    8111Kenny GormanMS00:05:02
    9127Daniel HaleMS00:05:06
    10133James BowdenMS00:05:11
    1191Matthew LowMS00:05:14
    123Scott LoveMS00:05:17
    1388Jonny LoganMS00:05:18
    1443Mike MurdochM4000:05:18
    15114Bryan InnesMS00:05:21
    1689Claire HoustonFS00:05:23
    1725Alan CameronM4000:05:24
    18129Maya StoneFS00:05:25
    19123Willie RennieM4000:05:25
    2029Jennifer CruickshanksFS00:05:28
    2159Hendrik Van RensburgM4000:05:29
    22117Kristin LownieFS00:05:30
    2334Christopher McKiddieMS00:05:30
    2463Kevin GreigM4000:05:33
    2523Brian LeesM5000:05:34
    2697Lee O'ConnorM4000:05:34
    2750Elaine OmandFS00:05:35
    2832Iain WallaceM4000:05:36
    2974Jonathan MillarMS00:05:36
    30130Colin McwilliamMS00:05:36
    3126Derek GrantM4000:05:38
    32132John McintyreMS00:05:38
    331Dave MortonMS00:05:42
    3431Duncan EdwardMS00:05:43
    356Michael BissetM4000:05:44
    3616Arnaud RichardMS00:05:50
    3796Simon KnoxM5000:05:51
    385Jennifer MassieFS00:05:51
    3981Simon FoxM5000:05:52
    4052Louise AndrewFS00:05:53
    4167Joanne McevoyFS00:05:54
    42113Christina GrantFS00:05:54
    4319CJ MacphailFS00:05:55
    4415Neill PorterfieldM4000:05:56
    4558Rhona Van RensburgF4000:05:57
    4692Jason GrantMS00:05:58
    4793Fiona CallaghanFS00:05:59
    48110Tam Nicol'SM5000:05:59
    49148Gary BarkerM6000:06:00
    5057Paul ReedM4000:06:00
    5122Stewart DillonM5000:06:01
    5282Jan-Bert van Den BergM5000:06:01
    53101David DunleaveyM5000:06:01
    5490Jim MortonM5000:06:02
    5580Isobel BurnettF6000:06:03
    5649Tom ScottM6000:06:03
    57145Susan RidleyF5000:06:05
    5856Gary OvenstoneM4000:06:06
    59126David NorrieM6000:06:06
    6077Brian R SmithM5000:06:07
    6146Fiona CruickshanksFS00:06:07
    6228Gillian SmithF4000:06:12
    6383Andrew StavertM5000:06:14
    64144Gary HoweM4000:06:14
    65105Robyn MorroccoFS00:06:18
    66107David HendersonM5000:06:20
    6765George StewartM5000:06:22
    6870John HendersonM4000:06:25
    69115Kieran MorganM5000:06:26
    70147Fiona PlainFS00:06:26
    71109Gordon SomervilleM6000:06:27
    7236Maneesh KuruvillaMS00:06:28
    7310Alison McNeillyF4000:06:29
    74143Gary ScottM4000:06:29
    7541Susanne LumsdenF4000:06:31
    7617Jazmin HayFS00:06:34
    7762Merce TorresF4000:06:35
    78116Phil SmithardM6000:06:36
    7945Pamela CruickshanksF5000:06:37
    80131Catherine LeonardF5000:06:40
    8142Morna FlemingF6000:06:44
    8213Josh McKayMS00:06:46
    83128Innes PetrieM5000:06:47
    84134Sharon BrownFS00:06:49
    8571Bob WylieMS00:06:50
    869Ewan CameronM5000:06:51
    8721Innes BracegirdleF6000:06:53
    88103Brian StewartMS00:06:56
    8975Nick BrianM6000:06:58
    9098Robert ThorntonM6000:07:03
    9148Alice HallF5000:07:06
    92121Bill GillanM6000:07:10
    93141Pauline SmithFS00:07:14
    9447David NuttallM4000:07:15
    9511Paul McglynnM5000:07:15
    9672Wendy WylieFS00:07:15
    9769Zuleika BrettFS00:07:18
    9854Bill DuffM6000:07:22
    99104Malcolm MactavishM6000:07:24
    1004Rosemary LeeF5000:07:30
    10160Ross JohnstonM5000:07:31
    10273Claire DuncanF4000:07:33
    10366Derek AdamsonM4000:07:34
    10427Peter Rieu-ClarkeM7000:07:35
    10540Jocelyn ScottF6000:07:39
    10637Ruth LethamFS00:07:41
    10755Steve CromarM7000:07:50
    108142Hannah AllumFS00:07:53
    10995Jacqueline CookF4000:07:54
    11038Big George HayM5000:07:57
    111112Steph BarlowF5000:07:58
    112120Kara ChristineF4000:08:16
    11333Debz Way HayF5000:08:26
    11412John LeeM5000:08:39
    115119Cyndi SveeF5000:08:40
    11661Angela JohnstonF5000:08:46
    11739Karen SpenceF4000:10:59
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.csv new file mode 100644 index 00000000..2691b756 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.csv @@ -0,0 +1,125 @@ +Pos,Runner,Club,Category,Race 1,Race 2,Race 3,Total +1,Ben Hukins,Cambuslang H,MS,00:24:03,00:27:38,00:04:35,00:56:16 +2,Christopher O'Brien,Corstorphine AAC,MS,00:24:38,00:30:39,00:04:43,01:00:00 +3,Robbie Dunlop,Dundee Rr AC,MS,00:24:43,00:30:41,00:04:47,01:00:11 +4,Akira O'Connor,Fife AC,MS,00:24:45,00:32:26,00:04:54,01:02:05 +5,Andrew Leech,Dundee Hawkhill Harriers,MS,00:24:49,00:32:53,00:05:02,01:02:44 +6,Oliver Lever,Lomond Hill Runners,MS,00:25:08,00:32:43,00:05:01,01:02:52 +7,Daniel Hale,University of St. Andrews Ccc,MS,00:25:03,00:32:47,00:05:06,01:02:56 +8,Bryan McLaren,Leven Las Vagas,MS,00:24:55,00:33:33,00:04:58,01:03:26 +9,James Bowden,Hunters Bog T,MS,00:26:05,00:33:21,00:05:11,01:04:37 +10,Jonny Logan,Fife AC,MS,00:25:23,00:34:51,00:05:18,01:05:32 +11=,Kevin Greig,Dundee Rr AC,M40,00:26:31,00:34:03,00:05:33,01:06:07 +11=,Matthew Low,Dundee Rr AC,MS,00:28:02,00:32:51,00:05:14,01:06:07 +13,Hendrik Van Rensburg,U/n,M40,00:26:16,00:34:28,00:05:29,01:06:13 +14,Iain Wallace,Leven Las Vegas RC,M40,00:26:01,00:34:41,00:05:36,01:06:18 +15,Maya Stone,Fife AC,FS,00:27:23,00:33:45,00:05:25,01:06:33 +16,Christopher McKiddie,Westerlands Ccc,MS,00:26:44,00:34:25,00:05:30,01:06:39 +17,Bryan Innes,Falkland Trail Runners,MS,00:26:21,00:35:17,00:05:21,01:06:59 +18,Scott Love,PH Racing,MS,00:26:14,00:35:30,00:05:17,01:07:01 +19,Alan Cameron,Corstorphine AAC,M40,00:26:27,00:35:13,00:05:24,01:07:04 +20,Willie Rennie,Carnegie Harriers,M40,00:26:36,00:35:05,00:05:25,01:07:06 +21,Claire Houston,Central AC,FS,00:26:48,00:35:03,00:05:23,01:07:14 +22,Kenny Gorman,Fife AC,MS,00:25:30,00:37:18,00:05:02,01:07:50 +23,Kristin Lownie,Carnegie Harriers,FS,00:26:58,00:35:25,00:05:30,01:07:53 +24,Brian Lees,Lothian RC,M50,00:25:55,00:36:29,00:05:34,01:07:58 +25,Jonathan Millar,Carnegie Harriers,MS,00:26:58,00:35:31,00:05:36,01:08:05 +26,Jennifer Cruickshanks,Fife AC,FS,00:27:14,00:36:07,00:05:28,01:08:49 +27,Elaine Omand,Dundee Rr AC,FS,00:27:05,00:36:11,00:05:35,01:08:51 +28,Lee O'Connor,Dundee Rr AC,M40,00:26:59,00:36:23,00:05:34,01:08:56 +29,Colin Mcwilliam,Fife AC,MS,00:26:46,00:37:20,00:05:36,01:09:42 +30,Arnaud Richard,Dundee Rr AC,MS,00:27:37,00:36:17,00:05:50,01:09:44 +31,Simon Knox,Dundee Rr AC,M50,00:27:27,00:36:44,00:05:51,01:10:02 +32,Susan Ridley,Edinburgh AC,F50,00:28:04,00:36:21,00:06:05,01:10:30 +33,Joanne Mcevoy,Calderglen H,FS,00:27:08,00:38:02,00:05:54,01:11:04 +34,Mike Murdoch,Falkland Trail Runners,M40,00:27:16,00:38:31,00:05:18,01:11:05 +35,Jim Morton,Dundee Rr AC,M50,00:28:15,00:36:50,00:06:02,01:11:07 +36,Louise Andrew,Dundee and Angus Cani-Cross,FS,00:27:03,00:38:23,00:05:53,01:11:19 +37,Duncan Edward,Dundee Rr AC,MS,00:27:10,00:38:54,00:05:43,01:11:47 +38,Gary Barker,Fife AC,M60,00:28:22,00:37:30,00:06:00,01:11:52 +39,Simon Fox,Fife AC,M50,00:28:13,00:37:59,00:05:52,01:12:04 +40,Derek Grant,Dundee and Angus Cani-Cross,M40,00:27:12,00:39:15,00:05:38,01:12:05 +41,Dave Morton,Morton Running Company,MS,00:27:54,00:38:59,00:05:42,01:12:35 +42,John Mcintyre,Fife AC,MS,00:28:43,00:38:29,00:05:38,01:12:50 +43,Andrew Stavert,Portobello RC,M50,00:28:59,00:37:43,00:06:14,01:12:56 +44,Stewart Dillon,Fife AC,M50,00:28:46,00:38:16,00:06:01,01:13:03 +45,Isobel Burnett,Carnegie Harriers,F60,00:27:29,00:39:34,00:06:03,01:13:06 +46,Jan-Bert van Den Berg,Corstorphine AAC,M50,00:28:18,00:39:18,00:06:01,01:13:37 +47,CJ Macphail,Anster Haddies,FS,00:29:34,00:38:20,00:05:55,01:13:49 +48,Tom Scott,Fife AC,M60,00:28:30,00:39:26,00:06:03,01:13:59 +49,Rhona Van Rensburg,Fife AC,F40,00:27:31,00:40:33,00:05:57,01:14:01 +50,Paul Reed,Dundee Rr AC,M40,00:29:11,00:39:02,00:06:00,01:14:13 +51,David Dunleavey,Dundee Rr AC,M50,00:28:55,00:39:56,00:06:01,01:14:52 +52,Jennifer Massie,Dundee Rr AC,FS,00:28:06,00:41:26,00:05:51,01:15:23 +53,Brian R Smith,Fife AC,M50,00:29:30,00:39:48,00:06:07,01:15:25 +54,Gary Ovenstone,STAART,M40,00:29:19,00:40:19,00:06:06,01:15:44 +55,Fiona Callaghan,Dundee Rr AC,FS,00:29:51,00:39:57,00:05:59,01:15:47 +56,Gary Howe,Fife AC,M40,00:29:54,00:40:23,00:06:14,01:16:31 +57,David Norrie,Fife AC,M60,00:29:48,00:40:40,00:06:06,01:16:34 +58,Neill Porterfield,Corstorphine AAC,M40,00:29:32,00:41:23,00:05:56,01:16:51 +59,Gillian Smith,Fife AC,F40,00:30:18,00:40:24,00:06:12,01:16:54 +60,Susanne Lumsden,Falkland Trail Runners,F40,00:30:15,00:41:03,00:06:31,01:17:49 +61,Tam Nicol'S,Stilton Striders,M50,00:29:16,00:43:00,00:05:59,01:18:15 +62,Merce Torres,Fife AC,F40,00:30:12,00:41:34,00:06:35,01:18:21 +63,Fiona Cruickshanks,Anster Haddies,FS,00:30:53,00:41:37,00:06:07,01:18:37 +64,Alison McNeilly,Dundee Rr AC,F40,00:29:25,00:42:54,00:06:29,01:18:48 +65,Innes Bracegirdle,Fife AC,F60,00:30:01,00:42:10,00:06:53,01:19:04 +66,Michael Bisset,Carnegie Harriers,M40,00:29:43,00:44:38,00:05:44,01:20:05 +67,David Henderson,Corstorphine AAC,M50,00:30:00,00:44:19,00:06:20,01:20:39 +68,Jazmin Hay,Anster Haddies,FS,00:31:04,00:43:31,00:06:34,01:21:09 +69,Jason Grant,Dundee and Angus Cani-Cross,MS,00:31:24,00:44:14,00:05:58,01:21:36 +70,Pamela Cruickshanks,Anster Haddies,F50,00:32:07,00:43:08,00:06:37,01:21:52 +71,Ewan Cameron,Anster Haddies,M50,00:32:15,00:42:47,00:06:51,01:21:53 +72,Catherine Leonard,Fife AC,F50,00:30:17,00:45:02,00:06:40,01:21:59 +73,Kieran Morgan,Carnegie Harriers,M50,00:31:44,00:44:07,00:06:26,01:22:17 +74,Gordon Somerville,Carnegie Harriers,M60,00:30:36,00:45:29,00:06:27,01:22:32 +75,Phil Smithard,Carnegie Harriers,M60,00:30:41,00:45:49,00:06:36,01:23:06 +76,Robyn Morrocco,Carnegie Harriers,FS,00:30:38,00:47:21,00:06:18,01:24:17 +77,Alice Hall,Anster Haddies,F50,00:32:45,00:45:13,00:07:06,01:25:04 +78,George Stewart,Calderglen H,M50,00:32:38,00:46:08,00:06:22,01:25:08 +79,Innes Petrie,Fife AC,M50,00:32:23,00:46:00,00:06:47,01:25:10 +80,Jocelyn Scott,Fife AC,F60,00:33:45,00:43:56,00:07:39,01:25:20 +81,Bill Duff,Falkland Trail Runners,M60,00:33:55,00:44:11,00:07:22,01:25:28 +82,Maneesh Kuruvilla,U/n,MS,00:32:48,00:46:18,00:06:28,01:25:34 +83,Christina Grant,Dundee and Angus Cani-Cross,FS,00:29:38,00:50:09,00:05:54,01:25:41 +84,John Henderson,Fife AC,M40,00:32:21,00:46:56,00:06:25,01:25:42 +85,Sharon Brown,Anster Haddies,FS,00:34:31,00:44:41,00:06:49,01:26:01 +86,Fiona Plain,Dundee Rr AC,FS,00:31:55,00:47:52,00:06:26,01:26:13 +87,Morna Fleming,Pitreavie AAC,F60,00:32:52,00:47:36,00:06:44,01:27:12 +88,David Nuttall,Anster Haddies,M40,00:35:12,00:46:32,00:07:15,01:28:59 +89,Zuleika Brett,Carnegie Harriers,FS,00:34:19,00:47:32,00:07:18,01:29:09 +90,Brian Stewart,Dundee Rr AC,MS,00:34:59,00:47:25,00:06:56,01:29:20 +91,Nick Brian,Fife AC,M60,00:33:15,00:49:08,00:06:58,01:29:21 +92,Bob Wylie,Leven Las Vegas RC,MS,00:34:10,00:48:27,00:06:50,01:29:27 +93,Bill Gillan,Falkland Trail Runners,M60,00:33:22,00:49:23,00:07:10,01:29:55 +94,Steve Cromar,Dundee Hawkhill Harriers,M70,00:34:18,00:48:59,00:07:50,01:31:07 +95,Rosemary Lee,Fife AC,F50,00:35:06,00:48:37,00:07:30,01:31:13 +96,Paul Mcglynn,Fife AC,M50,00:33:19,00:50:43,00:07:15,01:31:17 +97,Malcolm Mactavish,Falkland Trail Runners,M60,00:35:48,00:51:18,00:07:24,01:34:30 +98,Robert Thornton,Fife AC,M60,00:34:29,00:53:21,00:07:03,01:34:53 +99,Pauline Smith,Dundee Rr AC,FS,00:35:33,00:52:15,00:07:14,01:35:02 +100,Claire Duncan,Beacon Runners,F40,00:33:58,00:54:34,00:07:33,01:36:05 +101,Ross Johnston,Leven Las Vegas RC,M50,00:35:04,00:54:44,00:07:31,01:37:19 +102,Derek Adamson,Fife AC,M40,00:35:08,00:55:58,00:07:34,01:38:40 +103,Wendy Wylie,Leven Las Vegas RC,FS,00:34:33,00:57:24,00:07:15,01:39:12 +104,Big George Hay,Anster Haddies,M50,00:37:44,00:55:33,00:07:57,01:41:14 +105,Peter Rieu-Clarke,Leven Las Vegas RC,M70,00:38:22,00:56:09,00:07:35,01:42:06 +106,Ruth Letham,Fife AC,FS,00:37:22,00:57:30,00:07:41,01:42:33 +107,Josh McKay,Dundee Rr AC,MS,00:37:52,00:57:57,00:06:46,01:42:35 +108,Debz Way Hay,Anster Haddies,F50,00:40:26,00:54:37,00:08:26,01:43:29 +109,John Lee,Falkland Trail Runners,M50,00:40:15,00:54:39,00:08:39,01:43:33 +110,Jacqueline Cook,Falkland Trail Runners,F40,00:37:30,00:58:41,00:07:54,01:44:05 +111,Steph Barlow,Stilton Striders,F50,00:38:39,00:58:51,00:07:58,01:45:28 +112,Kara Christine,Run Mummy Run,F40,00:39:08,00:59:09,00:08:16,01:46:33 +113,Gary Scott,Anster Allsorts,M40,00:38:44,01:04:12,00:06:29,01:49:25 +114,Hannah Allum,Anster Allsorts,FS,00:38:46,01:04:14,00:07:53,01:50:53 +115,Angela Johnston,Leven Las Vegas RC,F50,00:41:12,01:00:56,00:08:46,01:50:54 +116,Karen Spence,Falkland Trail Runners,F40,00:53:17,01:16:43,00:10:59,02:20:59 +-,Heather Anderson,Fife AC,FS,-,00:35:23,-,- +-,William Arnot,Anster Haddies,M50,-,00:45:33,-,- +-,Jane Askey,Fife AC,F70,00:50:44,-,-,- +-,Joanne Clancy,Dundee Rr AC,FS,00:30:34,00:46:47,-,- +-,Peter Connolly,Dundee Rr AC,M50,00:30:46,00:47:19,-,- +-,Keith Copland,Corstorphine AAC,M40,00:31:07,00:42:28,-,- +-,Stuart Fraser,Perth Road Runners,MS,00:26:58,-,-,- +-,Cyndi Svee,U/n,F50,-,-,00:08:40,- diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.html new file mode 100644 index 00000000..8511182f --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_overall_2017.html @@ -0,0 +1,1256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosRunnerCatClubRace 1Race 2Race 3Total
    1Ben HukinsMSCambuslang H00:24:0300:27:3800:04:3500:56:16
    2Christopher O'BrienMSCorstorphine AAC00:24:3800:30:3900:04:4301:00:00
    3Robbie DunlopMSDundee Rr AC00:24:4300:30:4100:04:4701:00:11
    4Akira O'ConnorMSFife AC00:24:4500:32:2600:04:5401:02:05
    5Andrew LeechMSDundee Hawkhill Harriers00:24:4900:32:5300:05:0201:02:44
    6Oliver LeverMSLomond Hill Runners00:25:0800:32:4300:05:0101:02:52
    7Daniel HaleMSUniversity of St. Andrews Ccc00:25:0300:32:4700:05:0601:02:56
    8Bryan McLarenMSLeven Las Vagas00:24:5500:33:3300:04:5801:03:26
    9James BowdenMSHunters Bog T00:26:0500:33:2100:05:1101:04:37
    10Jonny LoganMSFife AC00:25:2300:34:5100:05:1801:05:32
    11=Kevin GreigM40Dundee Rr AC00:26:3100:34:0300:05:3301:06:07
    11=Matthew LowMSDundee Rr AC00:28:0200:32:5100:05:1401:06:07
    13Hendrik Van RensburgM40U/n00:26:1600:34:2800:05:2901:06:13
    14Iain WallaceM40Leven Las Vegas RC00:26:0100:34:4100:05:3601:06:18
    15Maya StoneFSFife AC00:27:2300:33:4500:05:2501:06:33
    16Christopher McKiddieMSWesterlands Ccc00:26:4400:34:2500:05:3001:06:39
    17Bryan InnesMSFalkland Trail Runners00:26:2100:35:1700:05:2101:06:59
    18Scott LoveMSPH Racing00:26:1400:35:3000:05:1701:07:01
    19Alan CameronM40Corstorphine AAC00:26:2700:35:1300:05:2401:07:04
    20Willie RennieM40Carnegie Harriers00:26:3600:35:0500:05:2501:07:06
    21Claire HoustonFSCentral AC00:26:4800:35:0300:05:2301:07:14
    22Kenny GormanMSFife AC00:25:3000:37:1800:05:0201:07:50
    23Kristin LownieFSCarnegie Harriers00:26:5800:35:2500:05:3001:07:53
    24Brian LeesM50Lothian RC00:25:5500:36:2900:05:3401:07:58
    25Jonathan MillarMSCarnegie Harriers00:26:5800:35:3100:05:3601:08:05
    26Jennifer CruickshanksFSFife AC00:27:1400:36:0700:05:2801:08:49
    27Elaine OmandFSDundee Rr AC00:27:0500:36:1100:05:3501:08:51
    28Lee O'ConnorM40Dundee Rr AC00:26:5900:36:2300:05:3401:08:56
    29Colin McwilliamMSFife AC00:26:4600:37:2000:05:3601:09:42
    30Arnaud RichardMSDundee Rr AC00:27:3700:36:1700:05:5001:09:44
    31Simon KnoxM50Dundee Rr AC00:27:2700:36:4400:05:5101:10:02
    32Susan RidleyF50Edinburgh AC00:28:0400:36:2100:06:0501:10:30
    33Joanne McevoyFSCalderglen H00:27:0800:38:0200:05:5401:11:04
    34Mike MurdochM40Falkland Trail Runners00:27:1600:38:3100:05:1801:11:05
    35Jim MortonM50Dundee Rr AC00:28:1500:36:5000:06:0201:11:07
    36Louise AndrewFSDundee and Angus Cani-Cross00:27:0300:38:2300:05:5301:11:19
    37Duncan EdwardMSDundee Rr AC00:27:1000:38:5400:05:4301:11:47
    38Gary BarkerM60Fife AC00:28:2200:37:3000:06:0001:11:52
    39Simon FoxM50Fife AC00:28:1300:37:5900:05:5201:12:04
    40Derek GrantM40Dundee and Angus Cani-Cross00:27:1200:39:1500:05:3801:12:05
    41Dave MortonMSMorton Running Company00:27:5400:38:5900:05:4201:12:35
    42John McintyreMSFife AC00:28:4300:38:2900:05:3801:12:50
    43Andrew StavertM50Portobello RC00:28:5900:37:4300:06:1401:12:56
    44Stewart DillonM50Fife AC00:28:4600:38:1600:06:0101:13:03
    45Isobel BurnettF60Carnegie Harriers00:27:2900:39:3400:06:0301:13:06
    46Jan-Bert van Den BergM50Corstorphine AAC00:28:1800:39:1800:06:0101:13:37
    47CJ MacphailFSAnster Haddies00:29:3400:38:2000:05:5501:13:49
    48Tom ScottM60Fife AC00:28:3000:39:2600:06:0301:13:59
    49Rhona Van RensburgF40Fife AC00:27:3100:40:3300:05:5701:14:01
    50Paul ReedM40Dundee Rr AC00:29:1100:39:0200:06:0001:14:13
    51David DunleaveyM50Dundee Rr AC00:28:5500:39:5600:06:0101:14:52
    52Jennifer MassieFSDundee Rr AC00:28:0600:41:2600:05:5101:15:23
    53Brian R SmithM50Fife AC00:29:3000:39:4800:06:0701:15:25
    54Gary OvenstoneM40STAART00:29:1900:40:1900:06:0601:15:44
    55Fiona CallaghanFSDundee Rr AC00:29:5100:39:5700:05:5901:15:47
    56Gary HoweM40Fife AC00:29:5400:40:2300:06:1401:16:31
    57David NorrieM60Fife AC00:29:4800:40:4000:06:0601:16:34
    58Neill PorterfieldM40Corstorphine AAC00:29:3200:41:2300:05:5601:16:51
    59Gillian SmithF40Fife AC00:30:1800:40:2400:06:1201:16:54
    60Susanne LumsdenF40Falkland Trail Runners00:30:1500:41:0300:06:3101:17:49
    61Tam Nicol'SM50Stilton Striders00:29:1600:43:0000:05:5901:18:15
    62Merce TorresF40Fife AC00:30:1200:41:3400:06:3501:18:21
    63Fiona CruickshanksFSAnster Haddies00:30:5300:41:3700:06:0701:18:37
    64Alison McNeillyF40Dundee Rr AC00:29:2500:42:5400:06:2901:18:48
    65Innes BracegirdleF60Fife AC00:30:0100:42:1000:06:5301:19:04
    66Michael BissetM40Carnegie Harriers00:29:4300:44:3800:05:4401:20:05
    67David HendersonM50Corstorphine AAC00:30:0000:44:1900:06:2001:20:39
    68Jazmin HayFSAnster Haddies00:31:0400:43:3100:06:3401:21:09
    69Jason GrantMSDundee and Angus Cani-Cross00:31:2400:44:1400:05:5801:21:36
    70Pamela CruickshanksF50Anster Haddies00:32:0700:43:0800:06:3701:21:52
    71Ewan CameronM50Anster Haddies00:32:1500:42:4700:06:5101:21:53
    72Catherine LeonardF50Fife AC00:30:1700:45:0200:06:4001:21:59
    73Kieran MorganM50Carnegie Harriers00:31:4400:44:0700:06:2601:22:17
    74Gordon SomervilleM60Carnegie Harriers00:30:3600:45:2900:06:2701:22:32
    75Phil SmithardM60Carnegie Harriers00:30:4100:45:4900:06:3601:23:06
    76Robyn MorroccoFSCarnegie Harriers00:30:3800:47:2100:06:1801:24:17
    77Alice HallF50Anster Haddies00:32:4500:45:1300:07:0601:25:04
    78George StewartM50Calderglen H00:32:3800:46:0800:06:2201:25:08
    79Innes PetrieM50Fife AC00:32:2300:46:0000:06:4701:25:10
    80Jocelyn ScottF60Fife AC00:33:4500:43:5600:07:3901:25:20
    81Bill DuffM60Falkland Trail Runners00:33:5500:44:1100:07:2201:25:28
    82Maneesh KuruvillaMSU/n00:32:4800:46:1800:06:2801:25:34
    83Christina GrantFSDundee and Angus Cani-Cross00:29:3800:50:0900:05:5401:25:41
    84John HendersonM40Fife AC00:32:2100:46:5600:06:2501:25:42
    85Sharon BrownFSAnster Haddies00:34:3100:44:4100:06:4901:26:01
    86Fiona PlainFSDundee Rr AC00:31:5500:47:5200:06:2601:26:13
    87Morna FlemingF60Pitreavie AAC00:32:5200:47:3600:06:4401:27:12
    88David NuttallM40Anster Haddies00:35:1200:46:3200:07:1501:28:59
    89Zuleika BrettFSCarnegie Harriers00:34:1900:47:3200:07:1801:29:09
    90Brian StewartMSDundee Rr AC00:34:5900:47:2500:06:5601:29:20
    91Nick BrianM60Fife AC00:33:1500:49:0800:06:5801:29:21
    92Bob WylieMSLeven Las Vegas RC00:34:1000:48:2700:06:5001:29:27
    93Bill GillanM60Falkland Trail Runners00:33:2200:49:2300:07:1001:29:55
    94Steve CromarM70Dundee Hawkhill Harriers00:34:1800:48:5900:07:5001:31:07
    95Rosemary LeeF50Fife AC00:35:0600:48:3700:07:3001:31:13
    96Paul McglynnM50Fife AC00:33:1900:50:4300:07:1501:31:17
    97Malcolm MactavishM60Falkland Trail Runners00:35:4800:51:1800:07:2401:34:30
    98Robert ThorntonM60Fife AC00:34:2900:53:2100:07:0301:34:53
    99Pauline SmithFSDundee Rr AC00:35:3300:52:1500:07:1401:35:02
    100Claire DuncanF40Beacon Runners00:33:5800:54:3400:07:3301:36:05
    101Ross JohnstonM50Leven Las Vegas RC00:35:0400:54:4400:07:3101:37:19
    102Derek AdamsonM40Fife AC00:35:0800:55:5800:07:3401:38:40
    103Wendy WylieFSLeven Las Vegas RC00:34:3300:57:2400:07:1501:39:12
    104Big George HayM50Anster Haddies00:37:4400:55:3300:07:5701:41:14
    105Peter Rieu-ClarkeM70Leven Las Vegas RC00:38:2200:56:0900:07:3501:42:06
    106Ruth LethamFSFife AC00:37:2200:57:3000:07:4101:42:33
    107Josh McKayMSDundee Rr AC00:37:5200:57:5700:06:4601:42:35
    108Debz Way HayF50Anster Haddies00:40:2600:54:3700:08:2601:43:29
    109John LeeM50Falkland Trail Runners00:40:1500:54:3900:08:3901:43:33
    110Jacqueline CookF40Falkland Trail Runners00:37:3000:58:4100:07:5401:44:05
    111Steph BarlowF50Stilton Striders00:38:3900:58:5100:07:5801:45:28
    112Kara ChristineF40Run Mummy Run00:39:0800:59:0900:08:1601:46:33
    113Gary ScottM40Anster Allsorts00:38:4401:04:1200:06:2901:49:25
    114Hannah AllumFSAnster Allsorts00:38:4601:04:1400:07:5301:50:53
    115Angela JohnstonF50Leven Las Vegas RC00:41:1201:00:5600:08:4601:50:54
    116Karen SpenceF40Falkland Trail Runners00:53:1701:16:4300:10:5902:20:59
    -Heather AndersonFSFife AC-00:35:23--
    -William ArnotM50Anster Haddies-00:45:33--
    -Jane AskeyF70Fife AC00:50:44---
    -Joanne ClancyFSDundee Rr AC00:30:3400:46:47--
    -Peter ConnollyM50Dundee Rr AC00:30:4600:47:19--
    -Keith CoplandM40Corstorphine AAC00:31:0700:42:28--
    -Stuart FraserMSPerth Road Runners00:26:58---
    -Cyndi SveeF50U/n--00:08:40-
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.html b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.html new file mode 100644 index 00000000..7f2042b7 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.html @@ -0,0 +1 @@ +

    Prizes

    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.pdf b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.pdf new file mode 100644 index 00000000..54f3b5fe Binary files /dev/null and b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.pdf differ diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.txt new file mode 100644 index 00000000..02edbe3e --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/expected/tour_prizes_2017.txt @@ -0,0 +1,3 @@ +Tour of Fife Results 2017 +============================ + diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_entry.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_entry.csv new file mode 100644 index 00000000..340cdab5 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_entry.csv @@ -0,0 +1,16 @@ +Women Junior,FU20,Women,13,19 +Men Junior,MU20,Men,13,19 +Women Senior,FS,Women,20,39 +Men Senior,MS,Men,20,39 +Women 40-49,F40,Women,40,49 +Men 40-49,M40,Men,40,49 +Women 50-59,F50,Women,50,59 +Men 50-59,M50,Men,50,59 +Women 60-69,F60,Women,60,69 +Men 60-69,M60,Men,60,69 +Women 70-79,F70,Women,70,79 +Men 70-79,M70,Men,70,79 +Women 80-89,F80,Women,80,89 +Men 80-89,M80,Men,80,89 +Women 90-99,F90,Women,90,99 +Men 90-99,M90,Men,90,99 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_prize.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_prize.csv new file mode 100644 index 00000000..65bf4849 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/categories_prize.csv @@ -0,0 +1,16 @@ +Women Senior,FS,Women,20,39,Overall,3 +Men Senior,MS,Men,20,99,Overall,3 +Women Junior,FU20,Women,15,19,Overall,1 +Men Junior,MU20,Men,15,19,Overall,1 +Women 40-49,F40,Women,40,49,Overall,3 +Men 40-49,M40,Men,40,49,Overall,3 +Women 50-59,F50,Women,50,59,Overall,3 +Men 50-59,M50,Men,50,59,Overall,3 +Women 60-69,F60,Women,60,69,Overall,3 +Men 60-69,M60,Men,60,69,Overall,3 +Women 70-79,F70,Women,70,79,Overall,3 +Men 70-79,M70,Men,70,79,Overall,3 +Women 80-89,F80,Women,80,89,Overall,3 +Men 80-89,M80,Men,80,89,Overall,3 +Women 90-99,F90,Women,90,99,Overall,3 +Men 90-99,M90,Men,90,99,Overall,3 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/config.txt new file mode 100644 index 00000000..a4a3b3ac --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/config.txt @@ -0,0 +1,15 @@ +YEAR = 2017 +RACE_NAME_FOR_RESULTS = Tour of Fife +RACE_NAME_FOR_FILENAMES = tour + +RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 + +CATEGORIES_ENTRY_PATH = categories_entry.csv +CATEGORIES_PRIZE_PATH = categories_prize.csv + +TIME_TRIAL_RACE = 3 + +# Comma-separated sequence of bib-number/start-offset. +TIME_TRIAL_STARTS = 20/00:00:00,85/00:00:00,78/00:00:00,30/00:00:30,139/00:00:30,127/00:00:30,151/00:01:00,79/00:01:00,86/00:01:00,133/00:01:30,88/00:01:30,63/00:01:30,32/00:02:00,59/00:02:00,91/00:02:00,129/00:03:00,89/00:03:00,117/00:03:00,29/00:03:00,34/00:04:00,114/00:04:00,25/00:04:00,123/00:04:30,3/00:04:30,23/00:04:30,74/00:05:00,111/00:05:00,97/00:05:00,16/00:05:30,130/00:05:30,96/00:05:30,5/00:06:00,145/00:06:00,90/00:06:00,50/00:06:00,67/00:06:30,52/00:06:30,43/00:06:30,148/00:07:00,31/00:07:00,81/00:07:00,26/00:07:30,83/00:07:30,1/00:07:30,22/00:08:30,80/00:08:30,132/00:08:30,82/00:09:00,19/00:09:00,39/00:09:00,49/00:09:30,58/00:09:30,57/00:09:30,101/00:10:00,77/00:10:00,56/00:10:00,93/00:11:30,144/00:11:30,126/00:11:30,28/00:12:00,15/00:12:00,41/00:12:00,62/00:13:00,21/00:13:00,110/00:13:00,10/00:14:00,46/00:14:00,124/00:14:00,149/00:14:30,107/00:14:30,6/00:14:30,17/00:15:00,9/00:15:00,45/00:15:00,131/00:16:00,92/00:16:00,115/00:16:00,109/00:16:30,116/00:16:30,100/00:17:00,40/00:17:00,48/00:17:00,105/00:17:30,94/00:17:30,54/00:17:30,128/00:18:00,65/00:18:00,36/00:18:00,134/00:18:30,70/00:18:30,113/00:18:30,147/00:19:00,42/00:19:00,47/00:19:00,69/00:19:30,75/00:19:30,103/00:19:30,71/00:20:00,121/00:20:00,55/00:20:00,4/00:21:00,11/00:21:00,104/00:21:00,141/00:21:30,98/00:21:30,73/00:21:30,60/00:22:00,66/00:22:00,72/00:22:00,38/00:22:30,27/00:22:30,37/00:22:30,12/00:23:00,33/00:23:00,13/00:23:00,95/00:23:30,112/00:23:30,120/00:23:30,61/00:24:00,143/00:24:00,142/00:24:00,119/00:24:00,35/00:24:30,87/00:24:30,135/00:25:00,136/00:25:00,2/00:25:00,7/00:25:30,8/00:25:30,14/00:25:30,18/00:26:00,24/00:26:00,44/00:26:00,51/00:26:30,53/00:26:30,64/00:26:30,68/00:27:00,76/00:27:00,84/00:27:00,99/00:27:30,102/00:27:30,106/00:27:30,108/00:28:00,118/00:28:00,122/00:28:30,125/00:28:30,137/00:28:30,138/00:29:00,140/00:29:00,146/00:29:00,150/00:29:00 \ No newline at end of file diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entries.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entries.txt new file mode 100644 index 00000000..b9724edb --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entries.txt @@ -0,0 +1,149 @@ +1 Dave Morton Morton Running Company M Sen +2 Stuart Gilbert Morton Running Company M Sen +3 Scott Love PH Racing Club M Sen +4 Rosemary Lee Fife AC F50 +5 Jennifer Massie Dundee RR AC F Sen +6 Michael Bisset Carnegie H M40 +7 Steven Dick Arbroath Footers M50 +8 Mark Johnstone Falkirk Victoria H M40 +9 Ewan Cameron Anster Haddies RC M50 +10 Alison Mcneilly Dundee RR AC F40 +11 Paul McGlynn Fife AC M50 +12 John Lee Falkland TR M50 +13 Josh McKay Dundee RR AC M Sen +14 Christine Bowie Anster Haddies RC F50 +15 Neill Porterfield Corstorphine AAC M40 +16 Arnaud Richard Dundee RR AC M Sen +17 Jazmin Hay Anster Haddies RC F Sen +18 Paul Dunning PH Racing Club M40 +19 CJ Macphail Anster Haddies RC F Sen +20 Ben Hukins Cambuslang H M Sen +21 Innes Bracegirdle Fife AC F60 +22 Stewart Dillon Fife AC M50 +23 Brian Lees Lothian RC M50 +24 Kerry Wheadon U/N F Sen +25 Alan Cameron Corstorphine AAC M40 +26 Derek Grant Dundee and Angus Cani-Cross M40 +27 Peter Rieu-Clarke Leven Las Vegas M70 +28 Gillian Smith Fife AC F40 +29 Jennifer Cruickshanks Fife AC F Sen +30 Akira O'Connor Fife AC M Sen +31 Duncan Edward Dundee RR AC M Sen +32 Iain Wallace Leven Las Vegas M40 +33 Debz Way Hay Anster Haddies RC F50 +34 Christopher McKiddie Westerlands CCC M Sen +35 Heather Anderson Fife AC F Sen +36 Maneesh Kuruvilla U/N M Sen +37 Ruth Letham Fife AC F Sen +38 Big George Hay Anster Haddies RC M50 +39 Karen Spence Falkland TR F40 +40 Jocelyn Scott Fife AC F60 +41 Susanne Lumsden Falkland TR F40 +42 Morna Fleming Pitreavie AAC F60 +43 Mike Murdoch Falkland TR M40 +44 Kirsty Gibson U/N F Sen +45 Pamela Cruickshanks Anster Haddies RC F50 +46 Fiona Cruickshanks Anster Haddies RC F Sen +47 David Nuttall Anster Haddies RC M40 +48 Alice Hall Anster Haddies RC F50 +49 Tom Scott Fife AC M60 +50 Elaine Omand Dundee RR AC F Sen +51 Gordon Donnachie Kinross RR M50 +52 Louise Andrew Dundee and Angus Cani-Cross F Sen +53 Peter Buchanan Portobello RC M50 +54 Bill Duff Falkland TR M60 +55 Steve Cromar Dundee Hawkhill H M70 +56 Gary Ovenstone STAART M40 +57 Paul Reed Dundee RR AC M40 +58 Rhona Van Rensburg Fife AC F40 +59 Hendrik Van Rensburg U/N M40 +60 Ross Johnston Leven Las Vegas RC M50 +61 Angela Johnston Leven Las Vegas RC F50 +62 Merce Torres Fife AC F40 +63 Kevin Greig Dundee RR AC M40 +64 Mark Lessells U/N M40 +65 George Stewart Calderglen H M50 +66 Derek Adamson Fife AC M40 +67 Joanne McEvoy Calderglen H F Sen +68 Michael Geoghegan Portobello RC M Sen +69 Zuleika Brett Carnegie H F Sen +70 John Henderson Fife AC M40 +71 Bob Wylie Leven Las Vegas RC M Sen +72 Wendy Wylie Leven Las Vegas RC F Sen +73 Claire Duncan Beacon Runners F40 +74 Jonathan Millar Carnegie H M Sen +75 Nick Brian Fife AC M60 +76 Christie Ford Shettleston H F Sen +77 Brian R Smith Fife AC M50 +78 Robbie Dunlop Dundee RR AC M Sen +79 Fergus Ingledew Fife AC MU20 +80 Isobel Burnett Carnegie H F60 +81 Simon Fox Fife AC M50 +82 Jan-Bert van den Berg Corstorphine AAC M50 +83 Andrew Stavert Portobello RC M50 +84 Sam Newington Durham City H & AC F40 +85 Christopher O'Brien Corstorphine AAC M Sen +86 Bryan McLaren Leven Las Vagas M Sen +87 William Arnot Anster Haddies RC M50 +88 Jonny Logan Fife AC M Sen +89 Claire Houston Central AC F Sen +90 Jim Morton Dundee RR AC M50 +91 Matthew Low Dundee RR AC M Sen +92 Jason Grant Dundee and Angus Cani-Cross M Sen +93 Fiona Callaghan Dundee RR AC F Sen +94 Peter Connolly Dundee RR AC M50 +95 Jacqueline Cook Falkland TR F40 +96 Simon Knox Dundee RR AC M50 +97 Lee O'Connor Dundee RR AC M40 +98 Robert Thornton Fife AC M60 +99 Lilian Stock The Meedies RC F Sen +100 Joanne Clancy Dundee RR AC F Sen +101 David Dunleavey Dundee RR AC M50 +102 Joanna Gray U/N F Sen +103 Brian Stewart Dundee RR AC M Sen +104 Malcolm Mactavish Falkland TR M60 +105 Robyn Morrocco Carnegie H F Sen +106 Nicola Freedman Harmeny AC F40 +107 David Henderson Corstorphine AAC M50 +108 Sophie Mullins Fife AC F Sen +109 Gordon Somerville Carnegie H M60 +110 Tam Nicol's Stilton Striders M50 +111 Kenny Gorman Fife AC M Sen +112 Steph Barlow Stilton Striders F50 +113 Christina Grant Dundee and Angus Cani-Cross F Sen +114 Bryan Innes Falkland TR M Sen +115 Kieran Morgan Carnegie H M50 +116 Phil Smithard Carnegie H M60 +117 Kristin Lownie Carnegie H F Sen +118 Sarah Winter Dundee RR AC F Sen +119 Cyndi Svee U/N F50 +120 Kara Christine Run Mummy Run F40 +121 Bill Gillan Falkland TR M60 +122 Stuart Tite PH Racing Club M Sen +123 Willie Rennie Carnegie H M40 +124 Louis Leslie Fife AC MU20 +125 Peter Peddie U/N M50 +126 David Norrie Fife AC M60 +127 Daniel Hale University of St. Andrews CCC M Sen +128 Innes Petrie Fife AC M50 +129 Maya Stone Fife AC F Sen +130 Colin Mcwilliam Fife AC M Sen +131 Catherine Leonard Fife AC F50 +132 John Mcintyre Fife AC M Sen +133 James Bowden Hunters Bog T M Sen +134 Sharon Brown Anster Haddies RC F Sen +135 Stuart Fraser Perth RR M Sen +136 Jane Askey Fife AC F70 +137 Greg Milne Fife AC M Sen +139 Andrew Leech Dundee Hawkhill H M Sen +140 Jennifer Spence Fife AC F Sen +141 Pauline Smith Dundee RR AC F Sen +142 Hannah Allum Anster Allsorts F Sen +143 Gary Scott Anster Allsorts M40 +144 Gary Howe Fife AC M40 +145 Susan Ridley Edinburgh AC F50 +146 Jon Cross Forth Valley Orienteers M40 +147 Fiona Plain Dundee RR AC F Sen +148 Gary Barker Fife AC M60 +149 Keith Copland Corstorphine AAC M40 +151 Oliver Lever Lomond Hill Runners M Sen diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entry_map.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entry_map.csv new file mode 100644 index 00000000..e04d4701 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/entry_map.csv @@ -0,0 +1,3 @@ +1,2-3,4,5 +M Sen,MS +F Sen,FS diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/config.txt new file mode 100644 index 00000000..64b20ab9 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 1 +RACE_NAME_FOR_FILENAMES = race1 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/rawtimes.txt new file mode 100644 index 00000000..a08d9f72 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race1/input/rawtimes.txt @@ -0,0 +1,123 @@ +20 00:24:03 +85 00:24:38 +78 00:24:43 +30 00:24:45 +139 00:24:49 +86 00:24:55 +127 00:25:03 +151 00:25:08 +79 00:25:18 +88 00:25:23 +111 00:25:30 +23 00:25:55 +32 00:26:01 +133 00:26:05 +3 00:26:14 +59 00:26:16 +114 00:26:21 +25 00:26:27 +63 00:26:31 +123 00:26:36 +34 00:26:44 +130 00:26:46 +89 00:26:48 +74 00:26:58 +135 00:26:58 +117 00:26:58 +97 00:26:59 +52 00:27:03 +50 00:27:05 +67 00:27:08 +31 00:27:10 +26 00:27:12 +29 00:27:14 +43 00:27:16 +129 00:27:23 +96 00:27:27 +80 00:27:29 +58 00:27:31 +16 00:27:37 +1 00:27:54 +91 00:28:02 +145 00:28:04 +5 00:28:06 +81 00:28:13 +90 00:28:15 +82 00:28:18 +148 00:28:22 +49 00:28:30 +132 00:28:43 +22 00:28:46 +101 00:28:55 +83 00:28:59 +57 00:29:11 +110 00:29:16 +56 00:29:19 +10 00:29:25 +77 00:29:30 +15 00:29:32 +19 00:29:34 +113 00:29:38 +6 00:29:43 +126 00:29:48 +93 00:29:51 +144 00:29:54 +107 00:30:00 +21 00:30:01 +62 00:30:12 +41 00:30:15 +131 00:30:17 +28 00:30:18 +100 00:30:34 +109 00:30:36 +105 00:30:38 +116 00:30:41 +94 00:30:46 +46 00:30:53 +124 00:31:02 +17 00:31:04 +149 00:31:07 +92 00:31:24 +115 00:31:44 +147 00:31:55 +45 00:32:07 +9 00:32:15 +70 00:32:21 +128 00:32:23 +65 00:32:38 +48 00:32:45 +36 00:32:48 +42 00:32:52 +75 00:33:15 +11 00:33:19 +121 00:33:22 +40 00:33:45 +54 00:33:55 +73 00:33:58 +71 00:34:10 +55 00:34:18 +69 00:34:19 +98 00:34:29 +134 00:34:31 +72 00:34:33 +103 00:34:59 +60 00:35:04 +4 00:35:06 +66 00:35:08 +47 00:35:12 +141 00:35:33 +104 00:35:48 +37 00:37:22 +95 00:37:30 +38 00:37:44 +13 00:37:52 +27 00:38:22 +112 00:38:39 +143 00:38:44 +142 00:38:46 +120 00:39:08 +12 00:40:15 +33 00:40:26 +61 00:41:12 +136 00:50:44 +39 00:53:17 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/config.txt new file mode 100644 index 00000000..21a1447c --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 2 +RACE_NAME_FOR_FILENAMES = race2 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/rawtimes.txt new file mode 100644 index 00000000..d3acb31a --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race2/input/rawtimes.txt @@ -0,0 +1,123 @@ +20 00:27:38 +85 00:30:39 +78 00:30:41 +30 00:32:26 +151 00:32:43 +127 00:32:47 +79 00:32:49 +91 00:32:51 +139 00:32:53 +133 00:33:21 +86 00:33:33 +129 00:33:45 +63 00:34:03 +34 00:34:25 +59 00:34:28 +32 00:34:41 +88 00:34:51 +89 00:35:03 +123 00:35:05 +25 00:35:13 +114 00:35:17 +35 00:35:23 +117 00:35:25 +3 00:35:30 +74 00:35:31 +29 00:36:07 +50 00:36:11 +16 00:36:17 +145 00:36:21 +97 00:36:23 +23 00:36:29 +96 00:36:44 +90 00:36:50 +111 00:37:18 +130 00:37:20 +148 00:37:30 +83 00:37:43 +81 00:37:59 +67 00:38:02 +22 00:38:16 +19 00:38:20 +52 00:38:23 +132 00:38:29 +43 00:38:31 +31 00:38:54 +1 00:38:59 +57 00:39:02 +26 00:39:15 +82 00:39:18 +49 00:39:26 +80 00:39:34 +77 00:39:48 +101 00:39:56 +93 00:39:57 +56 00:40:19 +144 00:40:23 +28 00:40:24 +58 00:40:33 +126 00:40:40 +41 00:41:03 +15 00:41:23 +5 00:41:26 +124 00:41:31 +62 00:41:34 +46 00:41:37 +21 00:42:10 +149 00:42:28 +9 00:42:47 +10 00:42:54 +110 00:43:00 +45 00:43:08 +17 00:43:31 +40 00:43:56 +115 00:44:07 +54 00:44:11 +92 00:44:14 +107 00:44:19 +6 00:44:38 +134 00:44:41 +131 00:45:02 +48 00:45:13 +109 00:45:29 +87 00:45:33 +116 00:45:49 +128 00:46:00 +65 00:46:08 +36 00:46:18 +47 00:46:32 +100 00:46:47 +70 00:46:56 +94 00:47:19 +105 00:47:21 +103 00:47:25 +69 00:47:32 +42 00:47:36 +147 00:47:52 +71 00:48:27 +4 00:48:37 +55 00:48:59 +75 00:49:08 +121 00:49:23 +113 00:50:09 +11 00:50:43 +104 00:51:18 +141 00:52:15 +98 00:53:21 +73 00:54:34 +33 00:54:37 +12 00:54:39 +60 00:54:44 +38 00:55:33 +66 00:55:58 +27 00:56:09 +72 00:57:24 +37 00:57:30 +13 00:57:57 +95 00:58:41 +112 00:58:51 +120 00:59:09 +61 01:00:56 +143 01:04:12 +142 01:04:14 +39 01:16:43 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/config.txt new file mode 100644 index 00000000..bf1620e6 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 3 +RACE_NAME_FOR_FILENAMES = race3 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/rawtimes.txt new file mode 100644 index 00000000..9c431a85 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_3/input/race3/input/rawtimes.txt @@ -0,0 +1,118 @@ +20 00:04:35 +85 00:04:43 +78 00:04:47 +30 00:05:24 +139 00:05:32 +127 00:05:36 +86 00:05:58 +151 00:06:01 +79 00:06:04 +133 00:06:41 +88 00:06:48 +63 00:07:03 +91 00:07:14 +59 00:07:29 +32 00:07:36 +89 00:08:23 +129 00:08:25 +29 00:08:28 +117 00:08:30 +114 00:09:21 +25 00:09:24 +34 00:09:30 +3 00:09:47 +123 00:09:55 +111 00:10:02 +23 00:10:04 +97 00:10:34 +74 00:10:36 +130 00:11:06 +16 00:11:20 +96 00:11:21 +50 00:11:35 +43 00:11:48 +5 00:11:51 +90 00:12:02 +145 00:12:05 +52 00:12:23 +67 00:12:24 +31 00:12:43 +81 00:12:52 +148 00:13:00 +26 00:13:08 +1 00:13:12 +83 00:13:44 +132 00:14:08 +22 00:14:31 +80 00:14:33 +19 00:14:55 +82 00:15:01 +58 00:15:27 +57 00:15:30 +49 00:15:33 +101 00:16:01 +56 00:16:06 +77 00:16:07 +93 00:17:29 +126 00:17:36 +144 00:17:44 +15 00:17:56 +28 00:18:12 +41 00:18:31 +110 00:18:59 +62 00:19:35 +21 00:19:53 +39 00:19:59 +46 00:20:07 +6 00:20:14 +10 00:20:29 +107 00:20:50 +17 00:21:34 +45 00:21:37 +9 00:21:51 +92 00:21:58 +115 00:22:26 +131 00:22:40 +109 00:22:57 +116 00:23:06 +105 00:23:48 +48 00:24:06 +65 00:24:22 +113 00:24:24 +36 00:24:28 +40 00:24:39 +128 00:24:47 +54 00:24:52 +70 00:24:55 +134 00:25:19 +147 00:25:26 +42 00:25:44 +47 00:26:15 +103 00:26:26 +75 00:26:28 +69 00:26:48 +71 00:26:50 +121 00:27:10 +55 00:27:50 +11 00:28:15 +104 00:28:24 +4 00:28:30 +98 00:28:33 +141 00:28:44 +73 00:29:03 +72 00:29:15 +60 00:29:31 +66 00:29:34 +13 00:29:46 +27 00:30:05 +37 00:30:11 +38 00:30:27 +143 00:30:29 +95 00:31:24 +33 00:31:26 +112 00:31:28 +12 00:31:39 +120 00:31:46 +142 00:31:53 +119 00:32:40 +61 00:32:46 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/combined.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/combined.html new file mode 100644 index 00000000..2a80239c --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/combined.html @@ -0,0 +1,1590 @@ +

    Results

    +

    Prizes

    +

    Women Senior

    +
      +
    • 1 Maya Stone (Fife AC) 01:56:53
      • +
    • 2 Claire Houston (Central AC) 01:57:38
      • +
    • 3 Kristin Lownie (Carnegie Harriers) 01:59:34
      • +
    + +

    Men Senior

    +
      +
    • 1 Ben Hukins (Cambuslang H) 01:39:02
      • +
    • 2 Christopher O'Brien (Corstorphine AAC) 01:45:16
      • +
    • 3 Robbie Dunlop (Dundee Rr AC) 01:45:41
      • +
    + +

    Women Junior

    +

    No results

    +

    Men Junior

    +

    No results

    +

    Women 40-49

    +
      +
    • 1 Rhona Van Rensburg (Fife AC) 02:08:27
      • +
    • 2 Gillian Smith (Fife AC) 02:15:47
      • +
    • 3 Alison McNeilly (Dundee Rr AC) 02:15:51
      • +
    + +

    Men 40-49

    +
      +
    • 1 Iain Wallace (Leven Las Vegas RC) 01:55:53
      • +
    • 2 Kevin Greig (Dundee Rr AC) 01:56:33
      • +
    • 3 Hendrik Van Rensburg (U/n) 01:56:52
      • +
    + +

    Women 50-59

    +
      +
    • 1 Susan Ridley (Edinburgh AC) 02:04:06
      • +
    • 2 Catherine Leonard (Fife AC) 02:20:24
      • +
    • 3 Pamela Cruickshanks (Anster Haddies) 02:23:30
      • +
    + +

    Men 50-59

    +
      +
    • 1 Brian Lees (Lothian RC) 02:00:33
      • +
    • 2 Simon Knox (Dundee Rr AC) 02:02:29
      • +
    • 3 Jim Morton (Dundee Rr AC) 02:05:59
      • +
    + +

    Women 60-69

    +
      +
    • 1 Isobel Burnett (Carnegie Harriers) 02:09:22
      • +
    • 2 Innes Bracegirdle (Fife AC) 02:19:08
      • +
    • 3 Jocelyn Scott (Fife AC) 02:28:58
      • +
    + +

    Men 60-69

    +
      +
    • 1 Gary Barker (Fife AC) 02:07:54
      • +
    • 2 Tom Scott (Fife AC) 02:10:28
      • +
    • 3 David Norrie (Fife AC) 02:13:43
      • +
    + +

    Women 70-79

    +

    No results

    +

    Men 70-79

    +
      +
    • 1 Steve Cromar (Dundee Hawkhill Harriers) 02:39:52
      • +
    • 2 Peter Rieu-Clarke (Leven Las Vegas RC) 03:10:34
      • +
    + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosRunnerCatClubRace 1Race 2Race 3Race 4Race 5Total
    1Ben HukinsMSCambuslang H00:24:0300:27:3800:04:3500:16:0900:26:3701:39:02
    2Christopher O'BrienMSCorstorphine AAC00:24:3800:30:3900:04:4300:17:0700:28:0901:45:16
    3Robbie DunlopMSDundee Rr AC00:24:4300:30:4100:04:4700:17:1900:28:1101:45:41
    4Andrew LeechMSDundee Hawkhill Harriers00:24:4900:32:5300:05:0200:17:4300:29:3801:50:05
    5Akira O'ConnorMSFife AC00:24:4500:32:2600:04:5400:17:4000:30:2401:50:09
    6Oliver LeverMSLomond Hill Runners00:25:0800:32:4300:05:0100:17:5000:29:4301:50:25
    7Bryan McLarenMSLeven Las Vagas00:24:5500:33:3300:04:5800:17:5700:29:3101:50:54
    8Daniel HaleMSUniversity of St. Andrews Ccc00:25:0300:32:4700:05:0600:18:1800:30:5801:52:12
    9James BowdenMSHunters Bog T00:26:0500:33:2100:05:1100:18:4800:30:2701:53:52
    10Jonny LoganMSFife AC00:25:2300:34:5100:05:1800:18:3800:30:3301:54:43
    11Iain WallaceM40Leven Las Vegas RC00:26:0100:34:4100:05:3600:18:4200:30:5301:55:53
    12Kevin GreigM40Dundee Rr AC00:26:3100:34:0300:05:3300:19:0700:31:1901:56:33
    13Kenny GormanMSFife AC00:25:3000:37:1800:05:0200:17:5500:30:5601:56:41
    14Hendrik Van RensburgM40U/n00:26:1600:34:2800:05:2900:18:5700:31:4201:56:52
    15Maya StoneFSFife AC00:27:2300:33:4500:05:2500:19:0400:31:1601:56:53
    16Scott LoveMSPH Racing00:26:1400:35:3000:05:1700:18:5300:31:0901:57:03
    17Alan CameronM40Corstorphine AAC00:26:2700:35:1300:05:2400:18:5400:31:2701:57:25
    18Claire HoustonFSCentral AC00:26:4800:35:0300:05:2300:18:4500:31:3901:57:38
    19Willie RennieM40Carnegie Harriers00:26:3600:35:0500:05:2500:18:5700:31:3601:57:39
    20Christopher McKiddieMSWesterlands Ccc00:26:4400:34:2500:05:3000:18:5900:32:0601:57:44
    21Kristin LownieFSCarnegie Harriers00:26:5800:35:2500:05:3000:19:2300:32:1801:59:34
    22Jonathan MillarMSCarnegie Harriers00:26:5800:35:3100:05:3600:19:2300:32:1601:59:44
    23Brian LeesM50Lothian RC00:25:5500:36:2900:05:3400:19:4200:32:5302:00:33
    24Elaine OmandFSDundee Rr AC00:27:0500:36:1100:05:3500:18:5600:32:5702:00:44
    25Colin McwilliamMSFife AC00:26:4600:37:2000:05:3600:19:1800:32:0902:01:09
    26Matthew LowMSDundee Rr AC00:28:0200:32:5100:05:1400:20:0800:35:1002:01:25
    27Lee O'ConnorM40Dundee Rr AC00:26:5900:36:2300:05:3400:19:4400:33:0302:01:43
    28Simon KnoxM50Dundee Rr AC00:27:2700:36:4400:05:5100:19:4500:32:4202:02:29
    29Jennifer CruickshanksFSFife AC00:27:1400:36:0700:05:2800:19:3000:34:4102:03:00
    30Mike MurdochM40Falkland Trail Runners00:27:1600:38:3100:05:1800:19:3100:32:4502:03:21
    31Arnaud RichardMSDundee Rr AC00:27:3700:36:1700:05:5000:20:1800:33:4302:03:45
    32Susan RidleyF50Edinburgh AC00:28:0400:36:2100:06:0500:20:0300:33:3302:04:06
    33Louise AndrewFSDundee and Angus Cani-Cross00:27:0300:38:2300:05:5300:19:5900:33:4902:05:07
    34Joanne McevoyFSCalderglen H00:27:0800:38:0200:05:5400:20:0500:34:0002:05:09
    35Duncan EdwardMSDundee Rr AC00:27:1000:38:5400:05:4300:19:4900:33:4002:05:16
    36Jim MortonM50Dundee Rr AC00:28:1500:36:5000:06:0200:20:5000:34:0202:05:59
    37Derek GrantM40Dundee and Angus Cani-Cross00:27:1200:39:1500:05:3800:19:5400:34:0802:06:07
    38Simon FoxM50Fife AC00:28:1300:37:5900:05:5200:20:2000:33:5602:06:20
    39John McintyreMSFife AC00:28:4300:38:2900:05:3800:20:0200:34:2702:07:19
    40Gary BarkerM60Fife AC00:28:2200:37:3000:06:0000:20:5900:35:0302:07:54
    41Andrew StavertM50Portobello RC00:28:5900:37:4300:06:1400:21:1900:34:0502:08:20
    42Rhona Van RensburgF40Fife AC00:27:3100:40:3300:05:5700:20:3300:33:5302:08:27
    43Isobel BurnettF60Carnegie Harriers00:27:2900:39:3400:06:0300:20:2200:35:5402:09:22
    44Paul ReedM40Dundee Rr AC00:29:1100:39:0200:06:0000:20:5000:34:3402:09:37
    45Jan-Bert van Den BergM50Corstorphine AAC00:28:1800:39:1800:06:0100:20:4600:35:1602:09:39
    46Dave MortonMSMorton Running Company00:27:5400:38:5900:05:4200:20:3000:36:4602:09:51
    47Tom ScottM60Fife AC00:28:3000:39:2600:06:0300:21:0200:35:2702:10:28
    48Jennifer MassieFSDundee Rr AC00:28:0600:41:2600:05:5100:20:1600:35:0702:10:46
    49David DunleaveyM50Dundee Rr AC00:28:5500:39:5600:06:0100:21:1200:36:3002:12:34
    50Fiona CallaghanFSDundee Rr AC00:29:5100:39:5700:05:5900:21:4800:35:2302:12:58
    51David NorrieM60Fife AC00:29:4800:40:4000:06:0600:21:2200:35:4702:13:43
    52Brian R SmithM50Fife AC00:29:3000:39:4800:06:0700:21:3700:37:1802:14:20
    53Gary OvenstoneM40STAART00:29:1900:40:1900:06:0600:21:4400:37:3602:15:04
    54Gillian SmithF40Fife AC00:30:1800:40:2400:06:1200:22:0900:36:4402:15:47
    55Alison McNeillyF40Dundee Rr AC00:29:2500:42:5400:06:2900:21:3300:35:3002:15:51
    56Tam Nicol'SM50Stilton Striders00:29:1600:43:0000:05:5900:21:0300:36:5102:16:09
    57Susanne LumsdenF40Falkland Trail Runners00:30:1500:41:0300:06:3100:22:0800:36:1402:16:11
    58Michael BissetM40Carnegie Harriers00:29:4300:44:3800:05:4400:20:3700:35:3402:16:16
    59Merce TorresF40Fife AC00:30:1200:41:3400:06:3500:22:3100:37:5202:18:44
    60Fiona CruickshanksFSAnster Haddies00:30:5300:41:3700:06:0700:21:3500:38:4302:18:55
    61Innes BracegirdleF60Fife AC00:30:0100:42:1000:06:5300:22:3500:37:2902:19:08
    62Catherine LeonardF50Fife AC00:30:1700:45:0200:06:4000:21:5000:36:3502:20:24
    63David HendersonM50Corstorphine AAC00:30:0000:44:1900:06:2000:21:5800:38:1302:20:50
    64Jason GrantMSDundee and Angus Cani-Cross00:31:2400:44:1400:05:5800:21:2600:38:2702:21:29
    65Jazmin HayFSAnster Haddies00:31:0400:43:3100:06:3400:22:3400:38:3102:22:14
    66Kieran MorganM50Carnegie Harriers00:31:4400:44:0700:06:2600:22:0700:38:5702:23:21
    67Pamela CruickshanksF50Anster Haddies00:32:0700:43:0800:06:3700:22:1500:39:2302:23:30
    68Gordon SomervilleM60Carnegie Harriers00:30:3600:45:2900:06:2700:22:4200:38:3902:23:53
    69Christina GrantFSDundee and Angus Cani-Cross00:29:3800:50:0900:05:5400:21:3000:37:4002:24:51
    70Ewan CameronM50Anster Haddies00:32:1500:42:4700:06:5100:23:5000:39:2602:25:09
    71Robyn MorroccoFSCarnegie Harriers00:30:3800:47:2100:06:1800:22:0500:39:0802:25:30
    72Phil SmithardM60Carnegie Harriers00:30:4100:45:4900:06:3600:22:4600:40:1502:26:07
    73Fiona PlainFSDundee Rr AC00:31:5500:47:5200:06:2600:22:5500:38:2202:27:30
    74John HendersonM40Fife AC00:32:2100:46:5600:06:2500:22:5000:40:2202:28:54
    75Jocelyn ScottF60Fife AC00:33:4500:43:5600:07:3900:24:0900:39:2902:28:58
    76Maneesh KuruvillaMSU/n00:32:4800:46:1800:06:2800:23:0600:40:5102:29:31
    77Alice HallF50Anster Haddies00:32:4500:45:1300:07:0600:24:0200:41:1602:30:22
    78Morna FlemingF60Pitreavie AAC00:32:5200:47:3600:06:4400:23:1700:40:0202:30:31
    79Sharon BrownFSAnster Haddies00:34:3100:44:4100:06:4900:24:1300:40:2902:30:43
    80George StewartM50Calderglen H00:32:3800:46:0800:06:2200:24:2800:41:4302:31:19
    81Innes PetrieM50Fife AC00:32:2300:46:0000:06:4700:24:0600:42:3702:31:53
    82David NuttallM40Anster Haddies00:35:1200:46:3200:07:1500:25:2400:41:5302:36:16
    83Bill GillanM60Falkland Trail Runners00:33:2200:49:2300:07:1000:24:1800:42:2202:36:35
    84Bob WylieMSLeven Las Vegas RC00:34:1000:48:2700:06:5000:24:3000:42:5302:36:50
    85Zuleika BrettFSCarnegie Harriers00:34:1900:47:3200:07:1800:25:2500:42:4102:37:15
    86Paul McglynnM50Fife AC00:33:1900:50:4300:07:1500:25:1200:43:1302:39:42
    87Steve CromarM70Dundee Hawkhill Harriers00:34:1800:48:5900:07:5000:25:1700:43:2802:39:52
    88Brian StewartMSDundee Rr AC00:34:5900:47:2500:06:5600:26:2500:44:1302:39:58
    89Rosemary LeeF50Fife AC00:35:0600:48:3700:07:3000:25:5200:43:0102:40:06
    90Robert ThorntonM60Fife AC00:34:2900:53:2100:07:0300:25:0600:42:4802:42:47
    91Pauline SmithFSDundee Rr AC00:35:3300:52:1500:07:1400:26:5300:43:3202:45:27
    92Malcolm MactavishM60Falkland Trail Runners00:35:4800:51:1800:07:2400:26:3600:45:1302:46:19
    93Wendy WylieFSLeven Las Vegas RC00:34:3300:57:2400:07:1500:25:0700:43:4302:48:02
    94Ross JohnstonM50Leven Las Vegas RC00:35:0400:54:4400:07:3100:28:0100:45:4202:51:02
    95Derek AdamsonM40Fife AC00:35:0800:55:5800:07:3400:26:5500:47:2202:52:57
    96Ruth LethamFSFife AC00:37:2200:57:3000:07:4100:27:1300:46:2402:56:10
    97Josh McKayMSDundee Rr AC00:37:5200:57:5700:06:4600:26:5300:46:5502:56:23
    98Big George HayM50Anster Haddies00:37:4400:55:3300:07:5700:28:1000:50:2502:59:49
    99Jacqueline CookF40Falkland Trail Runners00:37:3000:58:4100:07:5400:28:0100:49:1503:01:21
    100John LeeM50Falkland Trail Runners00:40:1500:54:3900:08:3900:29:4100:49:2903:02:43
    101Steph BarlowF50Stilton Striders00:38:3900:58:5100:07:5800:29:4900:49:4103:04:58
    102Debz Way HayF50Anster Haddies00:40:2600:54:3700:08:2600:30:1800:51:1603:05:03
    103Gary ScottM40Anster Allsorts00:38:4401:04:1200:06:2900:27:4800:50:3103:07:44
    104Kara ChristineF40Run Mummy Run00:39:0800:59:0900:08:1600:30:4500:51:2203:08:40
    105Hannah AllumFSAnster Allsorts00:38:4601:04:1400:07:5300:28:3100:50:2803:09:52
    106Angela JohnstonF50Leven Las Vegas RC00:41:1201:00:5600:08:4600:29:4600:49:3203:10:12
    107Peter Rieu-ClarkeM70Leven Las Vegas RC00:38:2200:56:0900:07:3500:25:1601:03:1203:10:34
    108Karen SpenceF40Falkland Trail Runners00:53:1701:16:4300:10:5900:38:4701:03:0904:02:55
    -Heather AndersonFSFife AC-00:35:23----
    -William ArnotM50Anster Haddies-00:45:33-00:24:01--
    -Jane AskeyF70Fife AC00:50:44-----
    -Nick BrianM60Fife AC00:33:1500:49:0800:06:5800:24:21--
    -Joanne ClancyFSDundee Rr AC00:30:3400:46:47----
    -Peter ConnollyM50Dundee Rr AC00:30:4600:47:19--00:40:04-
    -Keith CoplandM40Corstorphine AAC00:31:0700:42:28----
    -Stewart DillonM50Fife AC00:28:4600:38:1600:06:01---
    -Bill DuffM60Falkland Trail Runners00:33:5500:44:1100:07:2200:24:39--
    -Claire DuncanF40Beacon Runners00:33:5800:54:3400:07:33---
    -Stuart FraserMSPerth Road Runners00:26:58-----
    -Stuart GilbertMSMorton Running Company---00:34:02--
    -Gary HoweM40Fife AC00:29:5400:40:2300:06:1400:21:41--
    -Bryan InnesMSFalkland Trail Runners00:26:2100:35:1700:05:2100:18:54--
    -CJ MacphailFSAnster Haddies00:29:3400:38:2000:05:5500:21:12--
    -Neill PorterfieldM40Corstorphine AAC00:29:3200:41:2300:05:56-00:36:07-
    -Cyndi SveeF50U/n--00:08:40-00:55:50-
    +

    Results generated using race-timing.

    \ No newline at end of file diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/processing_notes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/processing_notes.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race1.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race1.html new file mode 100644 index 00000000..13aadcad --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race1.html @@ -0,0 +1,862 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:24:03
    285Christopher O'BrienMS00:24:38
    378Robbie DunlopMS00:24:43
    430Akira O'ConnorMS00:24:45
    5139Andrew LeechMS00:24:49
    686Bryan McLarenMS00:24:55
    7127Daniel HaleMS00:25:03
    8151Oliver LeverMS00:25:08
    988Jonny LoganMS00:25:23
    10111Kenny GormanMS00:25:30
    1123Brian LeesM5000:25:55
    1232Iain WallaceM4000:26:01
    13133James BowdenMS00:26:05
    143Scott LoveMS00:26:14
    1559Hendrik Van RensburgM4000:26:16
    16114Bryan InnesMS00:26:21
    1725Alan CameronM4000:26:27
    1863Kevin GreigM4000:26:31
    19123Willie RennieM4000:26:36
    2034Christopher McKiddieMS00:26:44
    21130Colin McwilliamMS00:26:46
    2289Claire HoustonFS00:26:48
    2374Jonathan MillarMS00:26:58
    24135Stuart FraserMS00:26:58
    25117Kristin LownieFS00:26:58
    2697Lee O'ConnorM4000:26:59
    2752Louise AndrewFS00:27:03
    2850Elaine OmandFS00:27:05
    2967Joanne McevoyFS00:27:08
    3031Duncan EdwardMS00:27:10
    3126Derek GrantM4000:27:12
    3229Jennifer CruickshanksFS00:27:14
    3343Mike MurdochM4000:27:16
    34129Maya StoneFS00:27:23
    3596Simon KnoxM5000:27:27
    3680Isobel BurnettF6000:27:29
    3758Rhona Van RensburgF4000:27:31
    3816Arnaud RichardMS00:27:37
    391Dave MortonMS00:27:54
    4091Matthew LowMS00:28:02
    41145Susan RidleyF5000:28:04
    425Jennifer MassieFS00:28:06
    4381Simon FoxM5000:28:13
    4490Jim MortonM5000:28:15
    4582Jan-Bert van Den BergM5000:28:18
    46148Gary BarkerM6000:28:22
    4749Tom ScottM6000:28:30
    48132John McintyreMS00:28:43
    4922Stewart DillonM5000:28:46
    50101David DunleaveyM5000:28:55
    5183Andrew StavertM5000:28:59
    5257Paul ReedM4000:29:11
    53110Tam Nicol'SM5000:29:16
    5456Gary OvenstoneM4000:29:19
    5510Alison McNeillyF4000:29:25
    5677Brian R SmithM5000:29:30
    5715Neill PorterfieldM4000:29:32
    5819CJ MacphailFS00:29:34
    59113Christina GrantFS00:29:38
    606Michael BissetM4000:29:43
    61126David NorrieM6000:29:48
    6293Fiona CallaghanFS00:29:51
    63144Gary HoweM4000:29:54
    64107David HendersonM5000:30:00
    6521Innes BracegirdleF6000:30:01
    6662Merce TorresF4000:30:12
    6741Susanne LumsdenF4000:30:15
    68131Catherine LeonardF5000:30:17
    6928Gillian SmithF4000:30:18
    70100Joanne ClancyFS00:30:34
    71109Gordon SomervilleM6000:30:36
    72105Robyn MorroccoFS00:30:38
    73116Phil SmithardM6000:30:41
    7494Peter ConnollyM5000:30:46
    7546Fiona CruickshanksFS00:30:53
    7617Jazmin HayFS00:31:04
    77149Keith CoplandM4000:31:07
    7892Jason GrantMS00:31:24
    79115Kieran MorganM5000:31:44
    80147Fiona PlainFS00:31:55
    8145Pamela CruickshanksF5000:32:07
    829Ewan CameronM5000:32:15
    8370John HendersonM4000:32:21
    84128Innes PetrieM5000:32:23
    8565George StewartM5000:32:38
    8648Alice HallF5000:32:45
    8736Maneesh KuruvillaMS00:32:48
    8842Morna FlemingF6000:32:52
    8975Nick BrianM6000:33:15
    9011Paul McglynnM5000:33:19
    91121Bill GillanM6000:33:22
    9240Jocelyn ScottF6000:33:45
    9354Bill DuffM6000:33:55
    9473Claire DuncanF4000:33:58
    9571Bob WylieMS00:34:10
    9655Steve CromarM7000:34:18
    9769Zuleika BrettFS00:34:19
    9898Robert ThorntonM6000:34:29
    99134Sharon BrownFS00:34:31
    10072Wendy WylieFS00:34:33
    101103Brian StewartMS00:34:59
    10260Ross JohnstonM5000:35:04
    1034Rosemary LeeF5000:35:06
    10466Derek AdamsonM4000:35:08
    10547David NuttallM4000:35:12
    106141Pauline SmithFS00:35:33
    107104Malcolm MactavishM6000:35:48
    10837Ruth LethamFS00:37:22
    10995Jacqueline CookF4000:37:30
    11038Big George HayM5000:37:44
    11113Josh McKayMS00:37:52
    11227Peter Rieu-ClarkeM7000:38:22
    113112Steph BarlowF5000:38:39
    114143Gary ScottM4000:38:44
    115142Hannah AllumFS00:38:46
    116120Kara ChristineF4000:39:08
    11712John LeeM5000:40:15
    11833Debz Way HayF5000:40:26
    11961Angela JohnstonF5000:41:12
    120136Jane AskeyF7000:50:44
    12139Karen SpenceF4000:53:17
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race2.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race2.html new file mode 100644 index 00000000..c39335da --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race2.html @@ -0,0 +1,862 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:27:38
    285Christopher O'BrienMS00:30:39
    378Robbie DunlopMS00:30:41
    430Akira O'ConnorMS00:32:26
    5151Oliver LeverMS00:32:43
    6127Daniel HaleMS00:32:47
    791Matthew LowMS00:32:51
    8139Andrew LeechMS00:32:53
    9133James BowdenMS00:33:21
    1086Bryan McLarenMS00:33:33
    11129Maya StoneFS00:33:45
    1263Kevin GreigM4000:34:03
    1334Christopher McKiddieMS00:34:25
    1459Hendrik Van RensburgM4000:34:28
    1532Iain WallaceM4000:34:41
    1688Jonny LoganMS00:34:51
    1789Claire HoustonFS00:35:03
    18123Willie RennieM4000:35:05
    1925Alan CameronM4000:35:13
    20114Bryan InnesMS00:35:17
    2135Heather AndersonFS00:35:23
    22117Kristin LownieFS00:35:25
    233Scott LoveMS00:35:30
    2474Jonathan MillarMS00:35:31
    2529Jennifer CruickshanksFS00:36:07
    2650Elaine OmandFS00:36:11
    2716Arnaud RichardMS00:36:17
    28145Susan RidleyF5000:36:21
    2997Lee O'ConnorM4000:36:23
    3023Brian LeesM5000:36:29
    3196Simon KnoxM5000:36:44
    3290Jim MortonM5000:36:50
    33111Kenny GormanMS00:37:18
    34130Colin McwilliamMS00:37:20
    35148Gary BarkerM6000:37:30
    3683Andrew StavertM5000:37:43
    3781Simon FoxM5000:37:59
    3867Joanne McevoyFS00:38:02
    3922Stewart DillonM5000:38:16
    4019CJ MacphailFS00:38:20
    4152Louise AndrewFS00:38:23
    42132John McintyreMS00:38:29
    4343Mike MurdochM4000:38:31
    4431Duncan EdwardMS00:38:54
    451Dave MortonMS00:38:59
    4657Paul ReedM4000:39:02
    4726Derek GrantM4000:39:15
    4882Jan-Bert van Den BergM5000:39:18
    4949Tom ScottM6000:39:26
    5080Isobel BurnettF6000:39:34
    5177Brian R SmithM5000:39:48
    52101David DunleaveyM5000:39:56
    5393Fiona CallaghanFS00:39:57
    5456Gary OvenstoneM4000:40:19
    55144Gary HoweM4000:40:23
    5628Gillian SmithF4000:40:24
    5758Rhona Van RensburgF4000:40:33
    58126David NorrieM6000:40:40
    5941Susanne LumsdenF4000:41:03
    6015Neill PorterfieldM4000:41:23
    615Jennifer MassieFS00:41:26
    6262Merce TorresF4000:41:34
    6346Fiona CruickshanksFS00:41:37
    6421Innes BracegirdleF6000:42:10
    65149Keith CoplandM4000:42:28
    669Ewan CameronM5000:42:47
    6710Alison McNeillyF4000:42:54
    68110Tam Nicol'SM5000:43:00
    6945Pamela CruickshanksF5000:43:08
    7017Jazmin HayFS00:43:31
    7140Jocelyn ScottF6000:43:56
    72115Kieran MorganM5000:44:07
    7354Bill DuffM6000:44:11
    7492Jason GrantMS00:44:14
    75107David HendersonM5000:44:19
    766Michael BissetM4000:44:38
    77134Sharon BrownFS00:44:41
    78131Catherine LeonardF5000:45:02
    7948Alice HallF5000:45:13
    80109Gordon SomervilleM6000:45:29
    8187William ArnotM5000:45:33
    82116Phil SmithardM6000:45:49
    83128Innes PetrieM5000:46:00
    8465George StewartM5000:46:08
    8536Maneesh KuruvillaMS00:46:18
    8647David NuttallM4000:46:32
    87100Joanne ClancyFS00:46:47
    8870John HendersonM4000:46:56
    8994Peter ConnollyM5000:47:19
    90105Robyn MorroccoFS00:47:21
    91103Brian StewartMS00:47:25
    9269Zuleika BrettFS00:47:32
    9342Morna FlemingF6000:47:36
    94147Fiona PlainFS00:47:52
    9571Bob WylieMS00:48:27
    964Rosemary LeeF5000:48:37
    9755Steve CromarM7000:48:59
    9875Nick BrianM6000:49:08
    99121Bill GillanM6000:49:23
    100113Christina GrantFS00:50:09
    10111Paul McglynnM5000:50:43
    102104Malcolm MactavishM6000:51:18
    103141Pauline SmithFS00:52:15
    10498Robert ThorntonM6000:53:21
    10573Claire DuncanF4000:54:34
    10633Debz Way HayF5000:54:37
    10712John LeeM5000:54:39
    10860Ross JohnstonM5000:54:44
    10938Big George HayM5000:55:33
    11066Derek AdamsonM4000:55:58
    11127Peter Rieu-ClarkeM7000:56:09
    11272Wendy WylieFS00:57:24
    11337Ruth LethamFS00:57:30
    11413Josh McKayMS00:57:57
    11595Jacqueline CookF4000:58:41
    116112Steph BarlowF5000:58:51
    117120Kara ChristineF4000:59:09
    11861Angela JohnstonF5001:00:56
    119143Gary ScottM4001:04:12
    120142Hannah AllumFS01:04:14
    12139Karen SpenceF4001:16:43
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race3.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race3.html new file mode 100644 index 00000000..17d0e1c7 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race3.html @@ -0,0 +1,834 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:04:35
    285Christopher O'BrienMS00:04:43
    378Robbie DunlopMS00:04:47
    430Akira O'ConnorMS00:04:54
    586Bryan McLarenMS00:04:58
    6151Oliver LeverMS00:05:01
    7139Andrew LeechMS00:05:02
    8111Kenny GormanMS00:05:02
    9127Daniel HaleMS00:05:06
    10133James BowdenMS00:05:11
    1191Matthew LowMS00:05:14
    123Scott LoveMS00:05:17
    1388Jonny LoganMS00:05:18
    1443Mike MurdochM4000:05:18
    15114Bryan InnesMS00:05:21
    1689Claire HoustonFS00:05:23
    1725Alan CameronM4000:05:24
    18129Maya StoneFS00:05:25
    19123Willie RennieM4000:05:25
    2029Jennifer CruickshanksFS00:05:28
    2159Hendrik Van RensburgM4000:05:29
    22117Kristin LownieFS00:05:30
    2334Christopher McKiddieMS00:05:30
    2463Kevin GreigM4000:05:33
    2523Brian LeesM5000:05:34
    2697Lee O'ConnorM4000:05:34
    2750Elaine OmandFS00:05:35
    2832Iain WallaceM4000:05:36
    2974Jonathan MillarMS00:05:36
    30130Colin McwilliamMS00:05:36
    3126Derek GrantM4000:05:38
    32132John McintyreMS00:05:38
    331Dave MortonMS00:05:42
    3431Duncan EdwardMS00:05:43
    356Michael BissetM4000:05:44
    3616Arnaud RichardMS00:05:50
    3796Simon KnoxM5000:05:51
    385Jennifer MassieFS00:05:51
    3981Simon FoxM5000:05:52
    4052Louise AndrewFS00:05:53
    4167Joanne McevoyFS00:05:54
    42113Christina GrantFS00:05:54
    4319CJ MacphailFS00:05:55
    4415Neill PorterfieldM4000:05:56
    4558Rhona Van RensburgF4000:05:57
    4692Jason GrantMS00:05:58
    4793Fiona CallaghanFS00:05:59
    48110Tam Nicol'SM5000:05:59
    49148Gary BarkerM6000:06:00
    5057Paul ReedM4000:06:00
    5122Stewart DillonM5000:06:01
    5282Jan-Bert van Den BergM5000:06:01
    53101David DunleaveyM5000:06:01
    5490Jim MortonM5000:06:02
    5580Isobel BurnettF6000:06:03
    5649Tom ScottM6000:06:03
    57145Susan RidleyF5000:06:05
    5856Gary OvenstoneM4000:06:06
    59126David NorrieM6000:06:06
    6077Brian R SmithM5000:06:07
    6146Fiona CruickshanksFS00:06:07
    6228Gillian SmithF4000:06:12
    6383Andrew StavertM5000:06:14
    64144Gary HoweM4000:06:14
    65105Robyn MorroccoFS00:06:18
    66107David HendersonM5000:06:20
    6765George StewartM5000:06:22
    6870John HendersonM4000:06:25
    69115Kieran MorganM5000:06:26
    70147Fiona PlainFS00:06:26
    71109Gordon SomervilleM6000:06:27
    7236Maneesh KuruvillaMS00:06:28
    7310Alison McNeillyF4000:06:29
    74143Gary ScottM4000:06:29
    7541Susanne LumsdenF4000:06:31
    7617Jazmin HayFS00:06:34
    7762Merce TorresF4000:06:35
    78116Phil SmithardM6000:06:36
    7945Pamela CruickshanksF5000:06:37
    80131Catherine LeonardF5000:06:40
    8142Morna FlemingF6000:06:44
    8213Josh McKayMS00:06:46
    83128Innes PetrieM5000:06:47
    84134Sharon BrownFS00:06:49
    8571Bob WylieMS00:06:50
    869Ewan CameronM5000:06:51
    8721Innes BracegirdleF6000:06:53
    88103Brian StewartMS00:06:56
    8975Nick BrianM6000:06:58
    9098Robert ThorntonM6000:07:03
    9148Alice HallF5000:07:06
    92121Bill GillanM6000:07:10
    93141Pauline SmithFS00:07:14
    9447David NuttallM4000:07:15
    9511Paul McglynnM5000:07:15
    9672Wendy WylieFS00:07:15
    9769Zuleika BrettFS00:07:18
    9854Bill DuffM6000:07:22
    99104Malcolm MactavishM6000:07:24
    1004Rosemary LeeF5000:07:30
    10160Ross JohnstonM5000:07:31
    10273Claire DuncanF4000:07:33
    10366Derek AdamsonM4000:07:34
    10427Peter Rieu-ClarkeM7000:07:35
    10540Jocelyn ScottF6000:07:39
    10637Ruth LethamFS00:07:41
    10755Steve CromarM7000:07:50
    108142Hannah AllumFS00:07:53
    10995Jacqueline CookF4000:07:54
    11038Big George HayM5000:07:57
    111112Steph BarlowF5000:07:58
    112120Kara ChristineF4000:08:16
    11333Debz Way HayF5000:08:26
    11412John LeeM5000:08:39
    115119Cyndi SveeF5000:08:40
    11661Angela JohnstonF5000:08:46
    11739Karen SpenceF4000:10:59
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race4.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race4.html new file mode 100644 index 00000000..5086b66d --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race4.html @@ -0,0 +1,820 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:16:09
    285Christopher O'BrienMS00:17:07
    378Robbie DunlopMS00:17:19
    430Akira O'ConnorMS00:17:40
    5139Andrew LeechMS00:17:43
    6151Oliver LeverMS00:17:50
    7111Kenny GormanMS00:17:55
    886Bryan McLarenMS00:17:57
    9127Daniel HaleMS00:18:18
    1088Jonny LoganMS00:18:38
    1132Iain WallaceM4000:18:42
    1289Claire HoustonFS00:18:45
    13133James BowdenMS00:18:48
    143Scott LoveMS00:18:53
    15114Bryan InnesMS00:18:54
    1625Alan CameronM4000:18:54
    1750Elaine OmandFS00:18:56
    18123Willie RennieM4000:18:57
    1959Hendrik Van RensburgM4000:18:57
    2034Christopher McKiddieMS00:18:59
    21129Maya StoneFS00:19:04
    2263Kevin GreigM4000:19:07
    23130Colin McwilliamMS00:19:18
    24117Kristin LownieFS00:19:23
    2574Jonathan MillarMS00:19:23
    2629Jennifer CruickshanksFS00:19:30
    2743Mike MurdochM4000:19:31
    2823Brian LeesM5000:19:42
    2997Lee O'ConnorM4000:19:44
    3096Simon KnoxM5000:19:45
    3131Duncan EdwardMS00:19:49
    3226Derek GrantM4000:19:54
    3352Louise AndrewFS00:19:59
    34132John McintyreMS00:20:02
    35145Susan RidleyF5000:20:03
    3667Joanne McevoyFS00:20:05
    3791Matthew LowMS00:20:08
    385Jennifer MassieFS00:20:16
    3916Arnaud RichardMS00:20:18
    4081Simon FoxM5000:20:20
    4180Isobel BurnettF6000:20:22
    421Dave MortonMS00:20:30
    4358Rhona Van RensburgF4000:20:33
    446Michael BissetM4000:20:37
    4582Jan-Bert van Den BergM5000:20:46
    4690Jim MortonM5000:20:50
    4757Paul ReedM4000:20:50
    48148Gary BarkerM6000:20:59
    4949Tom ScottM6000:21:02
    50110Tam Nicol'SM5000:21:03
    51101David DunleaveyM5000:21:12
    5219CJ MacphailFS00:21:12
    5383Andrew StavertM5000:21:19
    54126David NorrieM6000:21:22
    5592Jason GrantMS00:21:26
    56113Christina GrantFS00:21:30
    5710Alison McNeillyF4000:21:33
    5846Fiona CruickshanksFS00:21:35
    5977Brian R SmithM5000:21:37
    60144Gary HoweM4000:21:41
    6156Gary OvenstoneM4000:21:44
    6293Fiona CallaghanFS00:21:48
    63131Catherine LeonardF5000:21:50
    64107David HendersonM5000:21:58
    65105Robyn MorroccoFS00:22:05
    66115Kieran MorganM5000:22:07
    6741Susanne LumsdenF4000:22:08
    6828Gillian SmithF4000:22:09
    6945Pamela CruickshanksF5000:22:15
    7062Merce TorresF4000:22:31
    7117Jazmin HayFS00:22:34
    7221Innes BracegirdleF6000:22:35
    73109Gordon SomervilleM6000:22:42
    74116Phil SmithardM6000:22:46
    7570John HendersonM4000:22:50
    76147Fiona PlainFS00:22:55
    7736Maneesh KuruvillaMS00:23:06
    7842Morna FlemingF6000:23:17
    799Ewan CameronM5000:23:50
    8087William ArnotM5000:24:01
    8148Alice HallF5000:24:02
    82128Innes PetrieM5000:24:06
    8340Jocelyn ScottF6000:24:09
    84134Sharon BrownFS00:24:13
    85121Bill GillanM6000:24:18
    8675Nick BrianM6000:24:21
    8765George StewartM5000:24:28
    8871Bob WylieMS00:24:30
    8954Bill DuffM6000:24:39
    9098Robert ThorntonM6000:25:06
    9172Wendy WylieFS00:25:07
    9211Paul McglynnM5000:25:12
    9327Peter Rieu-ClarkeM7000:25:16
    9455Steve CromarM7000:25:17
    9547David NuttallM4000:25:24
    9669Zuleika BrettFS00:25:25
    974Rosemary LeeF5000:25:52
    98103Brian StewartMS00:26:25
    99104Malcolm MactavishM6000:26:36
    10013Josh McKayMS00:26:53
    101141Pauline SmithFS00:26:53
    10266Derek AdamsonM4000:26:55
    10337Ruth LethamFS00:27:13
    104143Gary ScottM4000:27:48
    10560Ross JohnstonM5000:28:01
    10695Jacqueline CookF4000:28:01
    10738Big George HayM5000:28:10
    108142Hannah AllumFS00:28:31
    10912John LeeM5000:29:41
    11061Angela JohnstonF5000:29:46
    111112Steph BarlowF5000:29:49
    11233Debz Way HayF5000:30:18
    113120Kara ChristineF4000:30:45
    1142Stuart GilbertMS00:34:02
    11539Karen SpenceF4000:38:47
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race5.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race5.html new file mode 100644 index 00000000..ffae751d --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/race5.html @@ -0,0 +1,792 @@ + +

    Overall

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosNoRunnerCategoryTotal
    120Ben HukinsMS00:26:37
    285Christopher O'BrienMS00:28:09
    378Robbie DunlopMS00:28:11
    486Bryan McLarenMS00:29:31
    5139Andrew LeechMS00:29:38
    6151Oliver LeverMS00:29:43
    730Akira O'ConnorMS00:30:24
    8133James BowdenMS00:30:27
    988Jonny LoganMS00:30:33
    1032Iain WallaceM4000:30:53
    11111Kenny GormanMS00:30:56
    12127Daniel HaleMS00:30:58
    133Scott LoveMS00:31:09
    14129Maya StoneFS00:31:16
    1563Kevin GreigM4000:31:19
    1625Alan CameronM4000:31:27
    17123Willie RennieM4000:31:36
    1889Claire HoustonFS00:31:39
    1959Hendrik Van RensburgM4000:31:42
    2034Christopher McKiddieMS00:32:06
    21130Colin McwilliamMS00:32:09
    2274Jonathan MillarMS00:32:16
    23117Kristin LownieFS00:32:18
    2496Simon KnoxM5000:32:42
    2543Mike MurdochM4000:32:45
    2623Brian LeesM5000:32:53
    2750Elaine OmandFS00:32:57
    2897Lee O'ConnorM4000:33:03
    29145Susan RidleyF5000:33:33
    3031Duncan EdwardMS00:33:40
    3116Arnaud RichardMS00:33:43
    3252Louise AndrewFS00:33:49
    3358Rhona Van RensburgF4000:33:53
    3481Simon FoxM5000:33:56
    3567Joanne McevoyFS00:34:00
    3690Jim MortonM5000:34:02
    3783Andrew StavertM5000:34:05
    3826Derek GrantM4000:34:08
    39132John McintyreMS00:34:27
    4057Paul ReedM4000:34:34
    4129Jennifer CruickshanksFS00:34:41
    42148Gary BarkerM6000:35:03
    435Jennifer MassieFS00:35:07
    4491Matthew LowMS00:35:10
    4582Jan-Bert van Den BergM5000:35:16
    4693Fiona CallaghanFS00:35:23
    4749Tom ScottM6000:35:27
    4810Alison McNeillyF4000:35:30
    496Michael BissetM4000:35:34
    50126David NorrieM6000:35:47
    5180Isobel BurnettF6000:35:54
    5215Neill PorterfieldM4000:36:07
    5341Susanne LumsdenF4000:36:14
    54101David DunleaveyM5000:36:30
    55131Catherine LeonardF5000:36:35
    5628Gillian SmithF4000:36:44
    571Dave MortonMS00:36:46
    58110Tam Nicol'SM5000:36:51
    5977Brian R SmithM5000:37:18
    6021Innes BracegirdleF6000:37:29
    6156Gary OvenstoneM4000:37:36
    62113Christina GrantFS00:37:40
    6362Merce TorresF4000:37:52
    64107David HendersonM5000:38:13
    65147Fiona PlainFS00:38:22
    6692Jason GrantMS00:38:27
    6717Jazmin HayFS00:38:31
    68109Gordon SomervilleM6000:38:39
    6946Fiona CruickshanksFS00:38:43
    70115Kieran MorganM5000:38:57
    71105Robyn MorroccoFS00:39:08
    7245Pamela CruickshanksF5000:39:23
    739Ewan CameronM5000:39:26
    7440Jocelyn ScottF6000:39:29
    7542Morna FlemingF6000:40:02
    7694Peter ConnollyM5000:40:04
    77116Phil SmithardM6000:40:15
    7870John HendersonM4000:40:22
    79134Sharon BrownFS00:40:29
    8036Maneesh KuruvillaMS00:40:51
    8148Alice HallF5000:41:16
    8265George StewartM5000:41:43
    8347David NuttallM4000:41:53
    84121Bill GillanM6000:42:22
    85128Innes PetrieM5000:42:37
    8669Zuleika BrettFS00:42:41
    8798Robert ThorntonM6000:42:48
    8871Bob WylieMS00:42:53
    894Rosemary LeeF5000:43:01
    9011Paul McglynnM5000:43:13
    9155Steve CromarM7000:43:28
    92141Pauline SmithFS00:43:32
    9372Wendy WylieFS00:43:43
    94103Brian StewartMS00:44:13
    95104Malcolm MactavishM6000:45:13
    9660Ross JohnstonM5000:45:42
    9737Ruth LethamFS00:46:24
    9813Josh McKayMS00:46:55
    9966Derek AdamsonM4000:47:22
    10095Jacqueline CookF4000:49:15
    10112John LeeM5000:49:29
    10261Angela JohnstonF5000:49:32
    103112Steph BarlowF5000:49:41
    10438Big George HayM5000:50:25
    105142Hannah AllumFS00:50:28
    106143Gary ScottM4000:50:31
    10733Debz Way HayF5000:51:16
    108120Kara ChristineF4000:51:22
    109119Cyndi SveeF5000:55:50
    11039Karen SpenceF4001:03:09
    11127Peter Rieu-ClarkeM7001:03:12
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.csv new file mode 100644 index 00000000..37bb6f18 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.csv @@ -0,0 +1,126 @@ +Pos,Runner,Club,Category,Race 1,Race 2,Race 3,Race 4,Race 5,Total +1,Ben Hukins,Cambuslang H,MS,00:24:03,00:27:38,00:04:35,00:16:09,00:26:37,01:39:02 +2,Christopher O'Brien,Corstorphine AAC,MS,00:24:38,00:30:39,00:04:43,00:17:07,00:28:09,01:45:16 +3,Robbie Dunlop,Dundee Rr AC,MS,00:24:43,00:30:41,00:04:47,00:17:19,00:28:11,01:45:41 +4,Andrew Leech,Dundee Hawkhill Harriers,MS,00:24:49,00:32:53,00:05:02,00:17:43,00:29:38,01:50:05 +5,Akira O'Connor,Fife AC,MS,00:24:45,00:32:26,00:04:54,00:17:40,00:30:24,01:50:09 +6,Oliver Lever,Lomond Hill Runners,MS,00:25:08,00:32:43,00:05:01,00:17:50,00:29:43,01:50:25 +7,Bryan McLaren,Leven Las Vagas,MS,00:24:55,00:33:33,00:04:58,00:17:57,00:29:31,01:50:54 +8,Daniel Hale,University of St. Andrews Ccc,MS,00:25:03,00:32:47,00:05:06,00:18:18,00:30:58,01:52:12 +9,James Bowden,Hunters Bog T,MS,00:26:05,00:33:21,00:05:11,00:18:48,00:30:27,01:53:52 +10,Jonny Logan,Fife AC,MS,00:25:23,00:34:51,00:05:18,00:18:38,00:30:33,01:54:43 +11,Iain Wallace,Leven Las Vegas RC,M40,00:26:01,00:34:41,00:05:36,00:18:42,00:30:53,01:55:53 +12,Kevin Greig,Dundee Rr AC,M40,00:26:31,00:34:03,00:05:33,00:19:07,00:31:19,01:56:33 +13,Kenny Gorman,Fife AC,MS,00:25:30,00:37:18,00:05:02,00:17:55,00:30:56,01:56:41 +14,Hendrik Van Rensburg,U/n,M40,00:26:16,00:34:28,00:05:29,00:18:57,00:31:42,01:56:52 +15,Maya Stone,Fife AC,FS,00:27:23,00:33:45,00:05:25,00:19:04,00:31:16,01:56:53 +16,Scott Love,PH Racing,MS,00:26:14,00:35:30,00:05:17,00:18:53,00:31:09,01:57:03 +17,Alan Cameron,Corstorphine AAC,M40,00:26:27,00:35:13,00:05:24,00:18:54,00:31:27,01:57:25 +18,Claire Houston,Central AC,FS,00:26:48,00:35:03,00:05:23,00:18:45,00:31:39,01:57:38 +19,Willie Rennie,Carnegie Harriers,M40,00:26:36,00:35:05,00:05:25,00:18:57,00:31:36,01:57:39 +20,Christopher McKiddie,Westerlands Ccc,MS,00:26:44,00:34:25,00:05:30,00:18:59,00:32:06,01:57:44 +21,Kristin Lownie,Carnegie Harriers,FS,00:26:58,00:35:25,00:05:30,00:19:23,00:32:18,01:59:34 +22,Jonathan Millar,Carnegie Harriers,MS,00:26:58,00:35:31,00:05:36,00:19:23,00:32:16,01:59:44 +23,Brian Lees,Lothian RC,M50,00:25:55,00:36:29,00:05:34,00:19:42,00:32:53,02:00:33 +24,Elaine Omand,Dundee Rr AC,FS,00:27:05,00:36:11,00:05:35,00:18:56,00:32:57,02:00:44 +25,Colin Mcwilliam,Fife AC,MS,00:26:46,00:37:20,00:05:36,00:19:18,00:32:09,02:01:09 +26,Matthew Low,Dundee Rr AC,MS,00:28:02,00:32:51,00:05:14,00:20:08,00:35:10,02:01:25 +27,Lee O'Connor,Dundee Rr AC,M40,00:26:59,00:36:23,00:05:34,00:19:44,00:33:03,02:01:43 +28,Simon Knox,Dundee Rr AC,M50,00:27:27,00:36:44,00:05:51,00:19:45,00:32:42,02:02:29 +29,Jennifer Cruickshanks,Fife AC,FS,00:27:14,00:36:07,00:05:28,00:19:30,00:34:41,02:03:00 +30,Mike Murdoch,Falkland Trail Runners,M40,00:27:16,00:38:31,00:05:18,00:19:31,00:32:45,02:03:21 +31,Arnaud Richard,Dundee Rr AC,MS,00:27:37,00:36:17,00:05:50,00:20:18,00:33:43,02:03:45 +32,Susan Ridley,Edinburgh AC,F50,00:28:04,00:36:21,00:06:05,00:20:03,00:33:33,02:04:06 +33,Louise Andrew,Dundee and Angus Cani-Cross,FS,00:27:03,00:38:23,00:05:53,00:19:59,00:33:49,02:05:07 +34,Joanne Mcevoy,Calderglen H,FS,00:27:08,00:38:02,00:05:54,00:20:05,00:34:00,02:05:09 +35,Duncan Edward,Dundee Rr AC,MS,00:27:10,00:38:54,00:05:43,00:19:49,00:33:40,02:05:16 +36,Jim Morton,Dundee Rr AC,M50,00:28:15,00:36:50,00:06:02,00:20:50,00:34:02,02:05:59 +37,Derek Grant,Dundee and Angus Cani-Cross,M40,00:27:12,00:39:15,00:05:38,00:19:54,00:34:08,02:06:07 +38,Simon Fox,Fife AC,M50,00:28:13,00:37:59,00:05:52,00:20:20,00:33:56,02:06:20 +39,John Mcintyre,Fife AC,MS,00:28:43,00:38:29,00:05:38,00:20:02,00:34:27,02:07:19 +40,Gary Barker,Fife AC,M60,00:28:22,00:37:30,00:06:00,00:20:59,00:35:03,02:07:54 +41,Andrew Stavert,Portobello RC,M50,00:28:59,00:37:43,00:06:14,00:21:19,00:34:05,02:08:20 +42,Rhona Van Rensburg,Fife AC,F40,00:27:31,00:40:33,00:05:57,00:20:33,00:33:53,02:08:27 +43,Isobel Burnett,Carnegie Harriers,F60,00:27:29,00:39:34,00:06:03,00:20:22,00:35:54,02:09:22 +44,Paul Reed,Dundee Rr AC,M40,00:29:11,00:39:02,00:06:00,00:20:50,00:34:34,02:09:37 +45,Jan-Bert van Den Berg,Corstorphine AAC,M50,00:28:18,00:39:18,00:06:01,00:20:46,00:35:16,02:09:39 +46,Dave Morton,Morton Running Company,MS,00:27:54,00:38:59,00:05:42,00:20:30,00:36:46,02:09:51 +47,Tom Scott,Fife AC,M60,00:28:30,00:39:26,00:06:03,00:21:02,00:35:27,02:10:28 +48,Jennifer Massie,Dundee Rr AC,FS,00:28:06,00:41:26,00:05:51,00:20:16,00:35:07,02:10:46 +49,David Dunleavey,Dundee Rr AC,M50,00:28:55,00:39:56,00:06:01,00:21:12,00:36:30,02:12:34 +50,Fiona Callaghan,Dundee Rr AC,FS,00:29:51,00:39:57,00:05:59,00:21:48,00:35:23,02:12:58 +51,David Norrie,Fife AC,M60,00:29:48,00:40:40,00:06:06,00:21:22,00:35:47,02:13:43 +52,Brian R Smith,Fife AC,M50,00:29:30,00:39:48,00:06:07,00:21:37,00:37:18,02:14:20 +53,Gary Ovenstone,STAART,M40,00:29:19,00:40:19,00:06:06,00:21:44,00:37:36,02:15:04 +54,Gillian Smith,Fife AC,F40,00:30:18,00:40:24,00:06:12,00:22:09,00:36:44,02:15:47 +55,Alison McNeilly,Dundee Rr AC,F40,00:29:25,00:42:54,00:06:29,00:21:33,00:35:30,02:15:51 +56,Tam Nicol'S,Stilton Striders,M50,00:29:16,00:43:00,00:05:59,00:21:03,00:36:51,02:16:09 +57,Susanne Lumsden,Falkland Trail Runners,F40,00:30:15,00:41:03,00:06:31,00:22:08,00:36:14,02:16:11 +58,Michael Bisset,Carnegie Harriers,M40,00:29:43,00:44:38,00:05:44,00:20:37,00:35:34,02:16:16 +59,Merce Torres,Fife AC,F40,00:30:12,00:41:34,00:06:35,00:22:31,00:37:52,02:18:44 +60,Fiona Cruickshanks,Anster Haddies,FS,00:30:53,00:41:37,00:06:07,00:21:35,00:38:43,02:18:55 +61,Innes Bracegirdle,Fife AC,F60,00:30:01,00:42:10,00:06:53,00:22:35,00:37:29,02:19:08 +62,Catherine Leonard,Fife AC,F50,00:30:17,00:45:02,00:06:40,00:21:50,00:36:35,02:20:24 +63,David Henderson,Corstorphine AAC,M50,00:30:00,00:44:19,00:06:20,00:21:58,00:38:13,02:20:50 +64,Jason Grant,Dundee and Angus Cani-Cross,MS,00:31:24,00:44:14,00:05:58,00:21:26,00:38:27,02:21:29 +65,Jazmin Hay,Anster Haddies,FS,00:31:04,00:43:31,00:06:34,00:22:34,00:38:31,02:22:14 +66,Kieran Morgan,Carnegie Harriers,M50,00:31:44,00:44:07,00:06:26,00:22:07,00:38:57,02:23:21 +67,Pamela Cruickshanks,Anster Haddies,F50,00:32:07,00:43:08,00:06:37,00:22:15,00:39:23,02:23:30 +68,Gordon Somerville,Carnegie Harriers,M60,00:30:36,00:45:29,00:06:27,00:22:42,00:38:39,02:23:53 +69,Christina Grant,Dundee and Angus Cani-Cross,FS,00:29:38,00:50:09,00:05:54,00:21:30,00:37:40,02:24:51 +70,Ewan Cameron,Anster Haddies,M50,00:32:15,00:42:47,00:06:51,00:23:50,00:39:26,02:25:09 +71,Robyn Morrocco,Carnegie Harriers,FS,00:30:38,00:47:21,00:06:18,00:22:05,00:39:08,02:25:30 +72,Phil Smithard,Carnegie Harriers,M60,00:30:41,00:45:49,00:06:36,00:22:46,00:40:15,02:26:07 +73,Fiona Plain,Dundee Rr AC,FS,00:31:55,00:47:52,00:06:26,00:22:55,00:38:22,02:27:30 +74,John Henderson,Fife AC,M40,00:32:21,00:46:56,00:06:25,00:22:50,00:40:22,02:28:54 +75,Jocelyn Scott,Fife AC,F60,00:33:45,00:43:56,00:07:39,00:24:09,00:39:29,02:28:58 +76,Maneesh Kuruvilla,U/n,MS,00:32:48,00:46:18,00:06:28,00:23:06,00:40:51,02:29:31 +77,Alice Hall,Anster Haddies,F50,00:32:45,00:45:13,00:07:06,00:24:02,00:41:16,02:30:22 +78,Morna Fleming,Pitreavie AAC,F60,00:32:52,00:47:36,00:06:44,00:23:17,00:40:02,02:30:31 +79,Sharon Brown,Anster Haddies,FS,00:34:31,00:44:41,00:06:49,00:24:13,00:40:29,02:30:43 +80,George Stewart,Calderglen H,M50,00:32:38,00:46:08,00:06:22,00:24:28,00:41:43,02:31:19 +81,Innes Petrie,Fife AC,M50,00:32:23,00:46:00,00:06:47,00:24:06,00:42:37,02:31:53 +82,David Nuttall,Anster Haddies,M40,00:35:12,00:46:32,00:07:15,00:25:24,00:41:53,02:36:16 +83,Bill Gillan,Falkland Trail Runners,M60,00:33:22,00:49:23,00:07:10,00:24:18,00:42:22,02:36:35 +84,Bob Wylie,Leven Las Vegas RC,MS,00:34:10,00:48:27,00:06:50,00:24:30,00:42:53,02:36:50 +85,Zuleika Brett,Carnegie Harriers,FS,00:34:19,00:47:32,00:07:18,00:25:25,00:42:41,02:37:15 +86,Paul Mcglynn,Fife AC,M50,00:33:19,00:50:43,00:07:15,00:25:12,00:43:13,02:39:42 +87,Steve Cromar,Dundee Hawkhill Harriers,M70,00:34:18,00:48:59,00:07:50,00:25:17,00:43:28,02:39:52 +88,Brian Stewart,Dundee Rr AC,MS,00:34:59,00:47:25,00:06:56,00:26:25,00:44:13,02:39:58 +89,Rosemary Lee,Fife AC,F50,00:35:06,00:48:37,00:07:30,00:25:52,00:43:01,02:40:06 +90,Robert Thornton,Fife AC,M60,00:34:29,00:53:21,00:07:03,00:25:06,00:42:48,02:42:47 +91,Pauline Smith,Dundee Rr AC,FS,00:35:33,00:52:15,00:07:14,00:26:53,00:43:32,02:45:27 +92,Malcolm Mactavish,Falkland Trail Runners,M60,00:35:48,00:51:18,00:07:24,00:26:36,00:45:13,02:46:19 +93,Wendy Wylie,Leven Las Vegas RC,FS,00:34:33,00:57:24,00:07:15,00:25:07,00:43:43,02:48:02 +94,Ross Johnston,Leven Las Vegas RC,M50,00:35:04,00:54:44,00:07:31,00:28:01,00:45:42,02:51:02 +95,Derek Adamson,Fife AC,M40,00:35:08,00:55:58,00:07:34,00:26:55,00:47:22,02:52:57 +96,Ruth Letham,Fife AC,FS,00:37:22,00:57:30,00:07:41,00:27:13,00:46:24,02:56:10 +97,Josh McKay,Dundee Rr AC,MS,00:37:52,00:57:57,00:06:46,00:26:53,00:46:55,02:56:23 +98,Big George Hay,Anster Haddies,M50,00:37:44,00:55:33,00:07:57,00:28:10,00:50:25,02:59:49 +99,Jacqueline Cook,Falkland Trail Runners,F40,00:37:30,00:58:41,00:07:54,00:28:01,00:49:15,03:01:21 +100,John Lee,Falkland Trail Runners,M50,00:40:15,00:54:39,00:08:39,00:29:41,00:49:29,03:02:43 +101,Steph Barlow,Stilton Striders,F50,00:38:39,00:58:51,00:07:58,00:29:49,00:49:41,03:04:58 +102,Debz Way Hay,Anster Haddies,F50,00:40:26,00:54:37,00:08:26,00:30:18,00:51:16,03:05:03 +103,Gary Scott,Anster Allsorts,M40,00:38:44,01:04:12,00:06:29,00:27:48,00:50:31,03:07:44 +104,Kara Christine,Run Mummy Run,F40,00:39:08,00:59:09,00:08:16,00:30:45,00:51:22,03:08:40 +105,Hannah Allum,Anster Allsorts,FS,00:38:46,01:04:14,00:07:53,00:28:31,00:50:28,03:09:52 +106,Angela Johnston,Leven Las Vegas RC,F50,00:41:12,01:00:56,00:08:46,00:29:46,00:49:32,03:10:12 +107,Peter Rieu-Clarke,Leven Las Vegas RC,M70,00:38:22,00:56:09,00:07:35,00:25:16,01:03:12,03:10:34 +108,Karen Spence,Falkland Trail Runners,F40,00:53:17,01:16:43,00:10:59,00:38:47,01:03:09,04:02:55 +-,Heather Anderson,Fife AC,FS,-,00:35:23,-,-,-,- +-,William Arnot,Anster Haddies,M50,-,00:45:33,-,00:24:01,-,- +-,Jane Askey,Fife AC,F70,00:50:44,-,-,-,-,- +-,Nick Brian,Fife AC,M60,00:33:15,00:49:08,00:06:58,00:24:21,-,- +-,Joanne Clancy,Dundee Rr AC,FS,00:30:34,00:46:47,-,-,-,- +-,Peter Connolly,Dundee Rr AC,M50,00:30:46,00:47:19,-,-,00:40:04,- +-,Keith Copland,Corstorphine AAC,M40,00:31:07,00:42:28,-,-,-,- +-,Stewart Dillon,Fife AC,M50,00:28:46,00:38:16,00:06:01,-,-,- +-,Bill Duff,Falkland Trail Runners,M60,00:33:55,00:44:11,00:07:22,00:24:39,-,- +-,Claire Duncan,Beacon Runners,F40,00:33:58,00:54:34,00:07:33,-,-,- +-,Stuart Fraser,Perth Road Runners,MS,00:26:58,-,-,-,-,- +-,Stuart Gilbert,Morton Running Company,MS,-,-,-,00:34:02,-,- +-,Gary Howe,Fife AC,M40,00:29:54,00:40:23,00:06:14,00:21:41,-,- +-,Bryan Innes,Falkland Trail Runners,MS,00:26:21,00:35:17,00:05:21,00:18:54,-,- +-,CJ Macphail,Anster Haddies,FS,00:29:34,00:38:20,00:05:55,00:21:12,-,- +-,Neill Porterfield,Corstorphine AAC,M40,00:29:32,00:41:23,00:05:56,-,00:36:07,- +-,Cyndi Svee,U/n,F50,-,-,00:08:40,-,00:55:50,- diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.html new file mode 100644 index 00000000..164808be --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_overall_2017.html @@ -0,0 +1,1518 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PosRunnerCatClubRace 1Race 2Race 3Race 4Race 5Total
    1Ben HukinsMSCambuslang H00:24:0300:27:3800:04:3500:16:0900:26:3701:39:02
    2Christopher O'BrienMSCorstorphine AAC00:24:3800:30:3900:04:4300:17:0700:28:0901:45:16
    3Robbie DunlopMSDundee Rr AC00:24:4300:30:4100:04:4700:17:1900:28:1101:45:41
    4Andrew LeechMSDundee Hawkhill Harriers00:24:4900:32:5300:05:0200:17:4300:29:3801:50:05
    5Akira O'ConnorMSFife AC00:24:4500:32:2600:04:5400:17:4000:30:2401:50:09
    6Oliver LeverMSLomond Hill Runners00:25:0800:32:4300:05:0100:17:5000:29:4301:50:25
    7Bryan McLarenMSLeven Las Vagas00:24:5500:33:3300:04:5800:17:5700:29:3101:50:54
    8Daniel HaleMSUniversity of St. Andrews Ccc00:25:0300:32:4700:05:0600:18:1800:30:5801:52:12
    9James BowdenMSHunters Bog T00:26:0500:33:2100:05:1100:18:4800:30:2701:53:52
    10Jonny LoganMSFife AC00:25:2300:34:5100:05:1800:18:3800:30:3301:54:43
    11Iain WallaceM40Leven Las Vegas RC00:26:0100:34:4100:05:3600:18:4200:30:5301:55:53
    12Kevin GreigM40Dundee Rr AC00:26:3100:34:0300:05:3300:19:0700:31:1901:56:33
    13Kenny GormanMSFife AC00:25:3000:37:1800:05:0200:17:5500:30:5601:56:41
    14Hendrik Van RensburgM40U/n00:26:1600:34:2800:05:2900:18:5700:31:4201:56:52
    15Maya StoneFSFife AC00:27:2300:33:4500:05:2500:19:0400:31:1601:56:53
    16Scott LoveMSPH Racing00:26:1400:35:3000:05:1700:18:5300:31:0901:57:03
    17Alan CameronM40Corstorphine AAC00:26:2700:35:1300:05:2400:18:5400:31:2701:57:25
    18Claire HoustonFSCentral AC00:26:4800:35:0300:05:2300:18:4500:31:3901:57:38
    19Willie RennieM40Carnegie Harriers00:26:3600:35:0500:05:2500:18:5700:31:3601:57:39
    20Christopher McKiddieMSWesterlands Ccc00:26:4400:34:2500:05:3000:18:5900:32:0601:57:44
    21Kristin LownieFSCarnegie Harriers00:26:5800:35:2500:05:3000:19:2300:32:1801:59:34
    22Jonathan MillarMSCarnegie Harriers00:26:5800:35:3100:05:3600:19:2300:32:1601:59:44
    23Brian LeesM50Lothian RC00:25:5500:36:2900:05:3400:19:4200:32:5302:00:33
    24Elaine OmandFSDundee Rr AC00:27:0500:36:1100:05:3500:18:5600:32:5702:00:44
    25Colin McwilliamMSFife AC00:26:4600:37:2000:05:3600:19:1800:32:0902:01:09
    26Matthew LowMSDundee Rr AC00:28:0200:32:5100:05:1400:20:0800:35:1002:01:25
    27Lee O'ConnorM40Dundee Rr AC00:26:5900:36:2300:05:3400:19:4400:33:0302:01:43
    28Simon KnoxM50Dundee Rr AC00:27:2700:36:4400:05:5100:19:4500:32:4202:02:29
    29Jennifer CruickshanksFSFife AC00:27:1400:36:0700:05:2800:19:3000:34:4102:03:00
    30Mike MurdochM40Falkland Trail Runners00:27:1600:38:3100:05:1800:19:3100:32:4502:03:21
    31Arnaud RichardMSDundee Rr AC00:27:3700:36:1700:05:5000:20:1800:33:4302:03:45
    32Susan RidleyF50Edinburgh AC00:28:0400:36:2100:06:0500:20:0300:33:3302:04:06
    33Louise AndrewFSDundee and Angus Cani-Cross00:27:0300:38:2300:05:5300:19:5900:33:4902:05:07
    34Joanne McevoyFSCalderglen H00:27:0800:38:0200:05:5400:20:0500:34:0002:05:09
    35Duncan EdwardMSDundee Rr AC00:27:1000:38:5400:05:4300:19:4900:33:4002:05:16
    36Jim MortonM50Dundee Rr AC00:28:1500:36:5000:06:0200:20:5000:34:0202:05:59
    37Derek GrantM40Dundee and Angus Cani-Cross00:27:1200:39:1500:05:3800:19:5400:34:0802:06:07
    38Simon FoxM50Fife AC00:28:1300:37:5900:05:5200:20:2000:33:5602:06:20
    39John McintyreMSFife AC00:28:4300:38:2900:05:3800:20:0200:34:2702:07:19
    40Gary BarkerM60Fife AC00:28:2200:37:3000:06:0000:20:5900:35:0302:07:54
    41Andrew StavertM50Portobello RC00:28:5900:37:4300:06:1400:21:1900:34:0502:08:20
    42Rhona Van RensburgF40Fife AC00:27:3100:40:3300:05:5700:20:3300:33:5302:08:27
    43Isobel BurnettF60Carnegie Harriers00:27:2900:39:3400:06:0300:20:2200:35:5402:09:22
    44Paul ReedM40Dundee Rr AC00:29:1100:39:0200:06:0000:20:5000:34:3402:09:37
    45Jan-Bert van Den BergM50Corstorphine AAC00:28:1800:39:1800:06:0100:20:4600:35:1602:09:39
    46Dave MortonMSMorton Running Company00:27:5400:38:5900:05:4200:20:3000:36:4602:09:51
    47Tom ScottM60Fife AC00:28:3000:39:2600:06:0300:21:0200:35:2702:10:28
    48Jennifer MassieFSDundee Rr AC00:28:0600:41:2600:05:5100:20:1600:35:0702:10:46
    49David DunleaveyM50Dundee Rr AC00:28:5500:39:5600:06:0100:21:1200:36:3002:12:34
    50Fiona CallaghanFSDundee Rr AC00:29:5100:39:5700:05:5900:21:4800:35:2302:12:58
    51David NorrieM60Fife AC00:29:4800:40:4000:06:0600:21:2200:35:4702:13:43
    52Brian R SmithM50Fife AC00:29:3000:39:4800:06:0700:21:3700:37:1802:14:20
    53Gary OvenstoneM40STAART00:29:1900:40:1900:06:0600:21:4400:37:3602:15:04
    54Gillian SmithF40Fife AC00:30:1800:40:2400:06:1200:22:0900:36:4402:15:47
    55Alison McNeillyF40Dundee Rr AC00:29:2500:42:5400:06:2900:21:3300:35:3002:15:51
    56Tam Nicol'SM50Stilton Striders00:29:1600:43:0000:05:5900:21:0300:36:5102:16:09
    57Susanne LumsdenF40Falkland Trail Runners00:30:1500:41:0300:06:3100:22:0800:36:1402:16:11
    58Michael BissetM40Carnegie Harriers00:29:4300:44:3800:05:4400:20:3700:35:3402:16:16
    59Merce TorresF40Fife AC00:30:1200:41:3400:06:3500:22:3100:37:5202:18:44
    60Fiona CruickshanksFSAnster Haddies00:30:5300:41:3700:06:0700:21:3500:38:4302:18:55
    61Innes BracegirdleF60Fife AC00:30:0100:42:1000:06:5300:22:3500:37:2902:19:08
    62Catherine LeonardF50Fife AC00:30:1700:45:0200:06:4000:21:5000:36:3502:20:24
    63David HendersonM50Corstorphine AAC00:30:0000:44:1900:06:2000:21:5800:38:1302:20:50
    64Jason GrantMSDundee and Angus Cani-Cross00:31:2400:44:1400:05:5800:21:2600:38:2702:21:29
    65Jazmin HayFSAnster Haddies00:31:0400:43:3100:06:3400:22:3400:38:3102:22:14
    66Kieran MorganM50Carnegie Harriers00:31:4400:44:0700:06:2600:22:0700:38:5702:23:21
    67Pamela CruickshanksF50Anster Haddies00:32:0700:43:0800:06:3700:22:1500:39:2302:23:30
    68Gordon SomervilleM60Carnegie Harriers00:30:3600:45:2900:06:2700:22:4200:38:3902:23:53
    69Christina GrantFSDundee and Angus Cani-Cross00:29:3800:50:0900:05:5400:21:3000:37:4002:24:51
    70Ewan CameronM50Anster Haddies00:32:1500:42:4700:06:5100:23:5000:39:2602:25:09
    71Robyn MorroccoFSCarnegie Harriers00:30:3800:47:2100:06:1800:22:0500:39:0802:25:30
    72Phil SmithardM60Carnegie Harriers00:30:4100:45:4900:06:3600:22:4600:40:1502:26:07
    73Fiona PlainFSDundee Rr AC00:31:5500:47:5200:06:2600:22:5500:38:2202:27:30
    74John HendersonM40Fife AC00:32:2100:46:5600:06:2500:22:5000:40:2202:28:54
    75Jocelyn ScottF60Fife AC00:33:4500:43:5600:07:3900:24:0900:39:2902:28:58
    76Maneesh KuruvillaMSU/n00:32:4800:46:1800:06:2800:23:0600:40:5102:29:31
    77Alice HallF50Anster Haddies00:32:4500:45:1300:07:0600:24:0200:41:1602:30:22
    78Morna FlemingF60Pitreavie AAC00:32:5200:47:3600:06:4400:23:1700:40:0202:30:31
    79Sharon BrownFSAnster Haddies00:34:3100:44:4100:06:4900:24:1300:40:2902:30:43
    80George StewartM50Calderglen H00:32:3800:46:0800:06:2200:24:2800:41:4302:31:19
    81Innes PetrieM50Fife AC00:32:2300:46:0000:06:4700:24:0600:42:3702:31:53
    82David NuttallM40Anster Haddies00:35:1200:46:3200:07:1500:25:2400:41:5302:36:16
    83Bill GillanM60Falkland Trail Runners00:33:2200:49:2300:07:1000:24:1800:42:2202:36:35
    84Bob WylieMSLeven Las Vegas RC00:34:1000:48:2700:06:5000:24:3000:42:5302:36:50
    85Zuleika BrettFSCarnegie Harriers00:34:1900:47:3200:07:1800:25:2500:42:4102:37:15
    86Paul McglynnM50Fife AC00:33:1900:50:4300:07:1500:25:1200:43:1302:39:42
    87Steve CromarM70Dundee Hawkhill Harriers00:34:1800:48:5900:07:5000:25:1700:43:2802:39:52
    88Brian StewartMSDundee Rr AC00:34:5900:47:2500:06:5600:26:2500:44:1302:39:58
    89Rosemary LeeF50Fife AC00:35:0600:48:3700:07:3000:25:5200:43:0102:40:06
    90Robert ThorntonM60Fife AC00:34:2900:53:2100:07:0300:25:0600:42:4802:42:47
    91Pauline SmithFSDundee Rr AC00:35:3300:52:1500:07:1400:26:5300:43:3202:45:27
    92Malcolm MactavishM60Falkland Trail Runners00:35:4800:51:1800:07:2400:26:3600:45:1302:46:19
    93Wendy WylieFSLeven Las Vegas RC00:34:3300:57:2400:07:1500:25:0700:43:4302:48:02
    94Ross JohnstonM50Leven Las Vegas RC00:35:0400:54:4400:07:3100:28:0100:45:4202:51:02
    95Derek AdamsonM40Fife AC00:35:0800:55:5800:07:3400:26:5500:47:2202:52:57
    96Ruth LethamFSFife AC00:37:2200:57:3000:07:4100:27:1300:46:2402:56:10
    97Josh McKayMSDundee Rr AC00:37:5200:57:5700:06:4600:26:5300:46:5502:56:23
    98Big George HayM50Anster Haddies00:37:4400:55:3300:07:5700:28:1000:50:2502:59:49
    99Jacqueline CookF40Falkland Trail Runners00:37:3000:58:4100:07:5400:28:0100:49:1503:01:21
    100John LeeM50Falkland Trail Runners00:40:1500:54:3900:08:3900:29:4100:49:2903:02:43
    101Steph BarlowF50Stilton Striders00:38:3900:58:5100:07:5800:29:4900:49:4103:04:58
    102Debz Way HayF50Anster Haddies00:40:2600:54:3700:08:2600:30:1800:51:1603:05:03
    103Gary ScottM40Anster Allsorts00:38:4401:04:1200:06:2900:27:4800:50:3103:07:44
    104Kara ChristineF40Run Mummy Run00:39:0800:59:0900:08:1600:30:4500:51:2203:08:40
    105Hannah AllumFSAnster Allsorts00:38:4601:04:1400:07:5300:28:3100:50:2803:09:52
    106Angela JohnstonF50Leven Las Vegas RC00:41:1201:00:5600:08:4600:29:4600:49:3203:10:12
    107Peter Rieu-ClarkeM70Leven Las Vegas RC00:38:2200:56:0900:07:3500:25:1601:03:1203:10:34
    108Karen SpenceF40Falkland Trail Runners00:53:1701:16:4300:10:5900:38:4701:03:0904:02:55
    -Heather AndersonFSFife AC-00:35:23----
    -William ArnotM50Anster Haddies-00:45:33-00:24:01--
    -Jane AskeyF70Fife AC00:50:44-----
    -Nick BrianM60Fife AC00:33:1500:49:0800:06:5800:24:21--
    -Joanne ClancyFSDundee Rr AC00:30:3400:46:47----
    -Peter ConnollyM50Dundee Rr AC00:30:4600:47:19--00:40:04-
    -Keith CoplandM40Corstorphine AAC00:31:0700:42:28----
    -Stewart DillonM50Fife AC00:28:4600:38:1600:06:01---
    -Bill DuffM60Falkland Trail Runners00:33:5500:44:1100:07:2200:24:39--
    -Claire DuncanF40Beacon Runners00:33:5800:54:3400:07:33---
    -Stuart FraserMSPerth Road Runners00:26:58-----
    -Stuart GilbertMSMorton Running Company---00:34:02--
    -Gary HoweM40Fife AC00:29:5400:40:2300:06:1400:21:41--
    -Bryan InnesMSFalkland Trail Runners00:26:2100:35:1700:05:2100:18:54--
    -CJ MacphailFSAnster Haddies00:29:3400:38:2000:05:5500:21:12--
    -Neill PorterfieldM40Corstorphine AAC00:29:3200:41:2300:05:56-00:36:07-
    -Cyndi SveeF50U/n--00:08:40-00:55:50-
    diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.html b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.html new file mode 100644 index 00000000..194d86a6 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.html @@ -0,0 +1,69 @@ +

    Prizes

    +

    Women Senior

    +
      +
    • 1 Maya Stone (Fife AC) 01:56:53
      • +
    • 2 Claire Houston (Central AC) 01:57:38
      • +
    • 3 Kristin Lownie (Carnegie Harriers) 01:59:34
      • +
    + +

    Men Senior

    +
      +
    • 1 Ben Hukins (Cambuslang H) 01:39:02
      • +
    • 2 Christopher O'Brien (Corstorphine AAC) 01:45:16
      • +
    • 3 Robbie Dunlop (Dundee Rr AC) 01:45:41
      • +
    + +

    Women Junior

    +

    No results

    +

    Men Junior

    +

    No results

    +

    Women 40-49

    +
      +
    • 1 Rhona Van Rensburg (Fife AC) 02:08:27
      • +
    • 2 Gillian Smith (Fife AC) 02:15:47
      • +
    • 3 Alison McNeilly (Dundee Rr AC) 02:15:51
      • +
    + +

    Men 40-49

    +
      +
    • 1 Iain Wallace (Leven Las Vegas RC) 01:55:53
      • +
    • 2 Kevin Greig (Dundee Rr AC) 01:56:33
      • +
    • 3 Hendrik Van Rensburg (U/n) 01:56:52
      • +
    + +

    Women 50-59

    +
      +
    • 1 Susan Ridley (Edinburgh AC) 02:04:06
      • +
    • 2 Catherine Leonard (Fife AC) 02:20:24
      • +
    • 3 Pamela Cruickshanks (Anster Haddies) 02:23:30
      • +
    + +

    Men 50-59

    +
      +
    • 1 Brian Lees (Lothian RC) 02:00:33
      • +
    • 2 Simon Knox (Dundee Rr AC) 02:02:29
      • +
    • 3 Jim Morton (Dundee Rr AC) 02:05:59
      • +
    + +

    Women 60-69

    +
      +
    • 1 Isobel Burnett (Carnegie Harriers) 02:09:22
      • +
    • 2 Innes Bracegirdle (Fife AC) 02:19:08
      • +
    • 3 Jocelyn Scott (Fife AC) 02:28:58
      • +
    + +

    Men 60-69

    +
      +
    • 1 Gary Barker (Fife AC) 02:07:54
      • +
    • 2 Tom Scott (Fife AC) 02:10:28
      • +
    • 3 David Norrie (Fife AC) 02:13:43
      • +
    + +

    Women 70-79

    +

    No results

    +

    Men 70-79

    +
      +
    • 1 Steve Cromar (Dundee Hawkhill Harriers) 02:39:52
      • +
    • 2 Peter Rieu-Clarke (Leven Las Vegas RC) 03:10:34
      • +
    + diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.pdf b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.pdf new file mode 100644 index 00000000..7e71b4eb Binary files /dev/null and b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.pdf differ diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.txt new file mode 100644 index 00000000..af254c73 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/expected/tour_prizes_2017.txt @@ -0,0 +1,92 @@ +Tour of Fife Results 2017 +============================ + +Category: Women Senior +---------------------- + +1: Maya Stone (Fife AC) 01:56:53 +2: Claire Houston (Central AC) 01:57:38 +3: Kristin Lownie (Carnegie Harriers) 01:59:34 + + +Category: Men Senior +-------------------- + +1: Ben Hukins (Cambuslang H) 01:39:02 +2: Christopher O'Brien (Corstorphine AAC) 01:45:16 +3: Robbie Dunlop (Dundee Rr AC) 01:45:41 + + +Category: Women Junior +---------------------- + +No results + + +Category: Men Junior +-------------------- + +No results + + +Category: Women 40-49 +--------------------- + +1: Rhona Van Rensburg (Fife AC) 02:08:27 +2: Gillian Smith (Fife AC) 02:15:47 +3: Alison McNeilly (Dundee Rr AC) 02:15:51 + + +Category: Men 40-49 +------------------- + +1: Iain Wallace (Leven Las Vegas RC) 01:55:53 +2: Kevin Greig (Dundee Rr AC) 01:56:33 +3: Hendrik Van Rensburg (U/n) 01:56:52 + + +Category: Women 50-59 +--------------------- + +1: Susan Ridley (Edinburgh AC) 02:04:06 +2: Catherine Leonard (Fife AC) 02:20:24 +3: Pamela Cruickshanks (Anster Haddies) 02:23:30 + + +Category: Men 50-59 +------------------- + +1: Brian Lees (Lothian RC) 02:00:33 +2: Simon Knox (Dundee Rr AC) 02:02:29 +3: Jim Morton (Dundee Rr AC) 02:05:59 + + +Category: Women 60-69 +--------------------- + +1: Isobel Burnett (Carnegie Harriers) 02:09:22 +2: Innes Bracegirdle (Fife AC) 02:19:08 +3: Jocelyn Scott (Fife AC) 02:28:58 + + +Category: Men 60-69 +------------------- + +1: Gary Barker (Fife AC) 02:07:54 +2: Tom Scott (Fife AC) 02:10:28 +3: David Norrie (Fife AC) 02:13:43 + + +Category: Women 70-79 +--------------------- + +No results + + +Category: Men 70-79 +------------------- + +1: Steve Cromar (Dundee Hawkhill Harriers) 02:39:52 +2: Peter Rieu-Clarke (Leven Las Vegas RC) 03:10:34 + + diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_entry.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_entry.csv new file mode 100644 index 00000000..340cdab5 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_entry.csv @@ -0,0 +1,16 @@ +Women Junior,FU20,Women,13,19 +Men Junior,MU20,Men,13,19 +Women Senior,FS,Women,20,39 +Men Senior,MS,Men,20,39 +Women 40-49,F40,Women,40,49 +Men 40-49,M40,Men,40,49 +Women 50-59,F50,Women,50,59 +Men 50-59,M50,Men,50,59 +Women 60-69,F60,Women,60,69 +Men 60-69,M60,Men,60,69 +Women 70-79,F70,Women,70,79 +Men 70-79,M70,Men,70,79 +Women 80-89,F80,Women,80,89 +Men 80-89,M80,Men,80,89 +Women 90-99,F90,Women,90,99 +Men 90-99,M90,Men,90,99 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_prize.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_prize.csv new file mode 100644 index 00000000..65bf4849 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/categories_prize.csv @@ -0,0 +1,16 @@ +Women Senior,FS,Women,20,39,Overall,3 +Men Senior,MS,Men,20,99,Overall,3 +Women Junior,FU20,Women,15,19,Overall,1 +Men Junior,MU20,Men,15,19,Overall,1 +Women 40-49,F40,Women,40,49,Overall,3 +Men 40-49,M40,Men,40,49,Overall,3 +Women 50-59,F50,Women,50,59,Overall,3 +Men 50-59,M50,Men,50,59,Overall,3 +Women 60-69,F60,Women,60,69,Overall,3 +Men 60-69,M60,Men,60,69,Overall,3 +Women 70-79,F70,Women,70,79,Overall,3 +Men 70-79,M70,Men,70,79,Overall,3 +Women 80-89,F80,Women,80,89,Overall,3 +Men 80-89,M80,Men,80,89,Overall,3 +Women 90-99,F90,Women,90,99,Overall,3 +Men 90-99,M90,Men,90,99,Overall,3 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/config.txt new file mode 100644 index 00000000..89a6ac78 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/config.txt @@ -0,0 +1,14 @@ +YEAR = 2017 +RACE_NAME_FOR_RESULTS = Tour of Fife +RACE_NAME_FOR_FILENAMES = tour + +RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt,race5/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 + +CATEGORIES_ENTRY_PATH = categories_entry.csv +CATEGORIES_PRIZE_PATH = categories_prize.csv + +# Details of time-trial race starts: comma-separated sequence of bib-number/start-offset. +TIME_TRIAL_RACE = 3 +TIME_TRIAL_STARTS = 20/00:00:00,85/00:00:00,78/00:00:00,30/00:00:30,139/00:00:30,127/00:00:30,151/00:01:00,79/00:01:00,86/00:01:00,133/00:01:30,88/00:01:30,63/00:01:30,32/00:02:00,59/00:02:00,91/00:02:00,129/00:03:00,89/00:03:00,117/00:03:00,29/00:03:00,34/00:04:00,114/00:04:00,25/00:04:00,123/00:04:30,3/00:04:30,23/00:04:30,74/00:05:00,111/00:05:00,97/00:05:00,16/00:05:30,130/00:05:30,96/00:05:30,5/00:06:00,145/00:06:00,90/00:06:00,50/00:06:00,67/00:06:30,52/00:06:30,43/00:06:30,148/00:07:00,31/00:07:00,81/00:07:00,26/00:07:30,83/00:07:30,1/00:07:30,22/00:08:30,80/00:08:30,132/00:08:30,82/00:09:00,19/00:09:00,39/00:09:00,49/00:09:30,58/00:09:30,57/00:09:30,101/00:10:00,77/00:10:00,56/00:10:00,93/00:11:30,144/00:11:30,126/00:11:30,28/00:12:00,15/00:12:00,41/00:12:00,62/00:13:00,21/00:13:00,110/00:13:00,10/00:14:00,46/00:14:00,124/00:14:00,149/00:14:30,107/00:14:30,6/00:14:30,17/00:15:00,9/00:15:00,45/00:15:00,131/00:16:00,92/00:16:00,115/00:16:00,109/00:16:30,116/00:16:30,100/00:17:00,40/00:17:00,48/00:17:00,105/00:17:30,94/00:17:30,54/00:17:30,128/00:18:00,65/00:18:00,36/00:18:00,134/00:18:30,70/00:18:30,113/00:18:30,147/00:19:00,42/00:19:00,47/00:19:00,69/00:19:30,75/00:19:30,103/00:19:30,71/00:20:00,121/00:20:00,55/00:20:00,4/00:21:00,11/00:21:00,104/00:21:00,141/00:21:30,98/00:21:30,73/00:21:30,60/00:22:00,66/00:22:00,72/00:22:00,38/00:22:30,27/00:22:30,37/00:22:30,12/00:23:00,33/00:23:00,13/00:23:00,95/00:23:30,112/00:23:30,120/00:23:30,61/00:24:00,143/00:24:00,142/00:24:00,119/00:24:00,35/00:24:30,87/00:24:30,135/00:25:00,136/00:25:00,2/00:25:00,7/00:25:30,8/00:25:30,14/00:25:30,18/00:26:00,24/00:26:00,44/00:26:00,51/00:26:30,53/00:26:30,64/00:26:30,68/00:27:00,76/00:27:00,84/00:27:00,99/00:27:30,102/00:27:30,106/00:27:30,108/00:28:00,118/00:28:00,122/00:28:30,125/00:28:30,137/00:28:30,138/00:29:00,140/00:29:00,146/00:29:00,150/00:29:00 \ No newline at end of file diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entries.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entries.txt new file mode 100644 index 00000000..b9724edb --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entries.txt @@ -0,0 +1,149 @@ +1 Dave Morton Morton Running Company M Sen +2 Stuart Gilbert Morton Running Company M Sen +3 Scott Love PH Racing Club M Sen +4 Rosemary Lee Fife AC F50 +5 Jennifer Massie Dundee RR AC F Sen +6 Michael Bisset Carnegie H M40 +7 Steven Dick Arbroath Footers M50 +8 Mark Johnstone Falkirk Victoria H M40 +9 Ewan Cameron Anster Haddies RC M50 +10 Alison Mcneilly Dundee RR AC F40 +11 Paul McGlynn Fife AC M50 +12 John Lee Falkland TR M50 +13 Josh McKay Dundee RR AC M Sen +14 Christine Bowie Anster Haddies RC F50 +15 Neill Porterfield Corstorphine AAC M40 +16 Arnaud Richard Dundee RR AC M Sen +17 Jazmin Hay Anster Haddies RC F Sen +18 Paul Dunning PH Racing Club M40 +19 CJ Macphail Anster Haddies RC F Sen +20 Ben Hukins Cambuslang H M Sen +21 Innes Bracegirdle Fife AC F60 +22 Stewart Dillon Fife AC M50 +23 Brian Lees Lothian RC M50 +24 Kerry Wheadon U/N F Sen +25 Alan Cameron Corstorphine AAC M40 +26 Derek Grant Dundee and Angus Cani-Cross M40 +27 Peter Rieu-Clarke Leven Las Vegas M70 +28 Gillian Smith Fife AC F40 +29 Jennifer Cruickshanks Fife AC F Sen +30 Akira O'Connor Fife AC M Sen +31 Duncan Edward Dundee RR AC M Sen +32 Iain Wallace Leven Las Vegas M40 +33 Debz Way Hay Anster Haddies RC F50 +34 Christopher McKiddie Westerlands CCC M Sen +35 Heather Anderson Fife AC F Sen +36 Maneesh Kuruvilla U/N M Sen +37 Ruth Letham Fife AC F Sen +38 Big George Hay Anster Haddies RC M50 +39 Karen Spence Falkland TR F40 +40 Jocelyn Scott Fife AC F60 +41 Susanne Lumsden Falkland TR F40 +42 Morna Fleming Pitreavie AAC F60 +43 Mike Murdoch Falkland TR M40 +44 Kirsty Gibson U/N F Sen +45 Pamela Cruickshanks Anster Haddies RC F50 +46 Fiona Cruickshanks Anster Haddies RC F Sen +47 David Nuttall Anster Haddies RC M40 +48 Alice Hall Anster Haddies RC F50 +49 Tom Scott Fife AC M60 +50 Elaine Omand Dundee RR AC F Sen +51 Gordon Donnachie Kinross RR M50 +52 Louise Andrew Dundee and Angus Cani-Cross F Sen +53 Peter Buchanan Portobello RC M50 +54 Bill Duff Falkland TR M60 +55 Steve Cromar Dundee Hawkhill H M70 +56 Gary Ovenstone STAART M40 +57 Paul Reed Dundee RR AC M40 +58 Rhona Van Rensburg Fife AC F40 +59 Hendrik Van Rensburg U/N M40 +60 Ross Johnston Leven Las Vegas RC M50 +61 Angela Johnston Leven Las Vegas RC F50 +62 Merce Torres Fife AC F40 +63 Kevin Greig Dundee RR AC M40 +64 Mark Lessells U/N M40 +65 George Stewart Calderglen H M50 +66 Derek Adamson Fife AC M40 +67 Joanne McEvoy Calderglen H F Sen +68 Michael Geoghegan Portobello RC M Sen +69 Zuleika Brett Carnegie H F Sen +70 John Henderson Fife AC M40 +71 Bob Wylie Leven Las Vegas RC M Sen +72 Wendy Wylie Leven Las Vegas RC F Sen +73 Claire Duncan Beacon Runners F40 +74 Jonathan Millar Carnegie H M Sen +75 Nick Brian Fife AC M60 +76 Christie Ford Shettleston H F Sen +77 Brian R Smith Fife AC M50 +78 Robbie Dunlop Dundee RR AC M Sen +79 Fergus Ingledew Fife AC MU20 +80 Isobel Burnett Carnegie H F60 +81 Simon Fox Fife AC M50 +82 Jan-Bert van den Berg Corstorphine AAC M50 +83 Andrew Stavert Portobello RC M50 +84 Sam Newington Durham City H & AC F40 +85 Christopher O'Brien Corstorphine AAC M Sen +86 Bryan McLaren Leven Las Vagas M Sen +87 William Arnot Anster Haddies RC M50 +88 Jonny Logan Fife AC M Sen +89 Claire Houston Central AC F Sen +90 Jim Morton Dundee RR AC M50 +91 Matthew Low Dundee RR AC M Sen +92 Jason Grant Dundee and Angus Cani-Cross M Sen +93 Fiona Callaghan Dundee RR AC F Sen +94 Peter Connolly Dundee RR AC M50 +95 Jacqueline Cook Falkland TR F40 +96 Simon Knox Dundee RR AC M50 +97 Lee O'Connor Dundee RR AC M40 +98 Robert Thornton Fife AC M60 +99 Lilian Stock The Meedies RC F Sen +100 Joanne Clancy Dundee RR AC F Sen +101 David Dunleavey Dundee RR AC M50 +102 Joanna Gray U/N F Sen +103 Brian Stewart Dundee RR AC M Sen +104 Malcolm Mactavish Falkland TR M60 +105 Robyn Morrocco Carnegie H F Sen +106 Nicola Freedman Harmeny AC F40 +107 David Henderson Corstorphine AAC M50 +108 Sophie Mullins Fife AC F Sen +109 Gordon Somerville Carnegie H M60 +110 Tam Nicol's Stilton Striders M50 +111 Kenny Gorman Fife AC M Sen +112 Steph Barlow Stilton Striders F50 +113 Christina Grant Dundee and Angus Cani-Cross F Sen +114 Bryan Innes Falkland TR M Sen +115 Kieran Morgan Carnegie H M50 +116 Phil Smithard Carnegie H M60 +117 Kristin Lownie Carnegie H F Sen +118 Sarah Winter Dundee RR AC F Sen +119 Cyndi Svee U/N F50 +120 Kara Christine Run Mummy Run F40 +121 Bill Gillan Falkland TR M60 +122 Stuart Tite PH Racing Club M Sen +123 Willie Rennie Carnegie H M40 +124 Louis Leslie Fife AC MU20 +125 Peter Peddie U/N M50 +126 David Norrie Fife AC M60 +127 Daniel Hale University of St. Andrews CCC M Sen +128 Innes Petrie Fife AC M50 +129 Maya Stone Fife AC F Sen +130 Colin Mcwilliam Fife AC M Sen +131 Catherine Leonard Fife AC F50 +132 John Mcintyre Fife AC M Sen +133 James Bowden Hunters Bog T M Sen +134 Sharon Brown Anster Haddies RC F Sen +135 Stuart Fraser Perth RR M Sen +136 Jane Askey Fife AC F70 +137 Greg Milne Fife AC M Sen +139 Andrew Leech Dundee Hawkhill H M Sen +140 Jennifer Spence Fife AC F Sen +141 Pauline Smith Dundee RR AC F Sen +142 Hannah Allum Anster Allsorts F Sen +143 Gary Scott Anster Allsorts M40 +144 Gary Howe Fife AC M40 +145 Susan Ridley Edinburgh AC F50 +146 Jon Cross Forth Valley Orienteers M40 +147 Fiona Plain Dundee RR AC F Sen +148 Gary Barker Fife AC M60 +149 Keith Copland Corstorphine AAC M40 +151 Oliver Lever Lomond Hill Runners M Sen diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entry_map.csv b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entry_map.csv new file mode 100644 index 00000000..e04d4701 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/entry_map.csv @@ -0,0 +1,3 @@ +1,2-3,4,5 +M Sen,MS +F Sen,FS diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/config.txt new file mode 100644 index 00000000..64b20ab9 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 1 +RACE_NAME_FOR_FILENAMES = race1 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/rawtimes.txt new file mode 100644 index 00000000..a08d9f72 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race1/input/rawtimes.txt @@ -0,0 +1,123 @@ +20 00:24:03 +85 00:24:38 +78 00:24:43 +30 00:24:45 +139 00:24:49 +86 00:24:55 +127 00:25:03 +151 00:25:08 +79 00:25:18 +88 00:25:23 +111 00:25:30 +23 00:25:55 +32 00:26:01 +133 00:26:05 +3 00:26:14 +59 00:26:16 +114 00:26:21 +25 00:26:27 +63 00:26:31 +123 00:26:36 +34 00:26:44 +130 00:26:46 +89 00:26:48 +74 00:26:58 +135 00:26:58 +117 00:26:58 +97 00:26:59 +52 00:27:03 +50 00:27:05 +67 00:27:08 +31 00:27:10 +26 00:27:12 +29 00:27:14 +43 00:27:16 +129 00:27:23 +96 00:27:27 +80 00:27:29 +58 00:27:31 +16 00:27:37 +1 00:27:54 +91 00:28:02 +145 00:28:04 +5 00:28:06 +81 00:28:13 +90 00:28:15 +82 00:28:18 +148 00:28:22 +49 00:28:30 +132 00:28:43 +22 00:28:46 +101 00:28:55 +83 00:28:59 +57 00:29:11 +110 00:29:16 +56 00:29:19 +10 00:29:25 +77 00:29:30 +15 00:29:32 +19 00:29:34 +113 00:29:38 +6 00:29:43 +126 00:29:48 +93 00:29:51 +144 00:29:54 +107 00:30:00 +21 00:30:01 +62 00:30:12 +41 00:30:15 +131 00:30:17 +28 00:30:18 +100 00:30:34 +109 00:30:36 +105 00:30:38 +116 00:30:41 +94 00:30:46 +46 00:30:53 +124 00:31:02 +17 00:31:04 +149 00:31:07 +92 00:31:24 +115 00:31:44 +147 00:31:55 +45 00:32:07 +9 00:32:15 +70 00:32:21 +128 00:32:23 +65 00:32:38 +48 00:32:45 +36 00:32:48 +42 00:32:52 +75 00:33:15 +11 00:33:19 +121 00:33:22 +40 00:33:45 +54 00:33:55 +73 00:33:58 +71 00:34:10 +55 00:34:18 +69 00:34:19 +98 00:34:29 +134 00:34:31 +72 00:34:33 +103 00:34:59 +60 00:35:04 +4 00:35:06 +66 00:35:08 +47 00:35:12 +141 00:35:33 +104 00:35:48 +37 00:37:22 +95 00:37:30 +38 00:37:44 +13 00:37:52 +27 00:38:22 +112 00:38:39 +143 00:38:44 +142 00:38:46 +120 00:39:08 +12 00:40:15 +33 00:40:26 +61 00:41:12 +136 00:50:44 +39 00:53:17 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/config.txt new file mode 100644 index 00000000..21a1447c --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 2 +RACE_NAME_FOR_FILENAMES = race2 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/rawtimes.txt new file mode 100644 index 00000000..d3acb31a --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race2/input/rawtimes.txt @@ -0,0 +1,123 @@ +20 00:27:38 +85 00:30:39 +78 00:30:41 +30 00:32:26 +151 00:32:43 +127 00:32:47 +79 00:32:49 +91 00:32:51 +139 00:32:53 +133 00:33:21 +86 00:33:33 +129 00:33:45 +63 00:34:03 +34 00:34:25 +59 00:34:28 +32 00:34:41 +88 00:34:51 +89 00:35:03 +123 00:35:05 +25 00:35:13 +114 00:35:17 +35 00:35:23 +117 00:35:25 +3 00:35:30 +74 00:35:31 +29 00:36:07 +50 00:36:11 +16 00:36:17 +145 00:36:21 +97 00:36:23 +23 00:36:29 +96 00:36:44 +90 00:36:50 +111 00:37:18 +130 00:37:20 +148 00:37:30 +83 00:37:43 +81 00:37:59 +67 00:38:02 +22 00:38:16 +19 00:38:20 +52 00:38:23 +132 00:38:29 +43 00:38:31 +31 00:38:54 +1 00:38:59 +57 00:39:02 +26 00:39:15 +82 00:39:18 +49 00:39:26 +80 00:39:34 +77 00:39:48 +101 00:39:56 +93 00:39:57 +56 00:40:19 +144 00:40:23 +28 00:40:24 +58 00:40:33 +126 00:40:40 +41 00:41:03 +15 00:41:23 +5 00:41:26 +124 00:41:31 +62 00:41:34 +46 00:41:37 +21 00:42:10 +149 00:42:28 +9 00:42:47 +10 00:42:54 +110 00:43:00 +45 00:43:08 +17 00:43:31 +40 00:43:56 +115 00:44:07 +54 00:44:11 +92 00:44:14 +107 00:44:19 +6 00:44:38 +134 00:44:41 +131 00:45:02 +48 00:45:13 +109 00:45:29 +87 00:45:33 +116 00:45:49 +128 00:46:00 +65 00:46:08 +36 00:46:18 +47 00:46:32 +100 00:46:47 +70 00:46:56 +94 00:47:19 +105 00:47:21 +103 00:47:25 +69 00:47:32 +42 00:47:36 +147 00:47:52 +71 00:48:27 +4 00:48:37 +55 00:48:59 +75 00:49:08 +121 00:49:23 +113 00:50:09 +11 00:50:43 +104 00:51:18 +141 00:52:15 +98 00:53:21 +73 00:54:34 +33 00:54:37 +12 00:54:39 +60 00:54:44 +38 00:55:33 +66 00:55:58 +27 00:56:09 +72 00:57:24 +37 00:57:30 +13 00:57:57 +95 00:58:41 +112 00:58:51 +120 00:59:09 +61 01:00:56 +143 01:04:12 +142 01:04:14 +39 01:16:43 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/config.txt new file mode 100644 index 00000000..bf1620e6 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 3 +RACE_NAME_FOR_FILENAMES = race3 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/rawtimes.txt new file mode 100644 index 00000000..9c431a85 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race3/input/rawtimes.txt @@ -0,0 +1,118 @@ +20 00:04:35 +85 00:04:43 +78 00:04:47 +30 00:05:24 +139 00:05:32 +127 00:05:36 +86 00:05:58 +151 00:06:01 +79 00:06:04 +133 00:06:41 +88 00:06:48 +63 00:07:03 +91 00:07:14 +59 00:07:29 +32 00:07:36 +89 00:08:23 +129 00:08:25 +29 00:08:28 +117 00:08:30 +114 00:09:21 +25 00:09:24 +34 00:09:30 +3 00:09:47 +123 00:09:55 +111 00:10:02 +23 00:10:04 +97 00:10:34 +74 00:10:36 +130 00:11:06 +16 00:11:20 +96 00:11:21 +50 00:11:35 +43 00:11:48 +5 00:11:51 +90 00:12:02 +145 00:12:05 +52 00:12:23 +67 00:12:24 +31 00:12:43 +81 00:12:52 +148 00:13:00 +26 00:13:08 +1 00:13:12 +83 00:13:44 +132 00:14:08 +22 00:14:31 +80 00:14:33 +19 00:14:55 +82 00:15:01 +58 00:15:27 +57 00:15:30 +49 00:15:33 +101 00:16:01 +56 00:16:06 +77 00:16:07 +93 00:17:29 +126 00:17:36 +144 00:17:44 +15 00:17:56 +28 00:18:12 +41 00:18:31 +110 00:18:59 +62 00:19:35 +21 00:19:53 +39 00:19:59 +46 00:20:07 +6 00:20:14 +10 00:20:29 +107 00:20:50 +17 00:21:34 +45 00:21:37 +9 00:21:51 +92 00:21:58 +115 00:22:26 +131 00:22:40 +109 00:22:57 +116 00:23:06 +105 00:23:48 +48 00:24:06 +65 00:24:22 +113 00:24:24 +36 00:24:28 +40 00:24:39 +128 00:24:47 +54 00:24:52 +70 00:24:55 +134 00:25:19 +147 00:25:26 +42 00:25:44 +47 00:26:15 +103 00:26:26 +75 00:26:28 +69 00:26:48 +71 00:26:50 +121 00:27:10 +55 00:27:50 +11 00:28:15 +104 00:28:24 +4 00:28:30 +98 00:28:33 +141 00:28:44 +73 00:29:03 +72 00:29:15 +60 00:29:31 +66 00:29:34 +13 00:29:46 +27 00:30:05 +37 00:30:11 +38 00:30:27 +143 00:30:29 +95 00:31:24 +33 00:31:26 +112 00:31:28 +12 00:31:39 +120 00:31:46 +142 00:31:53 +119 00:32:40 +61 00:32:46 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/config.txt new file mode 100644 index 00000000..6a3f5774 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 4 +RACE_NAME_FOR_FILENAMES = race4 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/rawtimes.txt new file mode 100644 index 00000000..07846340 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race4/input/rawtimes.txt @@ -0,0 +1,116 @@ +20 00:16:09 +85 00:17:07 +78 00:17:19 +30 00:17:40 +139 00:17:43 +151 00:17:50 +111 00:17:55 +86 00:17:57 +79 00:18:06 +127 00:18:18 +88 00:18:38 +32 00:18:42 +89 00:18:45 +133 00:18:48 +3 00:18:53 +114 00:18:54 +25 00:18:54 +50 00:18:56 +123 00:18:57 +59 00:18:57 +34 00:18:59 +129 00:19:04 +63 00:19:07 +130 00:19:18 +117 00:19:23 +74 00:19:23 +29 00:19:30 +43 00:19:31 +23 00:19:42 +97 00:19:44 +96 00:19:45 +31 00:19:49 +26 00:19:54 +52 00:19:59 +132 00:20:02 +145 00:20:03 +67 00:20:05 +91 00:20:08 +5 00:20:16 +16 00:20:18 +81 00:20:20 +80 00:20:22 +1 00:20:30 +58 00:20:33 +6 00:20:37 +82 00:20:46 +90 00:20:50 +57 00:20:50 +148 00:20:59 +49 00:21:02 +110 00:21:03 +101 00:21:12 +19 00:21:12 +83 00:21:19 +126 00:21:22 +92 00:21:26 +113 00:21:30 +10 00:21:33 +46 00:21:35 +77 00:21:37 +144 00:21:41 +56 00:21:44 +93 00:21:48 +131 00:21:50 +107 00:21:58 +105 00:22:05 +115 00:22:07 +41 00:22:08 +28 00:22:09 +45 00:22:15 +62 00:22:31 +17 00:22:34 +21 00:22:35 +109 00:22:42 +116 00:22:46 +70 00:22:50 +147 00:22:55 +36 00:23:06 +42 00:23:17 +9 00:23:50 +87 00:24:01 +48 00:24:02 +128 00:24:06 +40 00:24:09 +134 00:24:13 +121 00:24:18 +75 00:24:21 +65 00:24:28 +71 00:24:30 +54 00:24:39 +98 00:25:06 +72 00:25:07 +11 00:25:12 +27 00:25:16 +55 00:25:17 +47 00:25:24 +69 00:25:25 +4 00:25:52 +103 00:26:25 +104 00:26:36 +13 00:26:53 +141 00:26:53 +66 00:26:55 +37 00:27:13 +143 00:27:48 +60 00:28:01 +95 00:28:01 +38 00:28:10 +142 00:28:31 +12 00:29:41 +61 00:29:46 +112 00:29:49 +33 00:30:18 +120 00:30:45 +2 00:34:02 +39 00:38:47 diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/config.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/config.txt new file mode 100644 index 00000000..5752a25d --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/config.txt @@ -0,0 +1,12 @@ +YEAR = 2018 +RACE_NAME_FOR_RESULTS = Race 5 +RACE_NAME_FOR_FILENAMES = race5 + +# Relative to directory containing configuration file. +ENTRIES_PATH = ../../entries.txt +RAW_RESULTS_PATH = rawtimes.txt + +CATEGORIES_ENTRY_PATH = ../../categories_entry.csv +CATEGORIES_PRIZE_PATH = ../../categories_prize.csv + +ENTRY_MAP_PATH = ../../entry_map.csv diff --git a/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/rawtimes.txt b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/rawtimes.txt new file mode 100644 index 00000000..7543a706 --- /dev/null +++ b/src/test/resources/actual_races/series_race/tour/2017/completed_5/input/race5/input/rawtimes.txt @@ -0,0 +1,112 @@ +20 00:26:37 +85 00:28:09 +78 00:28:11 +86 00:29:31 +139 00:29:38 +151 00:29:43 +79 00:30:09 +30 00:30:24 +133 00:30:27 +88 00:30:33 +32 00:30:53 +111 00:30:56 +127 00:30:58 +3 00:31:09 +129 00:31:16 +63 00:31:19 +25 00:31:27 +123 00:31:36 +89 00:31:39 +59 00:31:42 +34 00:32:06 +130 00:32:09 +74 00:32:16 +117 00:32:18 +96 00:32:42 +43 00:32:45 +23 00:32:53 +50 00:32:57 +97 00:33:03 +145 00:33:33 +31 00:33:40 +16 00:33:43 +52 00:33:49 +58 00:33:53 +81 00:33:56 +67 00:34:00 +90 00:34:02 +83 00:34:05 +26 00:34:08 +132 00:34:27 +57 00:34:34 +29 00:34:41 +148 00:35:03 +5 00:35:07 +91 00:35:10 +82 00:35:16 +93 00:35:23 +49 00:35:27 +10 00:35:30 +6 00:35:34 +126 00:35:47 +80 00:35:54 +15 00:36:07 +41 00:36:14 +101 00:36:30 +131 00:36:35 +28 00:36:44 +1 00:36:46 +110 00:36:51 +77 00:37:18 +21 00:37:29 +56 00:37:36 +113 00:37:40 +62 00:37:52 +107 00:38:13 +147 00:38:22 +92 00:38:27 +17 00:38:31 +109 00:38:39 +46 00:38:43 +115 00:38:57 +105 00:39:08 +45 00:39:23 +9 00:39:26 +40 00:39:29 +42 00:40:02 +94 00:40:04 +116 00:40:15 +70 00:40:22 +134 00:40:29 +36 00:40:51 +48 00:41:16 +65 00:41:43 +47 00:41:53 +121 00:42:22 +128 00:42:37 +69 00:42:41 +98 00:42:48 +71 00:42:53 +4 00:43:01 +11 00:43:13 +55 00:43:28 +141 00:43:32 +72 00:43:43 +103 00:44:13 +104 00:45:13 +60 00:45:42 +37 00:46:24 +13 00:46:55 +66 00:47:22 +95 00:49:15 +12 00:49:29 +61 00:49:32 +112 00:49:41 +38 00:50:25 +142 00:50:28 +143 00:50:31 +33 00:51:16 +120 00:51:22 +119 00:55:50 +39 01:03:09 +27 01:03:12 diff --git a/src/test/resources/series_race/midweek/dead_heats/input/config.txt b/src/test/resources/series_race/midweek/dead_heats/input/config.txt index 73fd6c7a..36096535 100644 --- a/src/test/resources/series_race/midweek/dead_heats/input/config.txt +++ b/src/test/resources/series_race/midweek/dead_heats/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt,dunnikier/input/config.txt,balmullo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/series_race/midweek/duplicate_runner_name/input/config.txt b/src/test/resources/series_race/midweek/duplicate_runner_name/input/config.txt index 749cb0d2..ebaa0f56 100644 --- a/src/test/resources/series_race/midweek/duplicate_runner_name/input/config.txt +++ b/src/test/resources/series_race/midweek/duplicate_runner_name/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt,, +RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/series_race/midweek/large_race/input/config.txt b/src/test/resources/series_race/midweek/large_race/input/config.txt index a4e43964..8a48d2af 100644 --- a/src/test/resources/series_race/midweek/large_race/input/config.txt +++ b/src/test/resources/series_race/midweek/large_race/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt,dunnikier/input/config.txt,balmullo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/series_race/midweek/name_includes_comma/input/config.txt b/src/test/resources/series_race/midweek/name_includes_comma/input/config.txt index 749cb0d2..ebaa0f56 100644 --- a/src/test/resources/series_race/midweek/name_includes_comma/input/config.txt +++ b/src/test/resources/series_race/midweek/name_includes_comma/input/config.txt @@ -2,7 +2,8 @@ YEAR = 2023 RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek -RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt,, +RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/series_race/midweek/prize_category_groups/input/config.txt b/src/test/resources/series_race/midweek/prize_category_groups/input/config.txt index 73fd6c7a..36096535 100644 --- a/src/test/resources/series_race/midweek/prize_category_groups/input/config.txt +++ b/src/test/resources/series_race/midweek/prize_category_groups/input/config.txt @@ -3,6 +3,7 @@ RACE_NAME_FOR_RESULTS = Midweek Series RACE_NAME_FOR_FILENAMES = midweek RACES = st_andrews/input/config.txt,strath_blebo/input/config.txt,tarvit/input/config.txt,dunnikier/input/config.txt,balmullo/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 MINIMUM_NUMBER_OF_RACES = 4 SCORE_FOR_FIRST_PLACE = 200 diff --git a/src/test/resources/series_race/minitour/category_without_winner/input/config.txt b/src/test/resources/series_race/minitour/category_without_winner/input/config.txt index 1da73c5b..68236674 100644 --- a/src/test/resources/series_race/minitour/category_without_winner/input/config.txt +++ b/src/test/resources/series_race/minitour/category_without_winner/input/config.txt @@ -3,6 +3,8 @@ RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt,race5/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 62/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30 diff --git a/src/test/resources/series_race/minitour/name_includes_comma/input/config.txt b/src/test/resources/series_race/minitour/name_includes_comma/input/config.txt index 1da73c5b..68236674 100644 --- a/src/test/resources/series_race/minitour/name_includes_comma/input/config.txt +++ b/src/test/resources/series_race/minitour/name_includes_comma/input/config.txt @@ -3,6 +3,8 @@ RACE_NAME_FOR_RESULTS = Minitour of Fife RACE_NAME_FOR_FILENAMES = minitour RACES = race1/input/config.txt,race2/input/config.txt,race3/input/config.txt,race4/input/config.txt,race5/input/config.txt +NUMBER_OF_RACES_IN_SERIES = 5 +MINIMUM_NUMBER_OF_RACES = 5 # Relative to project root directory. CATEGORIES_ENTRY_PATH = /src/main/resources/configuration/categories_entry_individual_junior.csv @@ -17,5 +19,6 @@ SECOND_WAVE_CATEGORIES = FU9,MU9,FU11,MU11 # (which should not have start offsets applied). SELF_TIMED = 62/4 -# Details of time-trial race: race-number/runners-per-wave/inter-wave-interval. -TIME_TRIAL = 4/4/00:00:30 +# Details of time-trial race starts: runners-per-wave,inter-wave-interval. +TIME_TRIAL_RACE = 4 +TIME_TRIAL_STARTS = 4,00:00:30