get above average runners

2 files changed, 25 insertions, 0 deletions

diff --git a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
index 5578f23..71239d7 100644
--- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
+++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/BanffMarathonRunner.java
@@ -20,6 +20,11 @@ public class BanffMarathonRunner extends AddressBook
     return Integer.compare(this.time, runner.time);
   }
 
+  @Override
+  public String toString() {
+    return super.getFirstName() + " " + this.years;
+  }
+
   public static BanffMarathonRunner getFastestRunner(BanffMarathonRunner[] runners)
   {
     Arrays.sort(runners);
@@ -38,4 +43,17 @@ public class BanffMarathonRunner extends AddressBook
     for (BanffMarathonRunner runner : runners) sum += runner.time;
     return sum / runners.length;
   }
+
+  public static String getAboveAverageRunners(BanffMarathonRunner[] runners)
+  {
+    int average = getAverageTime(runners);
+    String result = "";
+
+    for (BanffMarathonRunner runner : runners) {
+      if (runner.time >= average) {
+        result += runner.toString() + "\r\n";
+      }
+    }
+    return result;
+  }
 }
diff --git a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
index 3435ce0..499be9c 100644
--- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
+++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/BanffMarathonRunnerTest.java
@@ -52,4 +52,11 @@ public class BanffMarathonRunnerTest extends TestCase
   {
     assertEquals(321, BanffMarathonRunner.getAverageTime(this.runners));
   }
+
+  public void testGetAboveAverageRunners()
+  {
+    String expected = "Elena 1\r\n" + "Suzie 7\r\n" + "Philip 9\r\n" +
+      "James 1\r\n" + "Jane 1\r\n" + "Emily 4\r\n" + "Neda 3\r\n";
+    assertEquals(expected, BanffMarathonRunner.getAboveAverageRunners(this.runners));
+  }
 }