From bc6762d2dd304906a2bb8f7f05e6d67648c926d2 Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Wed, 8 Mar 2017 13:28:00 +1300 Subject: [PATCH] Moved boat velocity to starting list Tags: #fix --- .gitignore | 4 +++- src/main/java/seng302/Event.java | 3 +-- src/main/java/seng302/Race.java | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 040f8d85..f1991bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -174,4 +174,6 @@ local.properties .springBeans # Code Recommenders -.recommenders/ \ No newline at end of file +.recommenders/ + +Makefile diff --git a/src/main/java/seng302/Event.java b/src/main/java/seng302/Event.java index 72670285..79aada1a 100644 --- a/src/main/java/seng302/Event.java +++ b/src/main/java/seng302/Event.java @@ -93,8 +93,7 @@ public class Event { */ public String getEventString(){ String currentHeading = Integer.toString(this.getLeg().getHeading()); - String velocityKnots = String.format("%1.2f", this.getBoat().getVelocity() * 1.943844492); // Convert meters/second to knots - return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + " at " + velocityKnots + " knots."); + return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + "°"); } } diff --git a/src/main/java/seng302/Race.java b/src/main/java/seng302/Race.java index f354e26a..9e8e35f9 100644 --- a/src/main/java/seng302/Race.java +++ b/src/main/java/seng302/Race.java @@ -113,7 +113,9 @@ public class Race { System.out.println("######################"); for (int i = 0; i < numberOfBoats; i++) { - System.out.println(boats[i].getTeamName()); + String velocityKnots = String.format("%1.2f", boats[i].getVelocity() * 1.943844492); + + System.out.println(boats[i].getTeamName() + " Velocity: " + velocityKnots); } }